From 03d0babd26a00224f36cc317ae466fb211fb481b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 7 Oct 2019 17:37:46 +1100
Subject: [PATCH] Remove show_currency_symbol

---
 app/DataMapper/ClientSettings.php  | 60 ------------------------------
 app/DataMapper/CompanySettings.php |  2 -
 app/Utils/Number.php               |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php
index 14a499b9b4..3e9fa58944 100644
--- a/app/DataMapper/ClientSettings.php
+++ b/app/DataMapper/ClientSettings.php
@@ -41,66 +41,6 @@ class ClientSettings extends BaseSettings
 		'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
 	 * prevents missing properties from not being returned
diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 177a805014..01a8426ee7 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -27,7 +27,6 @@ class CompanySettings extends BaseSettings
 
 	public $language_id = '';
 	public $precision = 2;
-	public $show_currency_symbol = true;
 	public $show_currency_code = false;
 
 	public $payment_terms = 1; 
@@ -201,7 +200,6 @@ class CompanySettings extends BaseSettings
 		'military_time' => 'bool',
 		'language_id' => 'string',
 		'precision' => 'int',
-		'show_currency_symbol' => 'bool',
 		'show_currency_code' => 'bool',
 		'payment_terms' => 'int', 
 		'custom_label1' => 'string',
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index 0c795d186a..1d6ff50cd6 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -82,7 +82,7 @@ class Number
             return "{$value} {$code}";
         } elseif ($swapSymbol) {
             return "{$value} " . trim($symbol);
-        } elseif ($client->getSetting('show_currency_symbol') == "TRUE") {
+        } elseif ($client->getSetting('show_currency_code') == "FALSE") {
             return "{$symbol}{$value}";
         } else {
             return self::formatValue($value, $currency);