Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for scheduler tests

Browse Source
This commit is contained in:
David Bomba 2023-05-17 11:15:50 +10:00
parent 4e92f9ad3c
commit 36269e4e1b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/Tax/BaseRule.php
View File

@ -148,8 +148,8 @@ class BaseRule implements RuleInterface
{ {
/* If the client Country is not in the region_codes, we force the company country onto the client? @TODO */ /* If the client Country is not in the region_codes, we force the company country onto the client? @TODO */
if(!array_key_exists($this->client->country->iso_3166_2, $this->region_codes)) { if(!array_key_exists($this->client->country->iso_3166_2, $this->region_codes)) {
$this->client->country_id = $this->invoice->company->settings->country_id; // $this->client->country_id = $this->invoice->company->settings->country_id;
$this->client->saveQuietly(); // $this->client->saveQuietly();
nlog('Automatic tax calculations not supported for this country - defaulting to company country'); nlog('Automatic tax calculations not supported for this country - defaulting to company country');

5
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -144,7 +144,10 @@ class InvoiceItemSum
return $this; return $this;
} }
if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions)) { //only calculate for supported tax jurisdictions if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions) && in_array($this->client->country->iso_3166_2, $this->tax_jurisdictions)) { //only calculate for supported tax jurisdictions
nlog($this->client->country->iso_3166_2);
nlog($this->client->company->country()->iso_3166_2);
$class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule"; $class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule";

8
tests/Feature/Scheduler/SchedulerTest.php
View File

@ -100,7 +100,7 @@ class SchedulerTest extends TestCase
'clients' => [], 'clients' => [],
'report_keys' => [], 'report_keys' => [],
'client_id' => $this->client->hashed_id, 'client_id' => $this->client->hashed_id,
'report_name' => 'product_sales_report', 'report_name' => 'product_sales',
], ],
]; ];
@ -147,7 +147,7 @@ class SchedulerTest extends TestCase
'clients' => [$this->client->hashed_id], 'clients' => [$this->client->hashed_id],
'report_keys' => [], 'report_keys' => [],
'client_id' => null, 'client_id' => null,
'report_name' => 'product_sales_report', 'report_name' => 'product_sales',
], ],
]; ];
@ -193,7 +193,7 @@ class SchedulerTest extends TestCase
'clients' => [], 'clients' => [],
'report_keys' => [], 'report_keys' => [],
'client_id' => null, 'client_id' => null,
'report_name' => 'product_sales_report', 'report_name' => 'product_sales',
], ],
]; ];
@ -234,7 +234,7 @@ class SchedulerTest extends TestCase
'parameters' => [ 'parameters' => [
'date_range' => EmailStatement::LAST_MONTH, 'date_range' => EmailStatement::LAST_MONTH,
'clients' => [], 'clients' => [],
'report_name' => 'product_sales_report', 'report_name' => 'product_sales',
], ],
]; ];