From 0adb908df9ec51fb43e709779b9e8a74518c79dc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 17 May 2023 20:55:27 +1000 Subject: [PATCH] Clean up for taxes --- app/DataMapper/Tax/BaseRule.php | 2 +- app/Services/Tax/Providers/ZipTax.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php index 1cf893d5dded..1a89d4ea5718 100644 --- a/app/DataMapper/Tax/BaseRule.php +++ b/app/DataMapper/Tax/BaseRule.php @@ -194,7 +194,7 @@ class BaseRule implements RuleInterface } /** If we are in a Origin based state, force the company tax here */ - if($company->origin_tax_data->originDestination == 'O' && ($company->tax_data->seller_subregion == $this->client_subregion)) { + if($company->origin_tax_data?->originDestination == 'O' && ($company->tax_data?->seller_subregion == $this->client_subregion)) { $tax_data = $company->origin_tax_data; diff --git a/app/Services/Tax/Providers/ZipTax.php b/app/Services/Tax/Providers/ZipTax.php index 9f0e40b8b4de..8a6ffb78a2ef 100644 --- a/app/Services/Tax/Providers/ZipTax.php +++ b/app/Services/Tax/Providers/ZipTax.php @@ -45,7 +45,7 @@ class ZipTax implements TaxProviderInterface } - $response->throw(); + // $response->throw(); } @@ -75,7 +75,7 @@ class ZipTax implements TaxProviderInterface if(isset($response['results']['0'])) return $response['results']['0']; - throw new \Exception("Error resolving tax (code) = " . $response['rCode']); - + return null; + // throw new \Exception("Error resolving tax (code) = " . $response['rCode']); } }