diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php index 9e113ba7b..d327724a9 100644 --- a/app/Views/attributes/item.php +++ b/app/Views/attributes/item.php @@ -85,7 +85,7 @@ foreach($definition_values as $definition_id => $definition_value) \ No newline at end of file + diff --git a/app/Views/attributes/manage.php b/app/Views/attributes/manage.php index a03deece8..d694f97d4 100644 --- a/app/Views/attributes/manage.php +++ b/app/Views/attributes/manage.php @@ -15,7 +15,7 @@ table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'definition_id' }); }); diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php index aab5703f3..4629b3f0f 100644 --- a/app/Views/cashups/form.php +++ b/app/Views/cashups/form.php @@ -43,7 +43,7 @@
- settings['currency_symbol']) ?> + 'open_amount_cash', @@ -52,7 +52,7 @@ 'value' => to_currency_no_money($cash_ups_info->open_amount_cash) ]) ?> - settings['currency_symbol']) ?> +
@@ -63,7 +63,7 @@
- settings['currency_symbol']) ?> + 'transfer_amount_cash', @@ -73,7 +73,7 @@ ]) ?> - settings['currency_symbol']) ?> +
@@ -106,7 +106,7 @@
- settings['currency_symbol']) ?> + 'closed_amount_cash', @@ -115,7 +115,7 @@ 'value'=>to_currency_no_money($cash_ups_info->closed_amount_cash)] ) ?> - settings['currency_symbol']) ?> +
@@ -138,7 +138,7 @@
- settings['currency_symbol']) ?> + 'closed_amount_due', @@ -147,7 +147,7 @@ 'value'=>to_currency_no_money($cash_ups_info->closed_amount_due)] ) ?> - settings['currency_symbol']) ?> +
@@ -158,7 +158,7 @@
- settings['currency_symbol']) ?> + 'closed_amount_card', @@ -167,7 +167,7 @@ 'value'=>to_currency_no_money($cash_ups_info->closed_amount_card)] ) ?> - settings['currency_symbol']) ?> +
@@ -178,7 +178,7 @@
- settings['currency_symbol']) ?> + 'closed_amount_check', @@ -187,7 +187,7 @@ 'value'=>to_currency_no_money($cash_ups_info->closed_amount_check)] ) ?> - settings['currency_symbol']) ?> +
@@ -198,7 +198,7 @@
- settings['currency_symbol']) ?> + 'closed_amount_total', @@ -209,7 +209,7 @@ ] ) ?> - settings['currency_symbol']) ?> +
@@ -256,12 +256,12 @@ $(document).ready(function() $('#open_date').datetimepicker({ - format: "settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>", - startDate: "settings['dateformat'] . ' ' . esc(config('OSPOS')->settings['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>", + format: "", + startDate: "", settings['timeformat']; + $t = $config['timeformat']; $m = $t[strlen($t)-1]; - if( strpos(config('OSPOS')->settings['timeformat'], 'a') !== false || strpos(config('OSPOS')->settings['timeformat'], 'A') !== false ) + if( strpos($config['timeformat'], 'a') !== false || strpos($config['timeformat'], 'A') !== false ) { ?> showMeridian: true, @@ -283,12 +283,12 @@ $(document).ready(function() }); $('#close_date').datetimepicker({ - format: "settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>", - startDate: "settings['dateformat'] . ' ' . esc(config('OSPOS')->settings['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>", + format: "", + startDate: "", settings['timeformat']; + $t = $config['timeformat']; $m = $t[strlen($t)-1]; - if( strpos(config('OSPOS')->settings['timeformat'], 'a') !== false || strpos(config('OSPOS')->settings['timeformat'], 'A') !== false ) + if( strpos($config['timeformat'], 'a') !== false || strpos($config['timeformat'], 'A') !== false ) { ?> showMeridian: true, diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php index 513f0f728..998d1dead 100644 --- a/app/Views/cashups/manage.php +++ b/app/Views/cashups/manage.php @@ -27,7 +27,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'cashup_id', queryParams: function() { return $.extend(arguments[0], { diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php index 00f3be399..a8f41bab4 100644 --- a/app/Views/configs/barcode_config.php +++ b/app/Views/configs/barcode_config.php @@ -12,7 +12,7 @@
'control-label col-xs-2']) ?>
- settings['barcode_type'], 'attr'), ['class' => 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
@@ -27,7 +27,7 @@ 'name' => 'barcode_width', 'id' => 'barcode_width', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['barcode_width'] + 'value' => $config['barcode_width'] ]) ?> @@ -42,7 +42,7 @@ 'name' => 'barcode_height', 'id' => 'barcode_height', 'class' => 'form-control input-sm required', - 'value'=>config('OSPOS')->settings['barcode_height'] + 'value'=>$config['barcode_height'] ]) ?> @@ -53,7 +53,7 @@ barcode_lib->listfonts('fonts'), 'attr'), - esc(config('OSPOS')->settings['barcode_font'], 'attr'), + esc($config['barcode_font'], 'attr'), ['class' => 'form-control input-sm required'] ) ?> @@ -65,7 +65,7 @@ 'name' => 'barcode_font_size', 'id' => 'barcode_font_size', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['barcode_font_size'] + 'value' => $config['barcode_font_size'] ]) ?> @@ -77,7 +77,7 @@ 'name' => 'allow_duplicate_barcodes', 'id' => 'allow_duplicate_barcodes', 'value' => 'allow_duplicate_barcodes', - 'checked' => config('OSPOS')->settings['allow_duplicate_barcodes'] + 'checked' => $config['allow_duplicate_barcodes'] ]) ?>   @@ -101,7 +101,7 @@ 'barcode_content', 'value' => 'number', - 'checked' => config('OSPOS')->settings['barcode_content'] === 'number']) ?> + 'checked' => $config['barcode_content'] === 'number']) ?>   @@ -110,7 +110,7 @@ 'barcode_generate_if_empty', 'value' => 'barcode_generate_if_empty', - 'checked' => config('OSPOS')->settings['barcode_generate_if_empty'] + 'checked' => $config['barcode_generate_if_empty'] ]) ?> @@ -121,7 +121,7 @@ 'control-label col-xs-2']) ?>
settings['barcode_formats']); + $barcode_formats = json_decode($config['barcode_formats']); echo form_dropdown ([ 'name' => 'barcode_formats[]', 'id' => 'barcode_formats', @@ -146,7 +146,7 @@ 'unit_price' => lang('Items.unit_price'), 'company_name' => lang('Suppliers.company_name') ], - config('OSPOS')->settings['barcode_first_row'], ['class' => 'form-control input-sm']); + $config['barcode_first_row'], ['class' => 'form-control input-sm']); ?>
@@ -160,7 +160,7 @@ 'item_code' => lang('Items.item_number'), 'company_name' => lang('Suppliers.company_name') ], - config('OSPOS')->settings['barcode_second_row'], ['class' => 'form-control input-sm']) ?> + $config['barcode_second_row'], ['class' => 'form-control input-sm']) ?>
@@ -173,7 +173,7 @@ 'item_code' => lang('Items.item_number'), 'company_name' => lang('Suppliers.company_name') ], - config('OSPOS')->settings['barcode_third_row'], ['class' => 'form-control input-sm']) ?> + $config['barcode_third_row'], ['class' => 'form-control input-sm']) ?>
@@ -186,7 +186,7 @@ 'name' => 'barcode_num_in_row', 'id' => 'barcode_num_in_row', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['barcode_num_in_row'] + 'value' => $config['barcode_num_in_row'] ]) ?> @@ -199,7 +199,7 @@ 'name' => 'barcode_page_width', 'id' => 'barcode_page_width', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['barcode_page_width'] + 'value' => $config['barcode_page_width'] ]) ?> % @@ -214,7 +214,7 @@ 'name' => 'barcode_page_cellspacing', 'id' => 'barcode_page_cellspacing', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['barcode_page_cellspacing'] + 'value' => $config['barcode_page_cellspacing'] ]) ?> px diff --git a/app/Views/configs/email_config.php b/app/Views/configs/email_config.php index 5d89e5be3..1b90dd51d 100644 --- a/app/Views/configs/email_config.php +++ b/app/Views/configs/email_config.php @@ -13,7 +13,7 @@ 'sendmail' => 'sendmail', 'smtp' => 'smtp' ], - esc(config('OSPOS')->settings['protocol'], 'attr'), + esc($config['protocol'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'protocol']) ?> @@ -26,7 +26,7 @@ 'name' => 'mailpath', 'id' => 'mailpath', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['mailpath'], 'attr') + 'value' => esc($config['mailpath'], 'attr') ]) ?> @@ -38,7 +38,7 @@ 'name' => 'smtp_host', 'id' => 'smtp_host', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['smtp_host'], 'attr') + 'value' => esc($config['smtp_host'], 'attr') ]) ?> @@ -50,7 +50,7 @@ 'name' => 'smtp_port', 'id' => 'smtp_port', 'class' => 'form-control input-sm', - 'value' => config('OSPOS')->settings['smtp_port'] + 'value' => $config['smtp_port'] ]) ?> @@ -63,7 +63,7 @@ 'tls' => 'TLS', 'ssl' => 'SSL' ], - esc(config('OSPOS')->settings['smtp_crypto'], 'attr'), + esc($config['smtp_crypto'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'smtp_crypto']) ?> @@ -76,7 +76,7 @@ 'name' => 'smtp_timeout', 'id' => 'smtp_timeout', 'class' => 'form-control input-sm', - 'value' => config('OSPOS')->settings['smtp_timeout'] + 'value' => $config['smtp_timeout'] ]) ?> @@ -90,7 +90,7 @@ 'name' => 'smtp_user', 'id' => 'smtp_user', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['smtp_user'], 'attr') + 'value' => esc($config['smtp_user'], 'attr') ]) ?> @@ -105,7 +105,7 @@ 'name' => 'smtp_pass', 'id' => 'smtp_pass', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['smtp_pass'], 'attr') + 'value' => esc($config['smtp_pass'], 'attr') ]) ?> diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php index 8480bf9de..9a5e4dca0 100644 --- a/app/Views/configs/general_config.php +++ b/app/Views/configs/general_config.php @@ -18,11 +18,11 @@
- settings['theme'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'theme-change']) ?> + 'form-control input-sm', 'id' => 'theme-change']) ?>
- - settings['theme'])) . ' ' ?> + +
@@ -38,7 +38,7 @@ 'floating_labels' => lang('Config.floating_labels'), 'input_groups' => lang('Config.input_groups') ], - esc(config('OSPOS')->settings['login_form'], 'attr'), + esc($config['login_form'], 'attr'), ['class' => 'form-control input-sm'] ) ?>
@@ -55,7 +55,7 @@ 'type' => 'number', 'min' => 0, 'max' => 100, - 'value' => config('OSPOS')->settings['default_sales_discount'] + 'value' => $config['default_sales_discount'] ]) ?> 'toggle', 'data-size' => 'normal', 'data-onstyle' => 'success', - 'data-on' => '' . esc(config('OSPOS')->settings['currency_symbol'], 'attr').'', + 'data-on' => '' . esc($config['currency_symbol'], 'attr').'', 'data-off' => '%', - 'checked' => config('OSPOS')->settings['default_sales_discount_type'] + 'checked' => $config['default_sales_discount_type'] ]) ?> @@ -85,7 +85,7 @@ 'type' => 'number', 'min' => 0, 'max' => 100, - 'value' => config('OSPOS')->settings['default_receivings_discount'] + 'value' => $config['default_receivings_discount'] ]) ?> 'toggle', 'data-size' => 'normal', 'data-onstyle' => 'success', - 'data-on' => '' . esc(config('OSPOS')->settings['currency_symbol'], 'attr') . '', + 'data-on' => '' . esc($config['currency_symbol'], 'attr') . '', 'data-off' => '%', - 'checked' => config('OSPOS')->settings['default_receivings_discount_type'] + 'checked' => $config['default_receivings_discount_type'] ]) ?> @@ -111,7 +111,7 @@ 'name' => 'enforce_privacy', 'id' => 'enforce_privacy', 'value' => 'enforce_privacy', - 'checked' => config('OSPOS')->settings['enforce_privacy'] + 'checked' => $config['enforce_privacy'] ]) ?>   @@ -77,7 +77,7 @@ 'email_receipt_check_behaviour', 'value' => 'last', - 'checked' => config('OSPOS')->settings['email_receipt_check_behaviour'] == 'last' + 'checked' => $config['email_receipt_check_behaviour'] == 'last' ]) ?> @@ -91,7 +91,7 @@ 'print_receipt_check_behaviour', 'value' => 'always', - 'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'always' + 'checked' => $config['print_receipt_check_behaviour'] == 'always' ]) ?> @@ -99,7 +99,7 @@ 'print_receipt_check_behaviour', 'value' => 'never', - 'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'never' + 'checked' => $config['print_receipt_check_behaviour'] == 'never' ]) ?> @@ -107,7 +107,7 @@ 'print_receipt_check_behaviour', 'value' => 'last', - 'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'last' + 'checked' => $config['print_receipt_check_behaviour'] == 'last' ]) ?> @@ -121,7 +121,7 @@ 'name' => 'receipt_show_company_name', 'value' => 'receipt_show_company_name', 'id' => 'receipt_show_company_name', - 'checked' => config('OSPOS')->settings['receipt_show_company_name'] + 'checked' => $config['receipt_show_company_name'] ]) ?> @@ -133,7 +133,7 @@ 'name' => 'receipt_show_taxes', 'value' => 'receipt_show_taxes', 'id' => 'receipt_show_taxes', - 'checked' => config('OSPOS')->settings['receipt_show_taxes'] + 'checked' => $config['receipt_show_taxes'] ]) ?> @@ -145,7 +145,7 @@ 'name' => 'receipt_show_tax_ind', 'value' => 'receipt_show_tax_ind', 'id' => 'receipt_show_tax_ind', - 'checked' => config('OSPOS')->settings['receipt_show_tax_ind'] + 'checked' => $config['receipt_show_tax_ind'] ]) ?> @@ -157,7 +157,7 @@ 'name' => 'receipt_show_total_discount', 'value' => 'receipt_show_total_discount', 'id' => 'receipt_show_total_discount', - 'checked' => config('OSPOS')->settings['receipt_show_total_discount'] + 'checked' => $config['receipt_show_total_discount'] ]) ?> @@ -169,7 +169,7 @@ 'name' => 'receipt_show_description', 'value' => 'receipt_show_description', 'id' => 'receipt_show_description', - 'checked' => config('OSPOS')->settings['receipt_show_description'] + 'checked' => $config['receipt_show_description'] ]) ?> @@ -181,7 +181,7 @@ 'name' => 'receipt_show_serialnumber', 'value' => 'receipt_show_serialnumber', 'id' => 'receipt_show_serialnumber', - 'checked' => config('OSPOS')->settings['receipt_show_serialnumber'] + 'checked' => $config['receipt_show_serialnumber'] ]) ?> @@ -193,7 +193,7 @@ 'name' => 'print_silently', 'id' => 'print_silently', 'value' => 'print_silently', - 'checked' => config('OSPOS')->settings['print_silently'] + 'checked' => $config['print_silently'] ]) ?> @@ -205,7 +205,7 @@ 'name' => 'print_header', 'id' => 'print_header', 'value' => 'print_header', - 'checked' => config('OSPOS')->settings['print_header'] + 'checked' => $config['print_header'] ]) ?> @@ -217,7 +217,7 @@ 'name' => 'print_footer', 'id' => 'print_footer', 'value' => 'print_footer', - 'checked' => config('OSPOS')->settings['print_footer'] + 'checked' => $config['print_footer'] ]) ?> @@ -254,7 +254,7 @@ 'name' => 'print_top_margin', 'id' => 'print_top_margin', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['print_top_margin'] + 'value' => $config['print_top_margin'] ]) ?> px @@ -272,7 +272,7 @@ 'name' => 'print_left_margin', 'id' => 'print_left_margin', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['print_left_margin'] + 'value' => $config['print_left_margin'] ]) ?> px @@ -290,7 +290,7 @@ 'name' => 'print_bottom_margin', 'id' => 'print_bottom_margin', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['print_bottom_margin'] + 'value' => $config['print_bottom_margin'] ]) ?> px @@ -308,7 +308,7 @@ 'name' => 'print_right_margin', 'id' => 'print_right_margin', 'class' => 'form-control input-sm required', - 'value' => config('OSPOS')->settings['print_right_margin'] + 'value' => $config['print_right_margin'] ]) ?> px diff --git a/app/Views/configs/reward_config.php b/app/Views/configs/reward_config.php index f5f9d64bb..a4478fb5e 100644 --- a/app/Views/configs/reward_config.php +++ b/app/Views/configs/reward_config.php @@ -16,7 +16,7 @@ 'name' => 'customer_reward_enable', 'value' => 'customer_reward_enable', 'id' => 'customer_reward_enable', - 'checked' => config('OSPOS')->settings['customer_reward_enable'] + 'checked' => $config['customer_reward_enable'] ]) ?> diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php index fd2f3837d..1b1805c9e 100644 --- a/app/Views/configs/system_info.php +++ b/app/Views/configs/system_info.php @@ -182,7 +182,7 @@ ?>


-
+

@@ -204,6 +204,6 @@ }); if($('#timezone').html() !== $('#ostimezone').html()) - document.getElementById("TimeError").innerHTML = '


settings['timezone']) ?>

'; + document.getElementById("TimeError").innerHTML = '



'; diff --git a/app/Views/configs/table_config.php b/app/Views/configs/table_config.php index 77bbe1f34..21e81df98 100644 --- a/app/Views/configs/table_config.php +++ b/app/Views/configs/table_config.php @@ -16,7 +16,7 @@ 'name' => 'dinner_table_enable', 'value' => 'dinner_table_enable', 'id' => 'dinner_table_enable', - 'checked' => config('OSPOS')->settings['dinner_table_enable'] + 'checked' => $config['dinner_table_enable'] ]) ?> diff --git a/app/Views/configs/tax_config.php b/app/Views/configs/tax_config.php index 221b0f57c..9770bfd92 100644 --- a/app/Views/configs/tax_config.php +++ b/app/Views/configs/tax_config.php @@ -19,7 +19,7 @@ 'name' => 'tax_id', 'id' => 'tax_id', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['tax_id'], 'attr') + 'value' => esc($config['tax_id'], 'attr') ]) ?> @@ -31,7 +31,7 @@ 'name' => 'tax_included', 'id' => 'tax_included', 'value' => 'tax_included', - 'checked' => config('OSPOS')->settings['tax_included'] + 'checked' => $config['tax_included'] ]) ?> @@ -43,14 +43,14 @@ 'name' => 'default_tax_1_name', 'id' => 'default_tax_1_name', 'class' => 'form-control input-sm', - 'value' => config('OSPOS')->settings['default_tax_1_name'] !== FALSE ? esc(config('OSPOS')->settings['default_tax_1_name'], 'attr') : lang('Items.sales_tax_1')]) ?> + 'value' => $config['default_tax_1_name'] !== FALSE ? esc($config['default_tax_1_name'], 'attr') : lang('Items.sales_tax_1')]) ?>
'default_tax_1_rate', 'id' => 'default_tax_1_rate', 'class' => 'form-control input-sm', - 'value' => to_tax_decimals(config('OSPOS')->settings['default_tax_1_rate']) + 'value' => to_tax_decimals($config['default_tax_1_rate']) ]) ?> %
@@ -63,7 +63,7 @@ 'name' => 'default_tax_2_name', 'id' => 'default_tax_2_name', 'class' => 'form-control input-sm', - 'value' => config('OSPOS')->settings['default_tax_2_name'] !== FALSE ? esc(config('OSPOS')->settings['default_tax_2_name'], 'attr') : lang('Items.sales_tax_2') + 'value' => $config['default_tax_2_name'] !== FALSE ? esc($config['default_tax_2_name'], 'attr') : lang('Items.sales_tax_2') ]) ?>
@@ -71,7 +71,7 @@ 'name' => 'default_tax_2_rate', 'id' => 'default_tax_2_rate', 'class' => 'form-control input-sm', - 'value' => to_tax_decimals(config('OSPOS')->settings['default_tax_2_rate']) + 'value' => to_tax_decimals($config['default_tax_2_rate']) ]) ?> %
@@ -84,7 +84,7 @@ 'name' => 'use_destination_based_tax', 'id' => 'use_destination_based_tax', 'value' => 'use_destination_based_tax', - 'checked' => config('OSPOS')->settings['use_destination_based_tax'] + 'checked' => $config['use_destination_based_tax'] ]) ?> @@ -92,21 +92,21 @@
'control-label col-xs-2']) ?>
- settings['default_tax_code'], 'attr'), ['class' => 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
'control-label col-xs-2']) ?>
- settings['default_tax_category'], 'attr'), ['class' => 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
'control-label col-xs-2']) ?>
- settings['default_tax_jurisdiction'], 'attr'), ['class' => 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
diff --git a/app/Views/customers/form.php b/app/Views/customers/form.php index a85d977ca..ddb69bb6c 100644 --- a/app/Views/customers/form.php +++ b/app/Views/customers/form.php @@ -46,7 +46,7 @@
'required control-label col-xs-3']) ?>
- consent == '' ? !config('OSPOS')->settings['enforce_privacy'] : (boolean)$person_info->consent) ?> + consent == '' ? !$config['enforce_privacy'] : (boolean)$person_info->consent) ?>
@@ -129,7 +129,7 @@ - settings['customer_reward_enable'] == TRUE): ?> +
'control-label col-xs-3']) ?>
@@ -225,7 +225,7 @@
- settings['currency_symbol']) ?> + 'total', @@ -235,7 +235,7 @@ 'disabled' => '' ]) ?> - settings['currency_symbol']) ?> +
@@ -246,7 +246,7 @@
- settings['currency_symbol']) ?> + 'max', @@ -256,7 +256,7 @@ 'disabled' => '' ]) ?> - settings['currency_symbol']) ?> +
@@ -267,7 +267,7 @@
- settings['currency_symbol']) ?> + 'min', @@ -277,7 +277,7 @@ 'disabled' => '' ]) ?> - settings['currency_symbol']) ?> +
@@ -288,7 +288,7 @@
- settings['currency_symbol']) ?> + 'average', @@ -298,7 +298,7 @@ 'disabled' => '' ]) ?> - settings['currency_symbol']) ?> +
diff --git a/app/Views/expenses/form.php b/app/Views/expenses/form.php index 9094c75fe..dd04d0b5a 100644 --- a/app/Views/expenses/form.php +++ b/app/Views/expenses/form.php @@ -73,7 +73,7 @@
- settings['currency_symbol']) ?> + 'amount', @@ -82,7 +82,7 @@ 'value' => to_currency_no_money($expenses_info->amount) ]) ?> - settings['currency_symbol']) ?> +
@@ -93,7 +93,7 @@
- settings['currency_symbol']) ?> + 'tax_amount', @@ -102,7 +102,7 @@ 'value' => to_currency_no_money($expenses_info->tax_amount) ]) ?> - settings['currency_symbol']) ?> +
diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php index 0d482f634..e5cf62814 100644 --- a/app/Views/expenses/manage.php +++ b/app/Views/expenses/manage.php @@ -27,7 +27,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'expense_id', onLoadSuccess: function(response) { if($("#table tbody tr").length > 1) { diff --git a/app/Views/expenses_categories/manage.php b/app/Views/expenses_categories/manage.php index eaeb83714..766e5b11d 100644 --- a/app/Views/expenses_categories/manage.php +++ b/app/Views/expenses_categories/manage.php @@ -14,7 +14,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'expense_category_id', }); diff --git a/app/Views/giftcards/form.php b/app/Views/giftcards/form.php index 2ec465bd1..2f68c6c2d 100644 --- a/app/Views/giftcards/form.php +++ b/app/Views/giftcards/form.php @@ -29,7 +29,7 @@ settings['giftcard_number'] == 'series') + if($config['giftcard_number'] == 'series') { $class = ' required'; } @@ -51,7 +51,7 @@
- settings['currency_symbol']) ?> + 'giftcard_amount', @@ -60,7 +60,7 @@ 'value'=>to_currency_no_money($giftcard_value) ]) ?> - settings['currency_symbol']) ?> +
@@ -113,7 +113,7 @@ $(document).ready(function() rules: { settings['giftcard_number'] == 'series') + if($config['giftcard_number'] == 'series') { ?> giftcard_number: @@ -146,7 +146,7 @@ $(document).ready(function() messages: { settings['giftcard_number'] == 'series') + if($config['giftcard_number'] == 'series') { ?> giftcard_number: diff --git a/app/Views/giftcards/manage.php b/app/Views/giftcards/manage.php index 67df3599e..49cf291c1 100644 --- a/app/Views/giftcards/manage.php +++ b/app/Views/giftcards/manage.php @@ -12,7 +12,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'giftcard_id' }); }); @@ -37,4 +37,4 @@ $(document).ready(function()
- \ No newline at end of file + diff --git a/app/Views/item_kits/manage.php b/app/Views/item_kits/manage.php index 4a2ba4f5a..5a772f299 100644 --- a/app/Views/item_kits/manage.php +++ b/app/Views/item_kits/manage.php @@ -14,7 +14,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'item_kit_id' }); @@ -52,4 +52,4 @@ $(document).ready(function()
- \ No newline at end of file + diff --git a/app/Views/items/form.php b/app/Views/items/form.php index dd99b7c71..5fb45e3f6 100644 --- a/app/Views/items/form.php +++ b/app/Views/items/form.php @@ -62,7 +62,7 @@
settings['category_dropdown']) + if($config['category_dropdown']) { echo form_dropdown('category', esc($categories, 'attr'), $selected_category, ['class' => 'form-control']); } @@ -146,7 +146,7 @@ echo form_radio($radio_button) ?> settings['derive_sale_quantity'] == '1') + if($config['derive_sale_quantity'] == '1') { ?>
@@ -263,7 +263,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_2', 'class' => 'form-control input-sm', - 'value' => isset($item_tax_info[1]['name']) ? esc($item_tax_info[1]['name'], 'attr') : esc(config('OSPOS')->settings['default_tax_2_name'], 'attr') + 'value' => isset($item_tax_info[1]['name']) ? esc($item_tax_info[1]['name'], 'attr') : esc($config['default_tax_2_name'], 'attr') ]) ?>
@@ -420,7 +420,7 @@
settings['multi_pack_enabled'] == '1') + if($config['multi_pack_enabled'] == '1') { ?>
diff --git a/app/Views/items/form_bulk.php b/app/Views/items/form_bulk.php index 20e3f3c81..9197daf9f 100644 --- a/app/Views/items/form_bulk.php +++ b/app/Views/items/form_bulk.php @@ -49,7 +49,7 @@
- settings['currency_symbol']) ?> + 'cost_price', @@ -57,7 +57,7 @@ 'class' => 'form-control input-sm' ]) ?> - settings['currency_symbol']) ?> +
@@ -68,7 +68,7 @@
- settings['currency_symbol']) ?> + 'unit_price', @@ -76,7 +76,7 @@ 'class' => 'form-control input-sm' ]) ?> - settings['currency_symbol']) ?> +
@@ -89,7 +89,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_1', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['default_tax_1_name'], 'attr') + 'value' => esc($config['default_tax_1_name'], 'attr') ]) ?>
@@ -98,7 +98,7 @@ 'name' => 'tax_percents[]', 'id' => 'tax_percent_name_1', 'class' => 'form-control input-sm', - 'value'=>to_tax_decimals(config('OSPOS')->settings['default_tax_1_rate']) + 'value'=>to_tax_decimals($config['default_tax_1_rate']) ]) ?> %
@@ -112,7 +112,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_2', 'class' => 'form-control input-sm', - 'value' => esc(config('OSPOS')->settings['default_tax_2_name'], 'attr') + 'value' => esc($config['default_tax_2_name'], 'attr') ]) ?>
@@ -121,7 +121,7 @@ 'name' => 'tax_percents[]', 'id' => 'tax_percent_name_2', 'class' => 'form-control input-sm', - 'value' => to_tax_decimals(config('OSPOS')->settings['default_tax_2_rate']) + 'value' => to_tax_decimals($config['default_tax_2_rate']) ]) ?> %
diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php index f89c1ffa5..36e4c6fde 100644 --- a/app/Views/items/manage.php +++ b/app/Views/items/manage.php @@ -32,7 +32,7 @@ $(document).ready(function() // load the preset daterange picker // set the beginning of time as starting date - $('#daterangepicker').data('daterangepicker').setStartDate("settings['dateformat'], mktime(0,0,0,01,01,2010)) ?>"); + $('#daterangepicker').data('daterangepicker').setStartDate(""); // update the hidden inputs with the selected dates before submitting the search data var start_date = ""; $("#daterangepicker").on('apply.daterangepicker', function(ev, picker) { @@ -52,7 +52,7 @@ $(document).ready(function() employee_id: get_logged_in_employee_info()->person_id ?>, resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'items.item_id', queryParams: function() { return $.extend(arguments[0], { diff --git a/app/Views/messages/form_sms.php b/app/Views/messages/form_sms.php index 3a8e07176..edfcf2d83 100644 --- a/app/Views/messages/form_sms.php +++ b/app/Views/messages/form_sms.php @@ -34,7 +34,7 @@
'message', 'class' => 'control-label col-xs-2 required']) ?>
- 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc(config('OSPOS')->settings['msg_msg'], 'attr')]) ?> + 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc($config['msg_msg'], 'attr')]) ?>
diff --git a/app/Views/partial/datepicker_locale.php b/app/Views/partial/datepicker_locale.php index a225eca7b..faee25bb0 100644 --- a/app/Views/partial/datepicker_locale.php +++ b/app/Views/partial/datepicker_locale.php @@ -2,11 +2,11 @@ var pickerconfig = function(config) { return $.extend({ - format: "settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>", + format: "", settings['timeformat']; + $t = $config['timeformat']; $m = $t[strlen($t)-1]; - if( strpos(config('OSPOS')->settings['timeformat'], 'a') !== false || strpos(config('OSPOS')->settings['timeformat'], 'A') !== false ) + if( strpos($config['timeformat'], 'a') !== false || strpos($config['timeformat'], 'A') !== false ) { ?> showMeridian: true, @@ -28,7 +28,7 @@ var pickerconfig = function(config) { }, ); }; -$.fn.datetimepicker.dates['settings['language'] ?>'] = { +$.fn.datetimepicker.dates[''] = { days: [ "", "", @@ -87,13 +87,13 @@ $.fn.datetimepicker.dates['settings['language'] ?>'] ], today: "", settings['timeformat'], 'a') !== false ) + if( strpos($config['timeformat'], 'a') !== false ) { ?> meridiem: ["am", "pm"], settings['timeformat'], 'A') !== false ) + elseif( strpos($config['timeformat'], 'A') !== false ) { ?> meridiem: ["AM", "PM"], diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php index 7e5ca51a9..9a6f13837 100644 --- a/app/Views/partial/daterangepicker.php +++ b/app/Views/partial/daterangepicker.php @@ -1,5 +1,5 @@ lang->load("calendar"); $this->lang->load("date"); - if(empty(config('OSPOS')->settings['date_or_time_format'])) + if(empty($config['date_or_time_format'])) { ?> $('#daterangepicker').css("width","180"); @@ -9,64 +9,64 @@ $('#daterangepicker').daterangepicker({ "ranges": { "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>", - "settings['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,date("m")-1,1,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,1,1,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,1,1,date("Y")-1)) ?>", - "settings['dateformat'], mktime(0,0,0,1,1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y")-1)) ?>", - "settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))-1) ?>" + "", + "" ], "": [ - "settings['dateformat'], mktime(0,0,0,1,1,2010)) ?>", - "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>" + "", + "" ], }, "locale": { - "format": 'settings['dateformat']) ?>', + "format": '', "separator": " - ", "applyLabel": "", "cancelLabel": "", @@ -100,10 +100,10 @@ "firstDay": }, "alwaysShowCalendars": true, - "startDate": "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>", - "endDate": "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>", - "minDate": "settings['dateformat'], mktime(0,0,0,01,01,2010)) ?>", - "maxDate": "settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>" + "startDate": "", + "endDate": "", + "minDate": "", + "maxDate": "" }, function(start, end, label) { start_date = start.format('YYYY-MM-DD'); end_date = end.format('YYYY-MM-DD'); @@ -119,64 +119,64 @@ $('#daterangepicker').daterangepicker({ "ranges": { "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m")-1,1,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),0,date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,date("Y")-1)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,12,31,date("Y")-1)) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y")-1)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,config('OSPOS')->settings['financial_year'],0,date("Y"))) ?>" + "", + "" ], "": [ - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,2010)) ?>", - "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "", + "" ], }, "locale": { - "format": 'settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat']) ?>', + "format": '', "separator": " - ", "applyLabel": "", "cancelLabel": "", @@ -212,10 +212,10 @@ "timePicker": true, "timePickerSeconds": true, "alwaysShowCalendars": true, - "startDate": "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>", - "endDate": "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>", - "minDate": "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,01,01,2010)) ?>", - "maxDate": "settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>" + "startDate": "", + "endDate": "", + "minDate": "", + "maxDate": "" }, function(start, end, label) { start_date = start.format('YYYY-MM-DD HH:mm:ss'); end_date = end.format('YYYY-MM-DD HH:mm:ss'); diff --git a/app/Views/partial/header_js.php b/app/Views/partial/header_js.php index 248109ed8..687b239d6 100644 --- a/app/Views/partial/header_js.php +++ b/app/Views/partial/header_js.php @@ -8,12 +8,12 @@ clock_tick(); var update_clock = function update_clock() { - document.getElementById('liveclock').innerHTML = moment().format("settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat']) ?>"); + document.getElementById('liveclock').innerHTML = moment().format(""); } $.notifyDefaults({ placement: { - align: "settings['notify_horizontal_position'], 'js') ?>", - from: "settings['notify_vertical_position'], 'js') ?>" + align: "", + from: "" }}); var cookie_name = "prefix, 'js') . esc(config('Security')->cookieName, 'js') ?>"; diff --git a/app/Views/partial/print_receipt.php b/app/Views/partial/print_receipt.php index 5a260062f..545acd66b 100644 --- a/app/Views/partial/print_receipt.php +++ b/app/Views/partial/print_receipt.php @@ -11,12 +11,12 @@ function printdoc() if (window.jsPrintSetup) { // set top margins in millimeters - jsPrintSetup.setOption('marginTop', 'settings['print_top_margin'] ?>'); - jsPrintSetup.setOption('marginLeft', 'settings['print_left_margin'] ?>'); - jsPrintSetup.setOption('marginBottom', 'settings['print_bottom_margin'] ?>'); - jsPrintSetup.setOption('marginRight', 'settings['print_right_margin'] ?>'); + jsPrintSetup.setOption('marginTop', ''); + jsPrintSetup.setOption('marginLeft', ''); + jsPrintSetup.setOption('marginBottom', ''); + jsPrintSetup.setOption('marginRight', ''); - settings['print_header']) + // set page header @@ -25,7 +25,7 @@ function printdoc() jsPrintSetup.setOption('headerStrRight', ''); settings['print_footer']) + if (!$config['print_footer']) { ?> // set empty page footer @@ -47,7 +47,7 @@ function printdoc() // clears user preferences always silent print value // to enable using 'printSilent' option jsPrintSetup.clearSilentPrint(); - settings['print_silently']) + // Suppress print dialog (for this context only) @@ -80,7 +80,7 @@ if($print_after_sale) // after a delay, return to sales view setTimeout(function () { window.location.href = ""; - }, settings['print_delay_autoreturn'] * 1000 ?>); + }, ); }); ', - country_codes: 'settings['country_codes'], 'js') ?>' + country_codes: '' }); }); - \ No newline at end of file + diff --git a/app/Views/people/manage.php b/app/Views/people/manage.php index 9e98e7562..cc46c0f6f 100644 --- a/app/Views/people/manage.php +++ b/app/Views/people/manage.php @@ -14,7 +14,7 @@ $(document).ready(function() table_support.init({ resource: '', headers: , - pageSize: settings['lines_per_page'] ?>, + pageSize: , uniqueId: 'people.person_id', enableActions: function() { diff --git a/app/Views/receivings/receipt.php b/app/Views/receivings/receipt.php index e2bd12df9..2c172cc12 100644 --- a/app/Views/receivings/receipt.php +++ b/app/Views/receivings/receipt.php @@ -33,25 +33,25 @@
settings['company_logo'] != '') + if ($config['company_logo'] != '') { ?> -
company_logo
+
company_logo
settings['receipt_show_company_name']) + if ($config['receipt_show_company_name']) { ?> -
settings['company']) ?>
+
-
settings['address'])) ?>
-
settings['phone']) ?>
+
+
@@ -158,7 +158,7 @@
- settings['return_policy'])) ?> +
diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php index 515c1df47..9b82311da 100644 --- a/app/Views/receivings/receiving.php +++ b/app/Views/receivings/receiving.php @@ -204,7 +204,7 @@ if (isset($success)) 'data-toggle' => "toggle", 'data-size' => 'small', 'data-onstyle' => 'success', - 'data-on' => '' . esc(config('OSPOS')->settings['currency_symbol'], 'attr') .'', + 'data-on' => '' . esc($config['currency_symbol'], 'attr') .'', 'data-off' => '%', 'data-line' => esc($line, 'attr'), 'checked' => $item['discount_type'] diff --git a/app/Views/reports/date_input.php b/app/Views/reports/date_input.php index 353f6498d..82d3d8673 100644 --- a/app/Views/reports/date_input.php +++ b/app/Views/reports/date_input.php @@ -73,7 +73,7 @@ if(isset($error))
'required control-label col-xs-2']) ?>
- settings['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?> + 'discount_type_id', 'class' => 'form-control']) ?>
\ No newline at end of file + diff --git a/app/Views/reports/graphs/bar.php b/app/Views/reports/graphs/bar.php index 174c257ee..6be2ce9a7 100644 --- a/app/Views/reports/graphs/bar.php +++ b/app/Views/reports/graphs/bar.php @@ -52,13 +52,13 @@ if( currency_side() ) { ?> - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; \ No newline at end of file + diff --git a/app/Views/reports/graphs/hbar.php b/app/Views/reports/graphs/hbar.php index 8427eb7ce..14cd98b62 100644 --- a/app/Views/reports/graphs/hbar.php +++ b/app/Views/reports/graphs/hbar.php @@ -49,13 +49,13 @@ if(currency_side()) { ?> - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; \ No newline at end of file + diff --git a/app/Views/reports/graphs/line.php b/app/Views/reports/graphs/line.php index cb80d7718..1cfb58d78 100644 --- a/app/Views/reports/graphs/line.php +++ b/app/Views/reports/graphs/line.php @@ -68,13 +68,13 @@ if( currency_side() ) { ?> - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; \ No newline at end of file + diff --git a/app/Views/reports/graphs/pie.php b/app/Views/reports/graphs/pie.php index d6186251f..ffe2fdca6 100644 --- a/app/Views/reports/graphs/pie.php +++ b/app/Views/reports/graphs/pie.php @@ -41,13 +41,13 @@ if( currency_side() ) { ?> - return value + 'settings['currency_symbol'], 'js') ?>'; + return value + ''; - return 'settings['currency_symbol'], 'js') ?>' + value; + return '' + value; \ No newline at end of file + diff --git a/app/Views/reports/specific_input.php b/app/Views/reports/specific_input.php index 6b88629ce..3ec8f17d2 100644 --- a/app/Views/reports/specific_input.php +++ b/app/Views/reports/specific_input.php @@ -36,7 +36,7 @@ if(isset($error))
'required control-label col-xs-2']) ?>
- settings['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?> + 'discount_type_id', 'class' => 'form-control']) ?>
'form-control input-sm required', 'type' => 'number', 'min' => 0, - 'value' => config('OSPOS')->settings['default_sales_discount']]) ?> + 'value' => $config['default_sales_discount']]) ?>
settings['lines_per_page'] ?>, + pageSize: , sortable: true, showExport: true, exportDataType: 'all', diff --git a/app/Views/reports/tabular_details.php b/app/Views/reports/tabular_details.php index 10342fac4..b8e7cb4e4 100644 --- a/app/Views/reports/tabular_details.php +++ b/app/Views/reports/tabular_details.php @@ -36,7 +36,7 @@ var details_data = ; settings['customer_reward_enable'] == TRUE && !empty($details_data_rewards)) //TODO: === ? + if($config['customer_reward_enable'] == TRUE && !empty($details_data_rewards)) //TODO: === ? { ?> var details_data_rewards = ; @@ -63,7 +63,7 @@ stickyHeader: true, stickyHeaderOffsetLeft: $('#table').offset().left + 'px', stickyHeaderOffsetRight: $('#table').offset().right + 'px', - pageSize: settings['lines_per_page'] ?>, + pageSize: , pagination: true, sortable: true, showColumns: true, @@ -88,7 +88,7 @@ }); settings['customer_reward_enable'] == TRUE && !empty($details_data_rewards)) + if($config['customer_reward_enable'] == TRUE && !empty($details_data_rewards)) { ?> $detail.append('
').find("table").bootstrapTable({ diff --git a/app/Views/sales/form.php b/app/Views/sales/form.php index 44daec4fd..b645b875a 100644 --- a/app/Views/sales/form.php +++ b/app/Views/sales/form.php @@ -34,7 +34,7 @@
settings['invoice_enable'] == TRUE) //TODO: Replace this with just `if(config('OSPOS')->settings['invoice_enable']))` + if($config['invoice_enable'] == TRUE) //TODO: Replace this with just `if($config['invoice_enable']))` { ?>
@@ -64,11 +64,11 @@
- settings['currency_symbol']) ?> + 'payment_amount_new', 'value' => $payment_amount_new, 'id' => 'payment_amount_new', 'class' => 'form-control input-sm']) //TODO: potentially we need to add type to be float/decimal/numeric to reduce improper data entry ?> - settings['currency_symbol']) ?> +
@@ -96,11 +96,11 @@
- settings['currency_symbol'], 'attr') ?> + "payment_amount_$i", 'value' => $row->payment_amount, 'id' => "payment_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) //TODO: add type attribute ?> - settings['currency_symbol']) ?> +
@@ -119,11 +119,11 @@
- settings['currency_symbol']) ?> + "refund_amount_$i", 'value' => $row->cash_refund, 'id' => "refund_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?> - settings['currency_symbol']) ?> +
diff --git a/app/Views/sales/invoice.php b/app/Views/sales/invoice.php index db91be048..48b74a5d2 100644 --- a/app/Views/sales/invoice.php +++ b/app/Views/sales/invoice.php @@ -79,19 +79,19 @@ $(document).ready(function()