From 6c3110fef7595111ad45d40d00ed8079e1475081 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 20 Apr 2023 10:25:40 +1000 Subject: [PATCH 1/5] Minor fixes for translations --- lang/en/texts.php | 1 + resources/views/pdf-designs/calm.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/en/texts.php b/lang/en/texts.php index 43259336c3fb..4c0b93504611 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5060,6 +5060,7 @@ $LANG = array( 'date_picker_hint' => 'Use +days to set the date in the future', 'app_help_link' => 'More information ', 'here' => 'here', + 'industry_Restaurant & Catering' => 'Restaurant & Catering', ); diff --git a/resources/views/pdf-designs/calm.html b/resources/views/pdf-designs/calm.html index 0499ee3c47d7..099bace18ba8 100644 --- a/resources/views/pdf-designs/calm.html +++ b/resources/views/pdf-designs/calm.html @@ -413,8 +413,8 @@
-
-
+
+
$status_logo
From 02f7aee8387464be0c9b4a1830e8a54c0da89ba7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 20 Apr 2023 13:09:42 +1000 Subject: [PATCH 2/5] Do not rehydrate bank accounts unnecessarily --- app/Http/Controllers/BankIntegrationController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/BankIntegrationController.php b/app/Http/Controllers/BankIntegrationController.php index 02dabc66d189..7a54fc5dae94 100644 --- a/app/Http/Controllers/BankIntegrationController.php +++ b/app/Http/Controllers/BankIntegrationController.php @@ -532,7 +532,7 @@ class BankIntegrationController extends BaseController $accounts = $yodlee->getAccounts(); foreach ($accounts as $account) { - if (!BankIntegration::where('bank_account_id', $account['id'])->where('company_id', auth()->user()->company()->id)->exists()) { + if (!BankIntegration::withTrashed()->where('bank_account_id', $account['id'])->where('company_id', auth()->user()->company()->id)->exists()) { $bank_integration = new BankIntegration(); $bank_integration->company_id = auth()->user()->company()->id; $bank_integration->account_id = auth()->user()->account_id; @@ -547,7 +547,6 @@ class BankIntegrationController extends BaseController $bank_integration->nickname = $account['nickname']; $bank_integration->balance = $account['current_balance']; $bank_integration->currency = $account['account_currency']; - $bank_integration->save(); } } From 80b801fb9097ed18029a28d02bdd8c7fbf65529e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 20 Apr 2023 13:12:45 +1000 Subject: [PATCH 3/5] Update tax model for Denmark" --- app/DataMapper/Tax/TaxModel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/DataMapper/Tax/TaxModel.php b/app/DataMapper/Tax/TaxModel.php index 09a9eae44b3f..b6baf1c74d1f 100644 --- a/app/DataMapper/Tax/TaxModel.php +++ b/app/DataMapper/Tax/TaxModel.php @@ -381,6 +381,7 @@ class TaxModel $this->regions->EU->subregions->DK = new \stdClass(); $this->regions->EU->subregions->DK->tax_rate = 25; + $this->regions->EU->subregions->DK->tax_name = 'Moms'; $this->regions->EU->subregions->DK->reduced_tax_rate = 0; $this->regions->EU->subregions->DK->apply_tax = false; From 8af6a571d4dbdc7cc55b6c13412dfab748c97271 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 20 Apr 2023 13:31:04 +1000 Subject: [PATCH 4/5] Updates for resolving tax sub region for AU --- app/DataMapper/Tax/BaseRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php index 25bef16a0f75..65c072b29c76 100644 --- a/app/DataMapper/Tax/BaseRule.php +++ b/app/DataMapper/Tax/BaseRule.php @@ -154,7 +154,7 @@ class BaseRule implements RuleInterface match($this->client_region){ 'US' => $this->client_subregion = $this->tax_data->geoState, 'EU' => $this->client_subregion = $this->client->country->iso_3166_2, - default => $this->client->country->iso_3166_2, + default => $this->client_subregion = $this->client->country->iso_3166_2, }; return $this; From a2d52bde2ba12e2ec2a49b01cce4ae24fd9406a9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 20 Apr 2023 16:13:19 +1000 Subject: [PATCH 5/5] Minor fixes --- lang/en/texts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/en/texts.php b/lang/en/texts.php index 4c0b93504611..dd52100de844 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -5061,6 +5061,7 @@ $LANG = array( 'app_help_link' => 'More information ', 'here' => 'here', 'industry_Restaurant & Catering' => 'Restaurant & Catering', + 'show_credits_table' => 'Show Credits Table', );