Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for test

Browse Source 
s
This commit is contained in:
David Bomba 2019-09-19 16:22:32 +10:00
parent 86a099587d
commit cc7ee120d5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Client.php
View File

@ -210,14 +210,12 @@ class Client extends BaseModel
//check group level (if a group is assigned)
if($this->group_settings && (property_exists($this->group_settings->settings, $setting) !== false) && (isset($this->group_settings->settings->{$setting}) !== false)){
\Log::error('returning group '.$this->group_settings->{$setting});
return $this->group_settings->settings->{$setting};
}
//check company level
if((property_exists($this->company->settings, $setting) != false ) && (isset($this->company->settings->{$setting}) !== false) ){
\Log::error('returning company '.$this->company->{$setting});
return $this->company->settings->{$setting};
}

4
tests/Unit/InvoiceTest.php
View File

@ -32,8 +32,8 @@ class InvoiceTest extends TestCase
$this->settings = $this->invoice->settings;
$this->settings->custom_taxes1 = true;
$this->settings->custom_taxes2 = true;
$this->settings->custom_invoice_taxes1 = true;
$this->settings->custom_invoice_taxes2 = true;
$this->settings->inclusive_taxes = true;
$this->settings->precision = 2;