diff --git a/app/Services/Tax/Providers/TaxProvider.php b/app/Services/Tax/Providers/TaxProvider.php index 4d71522cf617..c00950e33324 100644 --- a/app/Services/Tax/Providers/TaxProvider.php +++ b/app/Services/Tax/Providers/TaxProvider.php @@ -52,7 +52,7 @@ class TaxProvider private mixed $api_credentials; - public function __construct(protected Company $company, protected Client $client) + public function __construct(public Company $company, public Client $client) { } @@ -108,15 +108,15 @@ class TaxProvider ]; - $tax_provider = new $this->provider(); + $tax_provider = new $this->provider($billing_details); $tax_provider->setApiCredentials($this->api_credentials); $tax_data = $tax_provider->run(); - $this->company->tax_data = $tax_data; + $this->client->tax_data = $tax_data; - $this->company->save(); + $this->client->save(); return $this; diff --git a/app/Services/Tax/TaxService.php b/app/Services/Tax/TaxService.php index 7213b023c5f1..89dd1ba7c31c 100644 --- a/app/Services/Tax/TaxService.php +++ b/app/Services/Tax/TaxService.php @@ -31,4 +31,9 @@ class TaxService return $this; } + + public function initTaxProvider() + { + + } } \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 297e6880d877..f61cf2828fd5 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -219,8 +219,4 @@ return [ 'client_id' => env('SHOPIFY_CLIENT_ID', null), 'client_secret' => env('SHOPIFY_CLIENT_SECRET', null), ], - 'tax_api' => [ - 'provider' => env('TAX_API_PROVIDER', false), - 'api_key' => env('TAX_API_KEY', false), - ] ]; diff --git a/lang/en/texts.php b/lang/en/texts.php index 34915a268f85..886b2f0e77e3 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5086,6 +5086,7 @@ $LANG = array( 'e_invoice' => 'E-Invoice', 'light_dark_mode' => 'Light/Dark Mode', 'activities' => 'Activities', + 'recent_transactions' => "Here are your company's most recent transactions:", );