Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove show_currency_symbol

Browse Source
This commit is contained in:
David Bomba 2019-10-07 17:37:46 +11:00
parent 5bbc274a48
commit 03d0babd26
3 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/DataMapper/ClientSettings.php
View File

@ -41,66 +41,6 @@ class ClientSettings extends BaseSettings
'size_id' => 'string', 'size_id' => 'string',
]; ];
/*
public static $casts = [
'timezone_id' => 'string',
'date_format' => 'string',
'datetime_format' => 'string',
'military_time' => 'bool',
'start_of_week' => 'int',
'financial_year_start' => 'int',
'payment_terms' => 'string',
'language_id' => 'string',
'precision' => 'int',
'default_task_rate' => 'float',
'send_reminders' => 'bool',
'show_tasks_in_portal' => 'bool',
'custom_message_dashboard' => 'string',
'custom_message_unpaid_invoice' => 'string',
'custom_message_paid_invoice' => 'string',
'custom_message_unapproved_quote' => 'string',
'show_currency_symbol' => 'bool',
'show_currency_code' => 'bool',
'inclusive_taxes' => 'bool',
'custom_invoice_taxes1' => 'bool',
'custom_invoice_taxes2' => 'bool',
'lock_sent_invoices' => 'bool',
'auto_bill' => 'bool',
'auto_archive_invoice' => 'bool',
'invoice_number_prefix' => 'string',
'invoice_number_pattern' => 'string',
'invoice_number_counter' => 'int',
'quote_number_prefix' => 'string',
'quote_number_pattern' => 'string',
'quote_number_counter' => 'int',
'credit_number_prefix' => 'string',
'credit_number_pattern' => 'string',
'credit_number_counter' => 'int',
'shared_invoice_quote_counter' => 'int',
'recurring_invoice_number_prefix' => 'string',
'counter_padding' => 'int',
'industry_id' => 'string',
'size_id' => 'string',
'design' => 'string',
'company_gateways' => 'string',
'invoice_design_id' => 'string',
'quote_design_id' => 'string',
'email_footer' => 'string',
'email_subject_invoice' => 'string',
'email_subject_quote' => 'string',
'email_subject_payment' => 'string',
'email_template_invoice' => 'string',
'email_template_quote' => 'string',
'email_template_payment' => 'string',
'email_subject_reminder1' => 'string',
'email_subject_reminder2' => 'string',
'email_subject_reminder3' => 'string',
'email_template_reminder1' => 'string',
'email_template_reminder2' => 'string',
'email_template_reminder3' => 'string',
];
*/
/** /**
* Cast object values and return entire class * Cast object values and return entire class
* prevents missing properties from not being returned * prevents missing properties from not being returned

2
app/DataMapper/CompanySettings.php
View File

@ -27,7 +27,6 @@ class CompanySettings extends BaseSettings
public $language_id = ''; public $language_id = '';
public $precision = 2; public $precision = 2;
public $show_currency_symbol = true;
public $show_currency_code = false; public $show_currency_code = false;
public $payment_terms = 1; public $payment_terms = 1;
@ -201,7 +200,6 @@ class CompanySettings extends BaseSettings
'military_time' => 'bool', 'military_time' => 'bool',
'language_id' => 'string', 'language_id' => 'string',
'precision' => 'int', 'precision' => 'int',
'show_currency_symbol' => 'bool',
'show_currency_code' => 'bool', 'show_currency_code' => 'bool',
'payment_terms' => 'int', 'payment_terms' => 'int',
'custom_label1' => 'string', 'custom_label1' => 'string',

2
app/Utils/Number.php
View File

@ -82,7 +82,7 @@ class Number
return "{$value} {$code}"; return "{$value} {$code}";
} elseif ($swapSymbol) { } elseif ($swapSymbol) {
return "{$value} " . trim($symbol); return "{$value} " . trim($symbol);
} elseif ($client->getSetting('show_currency_symbol') == "TRUE") { } elseif ($client->getSetting('show_currency_code') == "FALSE") {
return "{$symbol}{$value}"; return "{$symbol}{$value}";
} else { } else {
return self::formatValue($value, $currency); return self::formatValue($value, $currency);