diff --git a/app/DataMapper/Tax/US/Rule.php b/app/DataMapper/Tax/US/Rule.php index 572f8e449e12..fbfb5b78b323 100644 --- a/app/DataMapper/Tax/US/Rule.php +++ b/app/DataMapper/Tax/US/Rule.php @@ -162,14 +162,16 @@ class Rule extends BaseRule implements RuleInterface if($this->tax_data?->stateSalesTax == 0) { - $this->tax_rate1 = $this->invoice->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->tax_rate; - $this->tax_name1 = "Sales Tax"; + $this->tax_rate1 = 0; + $this->tax_name1 = ''; + + // $this->tax_rate1 = $this->invoice->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->tax_rate; + // $this->tax_name1 = "Sales Tax"; return $this; } $this->tax_rate1 = $this->tax_data->taxSales * 100; - // $this->tax_name1 = "{$this->tax_data->geoState} Sales Tax"; $this->tax_name1 = "Sales Tax"; return $this; diff --git a/app/Jobs/Client/UpdateTaxData.php b/app/Jobs/Client/UpdateTaxData.php index 6ecf4422028c..265b7778aa8f 100644 --- a/app/Jobs/Client/UpdateTaxData.php +++ b/app/Jobs/Client/UpdateTaxData.php @@ -73,12 +73,11 @@ class UpdateTaxData implements ShouldQueue nlog("problem getting tax data => ".$e->getMessage()); } - /** Set static tax information */ + /* if(!$tax_provider->updatedTaxStatus() && $this->client->country_id == 840){ $calculated_state = false; - /** State must be calculated else default to the company state for taxes */ if(array_key_exists($this->client->shipping_state, USStates::get())) { $calculated_state = $this->client->shipping_state; $calculated_postal_code = $this->client->shipping_postal_code; @@ -136,7 +135,7 @@ class UpdateTaxData implements ShouldQueue $this->client->saveQuietly(); } - + */ } public function middleware()