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

Configuring invoice settings for consumption

Browse Source
This commit is contained in:
David Bomba 2019-04-08 22:43:20 +10:00
parent 0a1965b598
commit 35c196305e
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/DataMapper/ClientSettings.php
View File

@ -8,11 +8,19 @@ use App\Utils\TranslationHelper;
/** /**
* ClientSettings * ClientSettings
*
* Client settings are built as a superset of Company Settings
*
* If no client settings is specified, the default company setting is used.
*
* Client settings are passed down to the entity level where they can be further customized and then saved
* into the settings column of the entity, so there is no need to create additional entity level settings handlers.
*
*/ */
class ClientSettings extends BaseSettings class ClientSettings extends BaseSettings
{ {
/** /**
* settings which also have a parent company setting * Settings which also have a parent company setting
*/ */
public $timezone_id; public $timezone_id;
public $date_format_id; public $date_format_id;
@ -32,6 +40,7 @@ class ClientSettings extends BaseSettings
public $custom_message_unapproved_quote; public $custom_message_unapproved_quote;
public $show_currency_symbol; public $show_currency_symbol;
public $show_currency_code; public $show_currency_code;
public $inclusive_taxes;
/** /**
* settings which which are unique to client settings * settings which which are unique to client settings
@ -76,7 +85,8 @@ class ClientSettings extends BaseSettings
'send_reminders' => NULL, 'send_reminders' => NULL,
'show_tasks_in_portal' => NULL, 'show_tasks_in_portal' => NULL,
'show_currency_symbol' => NULL, 'show_currency_symbol' => NULL,
'show_currency_code' => NULL 'show_currency_code' => NULL,
'inclusive_taxes' => NULL,
]; ];
} }
@ -98,13 +108,9 @@ class ClientSettings extends BaseSettings
if(!isset($client_settings->{$key}) && property_exists($company_settings, $key)) if(!isset($client_settings->{$key}) && property_exists($company_settings, $key))
$client_settings->{$key} = $company_settings->{$key}; $client_settings->{$key} = $company_settings->{$key};
} }
/** Replace ID with Object for presentation in multi-select */
$client_settings->currency_id = TranslationHelper::getCurrencies()->where('id', $client_settings->currency_id)->first();
$client_settings->language_id = TranslationHelper::getLanguages()->where('id', $client_settings->language_id)->first();
$client_settings->payment_terms = TranslationHelper::getPaymentTerms()->where('num_days', $client_settings->payment_terms)->first();
//todo $client_settings->timezone_id
return $client_settings; return $client_settings;
} }

3
app/DataMapper/CompanySettings.php
View File

@ -64,6 +64,8 @@ class CompanySettings extends BaseSettings
public $custom_message_paid_invoice; public $custom_message_paid_invoice;
public $custom_message_unapproved_quote; public $custom_message_unapproved_quote;
public $inclusive_taxes;
public $translations; public $translations;
/** /**
@ -101,6 +103,7 @@ class CompanySettings extends BaseSettings
'show_tasks_in_portal' => 1, 'show_tasks_in_portal' => 1,
'show_currency_symbol' => 1, 'show_currency_symbol' => 1,
'show_currency_code' => 0, 'show_currency_code' => 0,
'inclusive_taxes' => 1,
'translations' => (object) [], 'translations' => (object) [],
]; ];

11
app/Helpers/Invoice/InvoiceCalc.php
View File

@ -54,10 +54,19 @@ class InvoiceCalc
*/ */
public function build() public function build()
{ {
$this->calcLineItems(); $this->calcLineItems()->calcTaxes();
} }
/**
* Calculates the Invoice Level taxes.
*/
private function calcTaxes()
{
}
/** /**
* Calculates the line items. * Calculates the line items.
* *