From e45dd106b5c585d5b66c64edc7734919def697e9 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Sat, 25 Mar 2023 11:03:00 -0400 Subject: [PATCH] Bulk View changes. --- app/Views/attributes/form.php | 16 +++++----- app/Views/attributes/item.php | 18 +++++------ app/Views/cashups/form.php | 6 ++-- app/Views/cashups/manage.php | 4 +-- app/Views/configs/barcode_config.php | 8 ++--- app/Views/configs/email_config.php | 12 ++++---- app/Views/configs/general_config.php | 22 +++++++------- app/Views/configs/info_config.php | 2 +- app/Views/configs/integrations_config.php | 6 ++-- app/Views/configs/invoice_config.php | 18 +++++------ app/Views/configs/license_config.php | 4 +-- app/Views/configs/locale_config.php | 18 +++++------ app/Views/configs/message_config.php | 6 ++-- app/Views/configs/receipt_config.php | 2 +- app/Views/configs/tax_config.php | 12 ++++---- app/Views/customers/form_csv_import.php | 4 +-- app/Views/employees/form.php | 10 +++---- app/Views/errors/html/error_exception.php | 4 +-- app/Views/expenses/form.php | 10 +++---- app/Views/expenses/manage.php | 2 +- app/Views/expenses_categories/form.php | 4 +-- app/Views/giftcards/form.php | 4 +-- app/Views/home/form_change_password.php | 2 +- app/Views/item_kits/form.php | 8 ++--- app/Views/items/form.php | 24 +++++++-------- app/Views/items/form_bulk.php | 10 +++---- app/Views/items/form_count_details.php | 8 ++--- app/Views/items/form_inventory.php | 8 ++--- app/Views/items/manage.php | 4 +-- app/Views/messages/form_sms.php | 10 +++---- app/Views/partial/dinner_tables.php | 6 ++-- app/Views/partial/header.php | 2 +- app/Views/partial/stock_locations.php | 2 +- app/Views/partial/tax_categories.php | 4 +-- app/Views/partial/tax_codes.php | 8 ++--- app/Views/partial/tax_jurisdictions.php | 6 ++-- app/Views/receivings/form.php | 8 ++--- app/Views/receivings/receipt.php | 2 +- app/Views/receivings/receiving.php | 30 +++++++++---------- app/Views/reports/date_input.php | 6 ++-- app/Views/reports/inventory_summary_input.php | 6 ++-- app/Views/reports/specific_customer_input.php | 8 ++--- app/Views/reports/specific_input.php | 8 ++--- app/Views/sales/form.php | 20 ++++++------- app/Views/sales/invoice.php | 2 +- app/Views/sales/invoice_email.php | 2 +- app/Views/sales/receipt_default.php | 2 +- app/Views/sales/receipt_email.php | 2 +- app/Views/sales/receipt_short.php | 2 +- app/Views/sales/register.php | 4 +-- app/Views/sales/tax_invoice.php | 2 +- app/Views/suppliers/form.php | 8 ++--- app/Views/taxes/tax_rates_form.php | 10 +++---- 53 files changed, 208 insertions(+), 208 deletions(-) diff --git a/app/Views/attributes/form.php b/app/Views/attributes/form.php index 5bcd0ab87..de9c5fe6c 100644 --- a/app/Views/attributes/form.php +++ b/app/Views/attributes/form.php @@ -13,7 +13,7 @@ - 'attribute_form', 'class' => 'form-horizontal']) //TODO: String Interpolation?> + 'attribute_form', 'class' => 'form-horizontal']) //TODO: String Interpolation?>
@@ -23,7 +23,7 @@ 'name' => 'definition_name', 'id' => 'definition_name', 'class' => 'form-control input-sm', - 'value'=>esc($definition_info->definition_name, 'attr') + 'value'=>esc($definition_info->definition_name) ] ) ?>
@@ -41,8 +41,8 @@
definition_fk, 'attr'), + esc($definition_group), + esc($definition_info->definition_fk), 'id="definition_group" class="form-control" ' . (empty($definition_group) ? 'disabled="disabled"' : '') ) ?>
@@ -54,8 +54,8 @@
'definition_flags', 'class' => 'selectpicker show-menu-arrow', @@ -75,7 +75,7 @@
'definition_unit', - 'value' => esc($definition_info->definition_unit, 'attr'), + 'value' => esc($definition_info->definition_unit), 'class' => 'form-control input-sm', 'id' => 'definition_unit' ]) ?> @@ -274,4 +274,4 @@ $(document).ready(function() } }, form_support.error)); }); - \ No newline at end of file + diff --git a/app/Views/attributes/item.php b/app/Views/attributes/item.php index d327724a9..e4e3fb526 100644 --- a/app/Views/attributes/item.php +++ b/app/Views/attributes/item.php @@ -8,7 +8,7 @@
'control-label col-xs-3']) ?>
- 'definition_name', 'class' => 'form-control']) ?> + 'definition_name', 'class' => 'form-control']) ?>
@@ -19,18 +19,18 @@ foreach($definition_values as $definition_id => $definition_value) ?>
- 'control-label col-xs-3']) ?> + 'control-label col-xs-3']) ?>
attribute_date)) ? NOW : strtotime($attribute_value->attribute_date); echo form_input ([ - 'name' => esc("attribute_links[$definition_id]", 'attr'), + 'name' => esc("attribute_links[$definition_id]"), 'value' => to_date($value), 'class' => 'form-control input-sm datetime', 'data-definition-id' => $definition_id, @@ -40,17 +40,17 @@ foreach($definition_values as $definition_id => $definition_value) else if ($definition_value['definition_type'] == DROPDOWN) //TODO: === ? { $selected_value = $definition_value['selected_value']; - echo form_dropdown(esc("attribute_links[$definition_id]", 'attr'), esc($definition_value['values'], 'attr'), esc($selected_value, 'attr'), "class='form-control' data-definition-id='$definition_id'"); + echo form_dropdown(esc("attribute_links[$definition_id]"), esc($definition_value['values']), esc($selected_value), "class='form-control' data-definition-id='$definition_id'"); } else if ($definition_value['definition_type'] == TEXT) //TODO: === ? { $value = (empty($attribute_value) || empty($attribute_value->attribute_value)) ? $definition_value['selected_value'] : $attribute_value->attribute_value; - echo form_input(esc("attribute_links[$definition_id]"), esc($value, 'attr'), "class='form-control valid_chars' data-definition-id='$definition_id'"); + echo form_input(esc("attribute_links[$definition_id]"), esc($value), "class='form-control valid_chars' data-definition-id='$definition_id'"); } else if ($definition_value['definition_type'] == DECIMAL) //TODO: === ? { $value = (empty($attribute_value) || empty($attribute_value->attribute_decimal)) ? $definition_value['selected_value'] : $attribute_value->attribute_decimal; - echo form_input(esc("attribute_links[$definition_id]"), esc($value, 'attr'), "class='form-control valid_chars' data-definition-id='$definition_id'"); + echo form_input(esc("attribute_links[$definition_id]"), esc($value), "class='form-control valid_chars' data-definition-id='$definition_id'"); } else if ($definition_value['definition_type'] == CHECKBOX) //TODO: === ? { @@ -59,13 +59,13 @@ foreach($definition_values as $definition_id => $definition_value) //Sends 0 if the box is unchecked instead of not sending anything. echo form_input ([ 'type' => 'hidden', - 'name' => esc("attribute_links[$definition_id]", 'attr'), + 'name' => esc("attribute_links[$definition_id]"), 'id' => "attribute_links[$definition_id]", 'value' => 0, 'data-definition-id' => $definition_id ]); echo form_checkbox ([ - 'name' => esc("attribute_links[$definition_id]", 'attr'), + 'name' => esc("attribute_links[$definition_id]"), 'id' => "attribute_links[$definition_id]", 'value' => 1, 'checked' => ($value ? 1 : 0), diff --git a/app/Views/cashups/form.php b/app/Views/cashups/form.php index 4629b3f0f..1e580ed96 100644 --- a/app/Views/cashups/form.php +++ b/app/Views/cashups/form.php @@ -9,7 +9,7 @@
    -cashup_id, 'attr'), ['id' => 'cashups_edit_form', 'class' => 'form-horizontal']) //TODO: String Interpolation ?> +cashup_id), ['id' => 'cashups_edit_form', 'class' => 'form-horizontal']) //TODO: String Interpolation ?>
    'control-label col-xs-3']) ?> @@ -34,7 +34,7 @@
    'control-label col-xs-3']) ?>
    - open_employee_id, 'id="open_employee_id" class="form-control"') ?> + open_employee_id, 'id="open_employee_id" class="form-control"') ?>
    @@ -97,7 +97,7 @@
    'control-label col-xs-3']) ?>
    - close_employee_id, 'id="close_employee_id" class="form-control"') ?> + close_employee_id, 'id="close_employee_id" class="form-control"') ?>
    diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php index c8f9d2756..cf1303da2 100644 --- a/app/Views/cashups/manage.php +++ b/app/Views/cashups/manage.php @@ -47,7 +47,7 @@ $(document).ready(function()  
    @@ -59,7 +59,7 @@ $(document).ready(function() 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?> - 'filters', 'data-none-selected-text'=>lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', diff --git a/app/Views/configs/barcode_config.php b/app/Views/configs/barcode_config.php index a8f41bab4..57d11a809 100644 --- a/app/Views/configs/barcode_config.php +++ b/app/Views/configs/barcode_config.php @@ -12,7 +12,7 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    @@ -52,8 +52,8 @@
    barcode_lib->listfonts('fonts'), 'attr'), - esc($config['barcode_font'], 'attr'), + esc($this->barcode_lib->listfonts('fonts')), + esc($config['barcode_font']), ['class' => 'form-control input-sm required'] ) ?>
    @@ -125,7 +125,7 @@ echo form_dropdown ([ 'name' => 'barcode_formats[]', 'id' => 'barcode_formats', - 'options' => !empty($barcode_formats) ? esc(array_combine($barcode_formats, $barcode_formats), 'attr') : [], + 'options' => !empty($barcode_formats) ? esc(array_combine($barcode_formats, $barcode_formats)) : [], 'multiple' => 'multiple', 'data-role' => 'tagsinput']) ?>
    diff --git a/app/Views/configs/email_config.php b/app/Views/configs/email_config.php index 1b90dd51d..b23b31c1c 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['protocol'], 'attr'), + esc($config['protocol']), ['class' => 'form-control input-sm', 'id' => 'protocol']) ?>
    @@ -26,7 +26,7 @@ 'name' => 'mailpath', 'id' => 'mailpath', 'class' => 'form-control input-sm', - 'value' => esc($config['mailpath'], 'attr') + 'value' => esc($config['mailpath']) ]) ?>
    @@ -38,7 +38,7 @@ 'name' => 'smtp_host', 'id' => 'smtp_host', 'class' => 'form-control input-sm', - 'value' => esc($config['smtp_host'], 'attr') + 'value' => esc($config['smtp_host']) ]) ?>
    @@ -63,7 +63,7 @@ 'tls' => 'TLS', 'ssl' => 'SSL' ], - esc($config['smtp_crypto'], 'attr'), + esc($config['smtp_crypto']), ['class' => 'form-control input-sm', 'id' => 'smtp_crypto']) ?> @@ -90,7 +90,7 @@ 'name' => 'smtp_user', 'id' => 'smtp_user', 'class' => 'form-control input-sm', - 'value' => esc($config['smtp_user'], 'attr') + 'value' => esc($config['smtp_user']) ]) ?> @@ -105,7 +105,7 @@ 'name' => 'smtp_pass', 'id' => 'smtp_pass', 'class' => 'form-control input-sm', - 'value' => esc($config['smtp_pass'], 'attr') + 'value' => esc($config['smtp_pass']) ]) ?> diff --git a/app/Views/configs/general_config.php b/app/Views/configs/general_config.php index 9a5e4dca0..7c7932374 100644 --- a/app/Views/configs/general_config.php +++ b/app/Views/configs/general_config.php @@ -18,7 +18,7 @@
    - 'form-control input-sm', 'id' => 'theme-change']) ?> + 'form-control input-sm', 'id' => 'theme-change']) ?>
    @@ -38,7 +38,7 @@ 'floating_labels' => lang('Config.floating_labels'), 'input_groups' => lang('Config.input_groups') ], - esc($config['login_form'], 'attr'), + esc($config['login_form']), ['class' => 'form-control input-sm'] ) ?>
    @@ -65,7 +65,7 @@ 'data-toggle' => 'toggle', 'data-size' => 'normal', 'data-onstyle' => 'success', - 'data-on' => '' . esc($config['currency_symbol'], 'attr').'', + 'data-on' => '' . esc($config['currency_symbol']).'', 'data-off' => '%', 'checked' => $config['default_sales_discount_type'] ]) ?> @@ -95,7 +95,7 @@ 'data-toggle' => 'toggle', 'data-size' => 'normal', 'data-onstyle' => 'success', - 'data-on' => '' . esc($config['currency_symbol'], 'attr') . '', + 'data-on' => '' . esc($config['currency_symbol']) . '', 'data-off' => '%', 'checked' => $config['default_receivings_discount_type'] ]) ?> @@ -158,7 +158,7 @@ 'top' => lang('Config.top'), 'bottom' => lang('Config.bottom') ], - esc($config['notify_vertical_position'], 'attr'), + esc($config['notify_vertical_position']), ['class' => 'form-control input-sm'] ) ?>
    @@ -170,7 +170,7 @@ 'center' => lang('Config.center'), 'right' => lang('Config.right') ], - esc($config['notify_horizontal_position'], 'attr'), + esc($config['notify_horizontal_position']), ['class' => 'form-control input-sm'] ) ?>
    @@ -274,7 +274,7 @@ 'name' => 'gcaptcha_site_key', 'id' => 'gcaptcha_site_key', 'class' => 'form-control input-sm required', - 'value' => esc($config['gcaptcha_site_key'], 'attr') + 'value' => esc($config['gcaptcha_site_key']) ]) ?> @@ -286,7 +286,7 @@ 'name' => 'gcaptcha_secret_key', 'id' => 'gcaptcha_secret_key', 'class' => 'form-control input-sm required', - 'value' => esc($config['gcaptcha_secret_key'], 'attr') + 'value' => esc($config['gcaptcha_secret_key']) ]) ?> @@ -306,7 +306,7 @@ 'unit_price' => lang('Items.unit_price'), 'cost_price' => lang('Items.cost_price') ], - esc($config['suggestions_first_column'], 'attr'), + esc($config['suggestions_first_column']), ['class' => 'form-control input-sm'] ) ?> @@ -323,7 +323,7 @@ 'unit_price' => lang('Items.unit_price'), 'cost_price' => lang('Items.cost_price') ], - esc($config['suggestions_second_column'], 'attr'), + esc($config['suggestions_second_column']), ['class' => 'form-control input-sm'] ) ?> @@ -340,7 +340,7 @@ 'unit_price' => lang('Items.unit_price'), 'cost_price' => lang('Items.cost_price') ], - esc($config['suggestions_third_column'], 'attr'), + esc($config['suggestions_third_column']), ['class' => 'form-control input-sm'] ) ?> diff --git a/app/Views/configs/info_config.php b/app/Views/configs/info_config.php index 6befe732a..7b42b0e03 100644 --- a/app/Views/configs/info_config.php +++ b/app/Views/configs/info_config.php @@ -55,7 +55,7 @@ 'name' => 'address', 'id' => 'address', 'class' => 'form-control input-sm required', - 'value'=> $config['address'], 'attr' + 'value'=> $config['address'] ]) ?> diff --git a/app/Views/configs/integrations_config.php b/app/Views/configs/integrations_config.php index 526598779..5663d6273 100644 --- a/app/Views/configs/integrations_config.php +++ b/app/Views/configs/integrations_config.php @@ -20,7 +20,7 @@ 'name' => 'mailchimp_api_key', 'id' => 'mailchimp_api_key', 'class' => 'form-control input-sm', - 'value' => esc($mailchimp['api_key'], 'attr') + 'value' => esc($mailchimp['api_key']) ]) ?> @@ -38,8 +38,8 @@ 'mailchimp_list_id', 'class' => 'form-control input-sm'] ) ?> diff --git a/app/Views/configs/invoice_config.php b/app/Views/configs/invoice_config.php index 378a9d1fe..9587e9851 100644 --- a/app/Views/configs/invoice_config.php +++ b/app/Views/configs/invoice_config.php @@ -25,7 +25,7 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    @@ -36,7 +36,7 @@ 'name' => 'recv_invoice_format', 'id' => 'recv_invoice_format', 'class' => 'form-control input-sm', - 'value' => esc($config['recv_invoice_format'], 'attr') + 'value' => esc($config['recv_invoice_format']) ]) ?> @@ -48,7 +48,7 @@ 'name' => 'invoice_default_comments', 'id' => 'invoice_default_comments', 'class' => 'form-control input-sm', - 'value' => esc($config['invoice_default_comments'], 'attr') + 'value' => esc($config['invoice_default_comments']) ]) ?> @@ -60,7 +60,7 @@ 'name' => 'invoice_email_message', 'id' => 'invoice_email_message', 'class' => 'form-control input-sm', - 'value' => esc($config['invoice_email_message'], 'attr') + 'value' => esc($config['invoice_email_message']) ]) ?> @@ -68,7 +68,7 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    @@ -79,7 +79,7 @@ 'name' => 'sales_invoice_format', 'id' => 'sales_invoice_format', 'class' => 'form-control input-sm', - 'value' => esc($config['sales_invoice_format'], 'attr') + 'value' => esc($config['sales_invoice_format']) ]) ?> @@ -104,7 +104,7 @@ 'name' => 'sales_quote_format', 'id' => 'sales_quote_format', 'class' => 'form-control input-sm', - 'value' => esc($config['sales_quote_format'], 'attr') + 'value' => esc($config['sales_quote_format']) ]) ?> @@ -129,7 +129,7 @@ 'name' => 'quote_default_comments', 'id' => 'quote_default_comments', 'class' => 'form-control input-sm', - 'value' => esc($config['quote_default_comments'], 'attr') + 'value' => esc($config['quote_default_comments']) ]) ?> @@ -153,7 +153,7 @@ 'name' => 'work_order_format', 'id' => 'work_order_format', 'class' => 'form-control input-sm', - 'value' => esc($config['work_order_format'], 'attr') + 'value' => esc($config['work_order_format']) ]) ?> diff --git a/app/Views/configs/license_config.php b/app/Views/configs/license_config.php index 6faf9cea6..93086ce79 100644 --- a/app/Views/configs/license_config.php +++ b/app/Views/configs/license_config.php @@ -12,14 +12,14 @@ { ?>
    - 'control-label col-xs-3']) ?> + 'control-label col-xs-3']) ?>
    'license', 'id' => 'license_' . $counter++, //TODO: String Interpolation 'class' => 'form-control', 'readonly' => '', - 'value' => esc($license['text'], 'attr') + 'value' => esc($license['text']) ]) ?>
    diff --git a/app/Views/configs/locale_config.php b/app/Views/configs/locale_config.php index 1f8b9d3c3..9063dc11d 100644 --- a/app/Views/configs/locale_config.php +++ b/app/Views/configs/locale_config.php @@ -16,8 +16,8 @@ 'control-label col-xs-2']) ?>
    - 'form-control input-sm', 'id' => 'number_locale']) ?> - + 'form-control input-sm', 'id' => 'number_locale']) ?> +
    @@ -63,7 +63,7 @@ 'name' => 'currency_code', 'id' => 'currency_code', 'class' => 'form-control input-sm number_locale', - 'value' => esc($currency_code, 'attr') + 'value' => esc($currency_code) ]) ?> @@ -144,7 +144,7 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    @@ -160,7 +160,7 @@ 'creditdebitcash' => lang('Sales.credit') . ' / ' . lang('Sales.debit') . ' / ' . lang('Sales.cash'), 'creditcashdebit' => lang('Sales.credit') . ' / ' . lang('Sales.cash') . ' / ' . lang('Sales.debit') ], - esc($config['payment_options_order'], 'attr'), + esc($config['payment_options_order']), ['class' => 'form-control input-sm'] ) ?> @@ -169,7 +169,7 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    @@ -207,7 +207,7 @@ 'form-control input-sm'] ) ?> diff --git a/app/Views/configs/message_config.php b/app/Views/configs/message_config.php index d261403ea..3afc35b28 100644 --- a/app/Views/configs/message_config.php +++ b/app/Views/configs/message_config.php @@ -13,7 +13,7 @@ 'name' => 'msg_uid', 'id' => 'msg_uid', 'class' => 'form-control input-sm required', - 'value' => esc($config['msg_uid'], 'attr') + 'value' => esc($config['msg_uid']) ]) ?> @@ -28,7 +28,7 @@ 'name' => 'msg_pwd', 'id' => 'msg_pwd', 'class' => 'form-control input-sm required', - 'value' => esc($config['msg_pwd'], 'attr') + 'value' => esc($config['msg_pwd']) ]) ?> @@ -43,7 +43,7 @@ 'name' => 'msg_src', 'id' => 'msg_src', 'class' => 'form-control input-sm required', - 'value' => $config['msg_src'] == NULL ? esc($config['company'], 'attr') : esc($config['msg_src'], 'attr') + 'value' => $config['msg_src'] == NULL ? esc($config['company']) : esc($config['msg_src']) ]) ?> diff --git a/app/Views/configs/receipt_config.php b/app/Views/configs/receipt_config.php index f272ada48..7aeb737a6 100644 --- a/app/Views/configs/receipt_config.php +++ b/app/Views/configs/receipt_config.php @@ -12,7 +12,7 @@ 'receipt_default' => lang('Config.receipt_default'), 'receipt_short' => lang('Config.receipt_short') ], - esc($config['receipt_template'], 'attr'), + esc($config['receipt_template']), ['class' => 'form-control input-sm'] ) ?> diff --git a/app/Views/configs/tax_config.php b/app/Views/configs/tax_config.php index 9770bfd92..42870e31d 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['tax_id'], 'attr') + 'value' => esc($config['tax_id']) ]) ?> @@ -43,7 +43,7 @@ 'name' => 'default_tax_1_name', 'id' => 'default_tax_1_name', 'class' => 'form-control input-sm', - 'value' => $config['default_tax_1_name'] !== FALSE ? esc($config['default_tax_1_name'], 'attr') : lang('Items.sales_tax_1')]) ?> + 'value' => $config['default_tax_1_name'] !== FALSE ? esc($config['default_tax_1_name']) : lang('Items.sales_tax_1')]) ?>
    'default_tax_2_name', 'id' => 'default_tax_2_name', 'class' => 'form-control input-sm', - 'value' => $config['default_tax_2_name'] !== FALSE ? esc($config['default_tax_2_name'], 'attr') : lang('Items.sales_tax_2') + 'value' => $config['default_tax_2_name'] !== FALSE ? esc($config['default_tax_2_name']) : lang('Items.sales_tax_2') ]) ?>
    @@ -92,21 +92,21 @@
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    'control-label col-xs-2']) ?>
    - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
    diff --git a/app/Views/customers/form_csv_import.php b/app/Views/customers/form_csv_import.php index 1f21597ef..9ca757388 100644 --- a/app/Views/customers/form_csv_import.php +++ b/app/Views/customers/form_csv_import.php @@ -4,7 +4,7 @@
    - +
    @@ -30,7 +30,7 @@ $(document).ready(function() success: function(response) { dialog_support.hide(); - table_support.handle_submit('', response); + table_support.handle_submit('', response); }, dataType: 'json' }); diff --git a/app/Views/employees/form.php b/app/Views/employees/form.php index b5dbc26de..3bed72c9a 100644 --- a/app/Views/employees/form.php +++ b/app/Views/employees/form.php @@ -42,7 +42,7 @@ 'name' => 'username', 'id' => 'username', 'class' => 'form-control input-sm', - 'value' => esc($person_info->username, 'attr') + 'value' => esc($person_info->username) ]) ?>
    @@ -51,7 +51,7 @@ person_id == "" ? ['class' => 'required'] : []; ?>
    - 'control-label col-xs-3']), 'attr'))?> + 'control-label col-xs-3'])))?>
    @@ -65,7 +65,7 @@
    - 'control-label col-xs-3']), 'attr')) ?> + 'control-label col-xs-3']))) ?>
    @@ -97,8 +97,8 @@ echo form_dropdown( 'language', - esc($languages, 'attr'), - esc("$language_code:$language", 'attr'), + esc($languages), + esc("$language_code:$language"), ['class' => 'form-control input-sm'] ); ?> diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index ae46d3056..29106a4e4 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -78,8 +78,8 @@   —   - ( arguments ) -
    + ( arguments ) +
    'supplier_tax_code', 'id' => 'supplier_tax_code', 'class' => 'form-control input-sm', - 'value' => esc($expenses_info->supplier_tax_code, 'attr') + 'value' => esc($expenses_info->supplier_tax_code) ]) ?> @@ -111,21 +111,21 @@
    'control-label col-xs-3']) ?>
    - payment_type, 'attr'), ['class' => 'form-control', 'id' => 'payment_type']) ?> + payment_type), ['class' => 'form-control', 'id' => 'payment_type']) ?>
    'control-label col-xs-3']) ?>
    - expense_category_id, ['class' => 'form-control', 'id' => 'category']) ?> + expense_category_id, ['class' => 'form-control', 'id' => 'category']) ?>
    'control-label col-xs-3']) ?>
    - employee_id, 'id="employee_id" class="form-control"') ?> + employee_id, 'id="employee_id" class="form-control"') ?>
    @@ -136,7 +136,7 @@ 'name' => 'description', 'id' => 'description', 'class' => 'form-control input-sm', - 'value' => esc($expenses_info->description, 'attr') + 'value' => esc($expenses_info->description) ]) ?> diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php index 7e4a45ef1..d09852838 100644 --- a/app/Views/expenses/manage.php +++ b/app/Views/expenses/manage.php @@ -66,7 +66,7 @@ $(document).ready(function() 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?> - 'filters', 'data-none-selected-text' => lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?> + 'filters', 'data-none-selected-text' => lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?> diff --git a/app/Views/expenses_categories/form.php b/app/Views/expenses_categories/form.php index b531a9538..bc468e0ee 100644 --- a/app/Views/expenses_categories/form.php +++ b/app/Views/expenses_categories/form.php @@ -17,7 +17,7 @@ 'name' => 'category_name', 'id' => 'category_name', 'class' => 'form-control input-sm', - 'value' => esc($category_info->category_name, 'attr') + 'value' => esc($category_info->category_name) ]) ?> @@ -29,7 +29,7 @@ 'name' => 'category_description', 'id' => 'category_description', 'class' => 'form-control input-sm', - 'value' => esc($category_info->category_description, 'attr') + 'value' => esc($category_info->category_description) ]) ?> diff --git a/app/Views/giftcards/form.php b/app/Views/giftcards/form.php index 2f68c6c2d..6d9ea27f7 100644 --- a/app/Views/giftcards/form.php +++ b/app/Views/giftcards/form.php @@ -21,7 +21,7 @@ 'name' => 'person_name', 'id' => 'person_name', 'class' => 'form-control input-sm', - 'value' => esc($selected_person_name, 'attr') + 'value' => esc($selected_person_name) ]) ?> @@ -41,7 +41,7 @@ 'name' => 'giftcard_number', 'id' => 'giftcard_number', 'class' => 'form-control input-sm', - 'value' => esc($giftcard_number, 'attr') + 'value' => esc($giftcard_number) ]) ?> diff --git a/app/Views/home/form_change_password.php b/app/Views/home/form_change_password.php index 39448c650..516f63778 100644 --- a/app/Views/home/form_change_password.php +++ b/app/Views/home/form_change_password.php @@ -20,7 +20,7 @@ 'name' => 'username', 'id' => 'username', 'class' => 'form-control input-sm', - 'value' => esc($person_info->username, 'attr'), + 'value' => esc($person_info->username), 'readonly' => 'true' ]) ?> diff --git a/app/Views/item_kits/form.php b/app/Views/item_kits/form.php index 416132f63..04e5b13af 100644 --- a/app/Views/item_kits/form.php +++ b/app/Views/item_kits/form.php @@ -22,7 +22,7 @@ 'name' => 'item_kit_number', 'id' => 'item_kit_number', 'class' => 'form-control input-sm', - 'value' => esc($item_kit_info->item_kit_number, 'attr') + 'value' => esc($item_kit_info->item_kit_number) ]) ?> @@ -35,7 +35,7 @@ 'name' => 'name', 'id' => 'name', 'class' => 'form-control input-sm', - 'value' => esc($item_kit_info->name, 'attr') + 'value' => esc($item_kit_info->name) ]) ?> @@ -49,7 +49,7 @@ 'id' => 'item_name', 'class' => 'form-control input-sm', 'size' => '50', - 'value' => esc($selected_kit_item, 'attr') + 'value' => esc($selected_kit_item) ]) ?> @@ -165,7 +165,7 @@ 'name' => 'description', 'id' => 'description', 'class' => 'form-control input-sm', - 'value' => esc($item_kit_info->description, 'attr') + 'value' => esc($item_kit_info->description) ]) ?> diff --git a/app/Views/items/form.php b/app/Views/items/form.php index 5fb45e3f6..d2006d057 100644 --- a/app/Views/items/form.php +++ b/app/Views/items/form.php @@ -38,7 +38,7 @@ 'name' => 'item_number', 'id' => 'item_number', 'class' => 'form-control input-sm', - 'value' => esc($item_info->item_number, 'attr') + 'value' => esc($item_info->item_number) ]) ?> @@ -51,7 +51,7 @@ 'name' => 'name', 'id' => 'name', 'class' => 'form-control input-sm', - 'value' => esc($item_info->name, 'attr') + 'value' => esc($item_info->name) ]) ?> @@ -64,7 +64,7 @@ 'form-control']); + echo form_dropdown('category', esc($categories), $selected_category, ['class' => 'form-control']); } else { @@ -72,7 +72,7 @@ 'name' => 'category', 'id' => 'category', 'class' => 'form-control input-sm', - 'value' => esc($item_info->category, 'attr') + 'value' => esc($item_info->category) ]); } ?> @@ -183,7 +183,7 @@
    'control-label col-xs-3']) ?>
    - 'form-control']) ?> + 'form-control']) ?>
    @@ -240,7 +240,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_1', 'class' => 'form-control input-sm', - 'value' => isset($item_tax_info[0]['name']) ? esc($item_tax_info[0]['name'], 'attr') : esc($config['default_tax_1_name'], 'attr') + 'value' => isset($item_tax_info[0]['name']) ? esc($item_tax_info[0]['name']) : esc($config['default_tax_1_name']) ]) ?>
    @@ -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['default_tax_2_name'], 'attr') + 'value' => isset($item_tax_info[1]['name']) ? esc($item_tax_info[1]['name']) : esc($config['default_tax_2_name']) ]) ?>
    @@ -292,7 +292,7 @@ 'id' => 'tax_category', 'class' => 'form-control input-sm', 'size' => '50', - 'value' => esc($tax_category, 'attr') + 'value' => esc($tax_category) ]) ?>
    @@ -308,7 +308,7 @@ 'name' => 'hsn_code', 'id' => 'hsn_code', 'class' => 'form-control input-sm', - 'value' => esc($hsn_code, 'attr') + 'value' => esc($hsn_code) ]) ?> @@ -368,7 +368,7 @@ 'name' => 'description', 'id' => 'description', 'class' => 'form-control input-sm', - 'value' => esc($item_info->description, 'attr') + 'value' => esc($item_info->description) ]) ?> @@ -441,7 +441,7 @@ 'name' => 'pack_name', 'id' => 'pack_name', 'class' => 'form-control input-sm', - 'value' => esc($item_info->pack_name, 'attr') + 'value' => esc($item_info->pack_name) ]) ?> @@ -453,7 +453,7 @@ 'name' => 'low_sell_item_name', 'id' => 'low_sell_item_name', 'class' => 'form-control input-sm', - 'value' => esc($selected_low_sell_item, 'attr') + 'value' => esc($selected_low_sell_item) ]) ?> diff --git a/app/Views/items/form_bulk.php b/app/Views/items/form_bulk.php index 9197daf9f..93af88290 100644 --- a/app/Views/items/form_bulk.php +++ b/app/Views/items/form_bulk.php @@ -40,7 +40,7 @@
    'control-label col-xs-3']) ?>
    - 'form-control']) ?> + 'form-control']) ?>
    @@ -89,7 +89,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_1', 'class' => 'form-control input-sm', - 'value' => esc($config['default_tax_1_name'], 'attr') + 'value' => esc($config['default_tax_1_name']) ]) ?>
    @@ -112,7 +112,7 @@ 'name' => 'tax_names[]', 'id' => 'tax_name_2', 'class' => 'form-control input-sm', - 'value' => esc($config['default_tax_2_name'], 'attr') + 'value' => esc($config['default_tax_2_name']) ]) ?>
    @@ -153,14 +153,14 @@
    'control-label col-xs-3']) ?>
    - 'form-control']) ?> + 'form-control']) ?>
    'control-label col-xs-3']) ?>
    - 'form-control']) ?> + 'form-control']) ?>
    diff --git a/app/Views/items/form_count_details.php b/app/Views/items/form_count_details.php index 732c8fdac..581bd5c53 100644 --- a/app/Views/items/form_count_details.php +++ b/app/Views/items/form_count_details.php @@ -20,7 +20,7 @@ use App\Models\Employee; 'id' => 'item_number', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->item_number, 'attr') + 'value' => esc($item_info->item_number) ]) ?>
    @@ -34,7 +34,7 @@ use App\Models\Employee; 'id' => 'name', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->name, 'attr') + 'value' => esc($item_info->name) ]) ?> @@ -49,7 +49,7 @@ use App\Models\Employee; 'id' => 'category', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->category, 'attr') + 'value' => esc($item_info->category) ]) ?> @@ -58,7 +58,7 @@ use App\Models\Employee;
    'control-label col-xs-3']) ?>
    - 'display_stock(this.value);', 'class' => 'form-control']) ?> + 'display_stock(this.value);', 'class' => 'form-control']) ?>
    diff --git a/app/Views/items/form_inventory.php b/app/Views/items/form_inventory.php index 130459968..a0be8fe20 100644 --- a/app/Views/items/form_inventory.php +++ b/app/Views/items/form_inventory.php @@ -22,7 +22,7 @@ 'id' => 'item_number', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->item_number, 'attr') + 'value' => esc($item_info->item_number) ]) ?> @@ -36,7 +36,7 @@ 'id' => 'name', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->name, 'attr') + 'value' => esc($item_info->name) ]) ?> @@ -51,7 +51,7 @@ 'id' => 'category', 'class' => 'form-control input-sm', 'disabled' => '', - 'value' => esc($item_info->category, 'attr') + 'value' => esc($item_info->category) ]) ?> @@ -60,7 +60,7 @@
    'control-label col-xs-3']) ?>
    - 'fill_quantity(this.value)', 'class' => 'form-control']) ?> + 'fill_quantity(this.value)', 'class' => 'form-control']) ?>
    diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php index ea43265b0..f1f87c29a 100644 --- a/app/Views/items/manage.php +++ b/app/Views/items/manage.php @@ -99,7 +99,7 @@ $(document).ready(function() 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?> 'filters', @@ -114,7 +114,7 @@ $(document).ready(function() { echo form_dropdown( 'stock_location', - esc($stock_locations, 'attr'), + esc($stock_locations), $stock_location, [ 'id' => 'stock_location', diff --git a/app/Views/messages/form_sms.php b/app/Views/messages/form_sms.php index edfcf2d83..9fdfefbea 100644 --- a/app/Views/messages/form_sms.php +++ b/app/Views/messages/form_sms.php @@ -8,18 +8,18 @@
      -person_id", 'attr'), ['id' => 'send_sms_form', 'class' => 'form-horizontal']) ?> +person_id"), ['id' => 'send_sms_form', 'class' => 'form-horizontal']) ?>
      'first_name', 'class' => 'control-label col-xs-2']) ?>
      - 'form-control input-sm', 'type' => 'text', 'name' => 'first_name', 'value' => esc($person_info->first_name, 'attr'), 'readonly' => 'true']) ?> + 'form-control input-sm', 'type' => 'text', 'name' => 'first_name', 'value' => esc($person_info->first_name), 'readonly' => 'true']) ?>
      'last_name', 'class' => 'control-label col-xs-2']) ?>
      - 'form-control input-sm', 'type' => 'text', 'name' => 'last_name', 'value' => esc($person_info->last_name, 'attr'), 'readonly' => 'true']) ?> + 'form-control input-sm', 'type' => 'text', 'name' => 'last_name', 'value' => esc($person_info->last_name), 'readonly' => 'true']) ?>
      @@ -27,14 +27,14 @@
      - 'form-control input-sm required', 'type' => 'text', 'name' => 'phone', 'value' => esc($person_info->phone_number, 'attr')]) ?> + 'form-control input-sm required', 'type' => 'text', 'name' => 'phone', 'value' => esc($person_info->phone_number)]) ?>
      'message', 'class' => 'control-label col-xs-2 required']) ?>
      - 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc($config['msg_msg'], 'attr')]) ?> + 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc($config['msg_msg'])]) ?>
      diff --git a/app/Views/partial/dinner_tables.php b/app/Views/partial/dinner_tables.php index eac3f0cfb..f5d42525e 100644 --- a/app/Views/partial/dinner_tables.php +++ b/app/Views/partial/dinner_tables.php @@ -18,10 +18,10 @@ foreach($dinner_tables as $table_key => $table)
      esc("dinner_table_$dinner_table_id", 'attr'), - 'id' => esc("dinner_table_$dinner_table_id", 'attr'), + 'name' => esc("dinner_table_$dinner_table_id"), + 'id' => esc("dinner_table_$dinner_table_id"), 'class' => 'dinner_table valid_chars form-control input-sm required', - 'value' => esc($dinner_table_name, 'attr') + 'value' => esc($dinner_table_name) ]; $table['deleted'] && $form_data['disabled'] = 'disabled'; echo form_input($form_data); diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php index 294682e62..3b334b58d 100644 --- a/app/Views/partial/header.php +++ b/app/Views/partial/header.php @@ -62,7 +62,7 @@ $request = Services::request();
      - person_id", 'url'), esc("$user_info->first_name $user_info->last_name", 'attr'), ['class' => 'modal-dlg', 'data-btn-submit' => lang('Common.submit'), 'title' => lang('Employees.change_password')]) ?> + person_id", 'url'), esc("$user_info->first_name $user_info->last_name"), ['class' => 'modal-dlg', 'data-btn-submit' => lang('Common.submit'), 'title' => lang('Employees.change_password')]) ?> getGet('debugdebug') == 'true') ? session('session_sha1') . ' | ' : '') ?>
      diff --git a/app/Views/partial/stock_locations.php b/app/Views/partial/stock_locations.php index b879e7741..e76d44ce5 100644 --- a/app/Views/partial/stock_locations.php +++ b/app/Views/partial/stock_locations.php @@ -19,7 +19,7 @@ foreach($stock_locations as $location => $location_data) 'name' => "stock_location[$location_id]", 'id' => "stock_location[$location_id]", 'class' => 'stock_location valid_chars form-control input-sm required', - 'value' => esc($location_name, 'attr') + 'value' => esc($location_name) ]; $location_data['deleted'] && $form_data['disabled'] = 'disabled'; echo form_input($form_data); diff --git a/app/Views/partial/tax_categories.php b/app/Views/partial/tax_categories.php index 4c3a0339a..14fc4b888 100644 --- a/app/Views/partial/tax_categories.php +++ b/app/Views/partial/tax_categories.php @@ -21,7 +21,7 @@ foreach($tax_categories as $key => $category) 'id' => "tax_category_$i", 'class' => 'valid_chars form-control input-sm', 'placeholder' => lang('Taxes.tax_category_name'), - 'value' => esc($tax_category, 'attr') + 'value' => esc($tax_category) ]; echo form_input($form_data); ?> @@ -31,7 +31,7 @@ foreach($tax_categories as $key => $category) 'name' => 'tax_group_sequence[]', 'class' => 'valid_chars form-control input-sm', 'placeholder' => lang('Taxes.sequence'), - 'value' => esc($tax_group_sequence, 'attr') + 'value' => esc($tax_group_sequence) ]; echo form_input($form_data); ?> diff --git a/app/Views/partial/tax_codes.php b/app/Views/partial/tax_codes.php index a7203a35b..4c980ae00 100644 --- a/app/Views/partial/tax_codes.php +++ b/app/Views/partial/tax_codes.php @@ -23,7 +23,7 @@ foreach($tax_codes as $tax_code => $tax_code_data) 'id' => "tax_code_$i", 'class' => 'valid_chars text-uppercase form-control input-sm', 'placeholder' => lang('Taxes.code'), - 'value' => esc($tax_code, 'attr') + 'value' => esc($tax_code) ]; echo form_input($form_data) ?> @@ -33,7 +33,7 @@ foreach($tax_codes as $tax_code => $tax_code_data) 'name' => 'tax_code_name[]', 'class' => 'valid_chars form-control input-sm', 'placeholder'=>lang('Taxes.name'), - 'value' => esc($tax_code_name, 'attr') + 'value' => esc($tax_code_name) ]; echo form_input($form_data) ?> @@ -43,7 +43,7 @@ foreach($tax_codes as $tax_code => $tax_code_data) 'name' => 'city[]', 'class' => 'valid_chars form-control input-sm', 'placeholder'=>lang('Taxes.city'), - 'value' => esc($city, 'attr') + 'value' => esc($city) ]; echo form_input($form_data) ?> @@ -53,7 +53,7 @@ foreach($tax_codes as $tax_code => $tax_code_data) 'name' => 'state[]', 'class' => 'valid_chars form-control input-sm', 'placeholder'=>lang('Taxes.state'), - 'value' => esc($state, 'attr') + 'value' => esc($state) ]; echo form_input($form_data) ?> diff --git a/app/Views/partial/tax_jurisdictions.php b/app/Views/partial/tax_jurisdictions.php index ba4ce3855..5f69f590e 100644 --- a/app/Views/partial/tax_jurisdictions.php +++ b/app/Views/partial/tax_jurisdictions.php @@ -26,7 +26,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction) 'id' => "jurisdiction_name_$i", 'class' => 'valid_chars form-control input-sm', 'placeholder' => lang('Taxes.jurisdiction_name'), - 'value' => esc($jurisdiction_name, 'attr') + 'value' => esc($jurisdiction_name) ]; echo form_input($form_data); ?> @@ -37,7 +37,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction) 'name' => 'tax_group[]', 'class' => 'valid_chars form-control input-sm', 'placeholder' => lang('Taxes.tax_group'), - 'value' => esc($tax_group, 'attr') + 'value' => esc($tax_group) ]; echo form_input($form_data); ?> @@ -52,7 +52,7 @@ foreach($tax_jurisdictions as $tax_jurisdiction => $jurisdiction) 'name' => 'reporting_authority[]', 'class' => 'valid_chars form-control input-sm', 'placeholder' => lang('Taxes.reporting_authority'), - 'value' => esc($reporting_authority, 'attr') + 'value' => esc($reporting_authority) ]; echo form_input($form_data) ?> diff --git a/app/Views/receivings/form.php b/app/Views/receivings/form.php index 19e4b02cb..ebe038333 100644 --- a/app/Views/receivings/form.php +++ b/app/Views/receivings/form.php @@ -34,7 +34,7 @@
      'control-label col-xs-3']) ?>
      - 'supplier_name', 'value' => esc($selected_supplier_name, 'attr'), 'id' => 'supplier_name', 'class' => 'form-control input-sm']) ?> + 'supplier_name', 'value' => esc($selected_supplier_name), 'id' => 'supplier_name', 'class' => 'form-control input-sm']) ?>
      @@ -42,21 +42,21 @@
      'control-label col-xs-3']) ?>
      - 'reference', 'value' => esc($receiving_info['reference'], 'attr'), 'id' => 'reference', 'class' => 'form-control input-sm']) ?> + 'reference', 'value' => esc($receiving_info['reference']), 'id' => 'reference', 'class' => 'form-control input-sm']) ?>
      'control-label col-xs-3']) ?>
      - +
      'control-label col-xs-3']) ?>
      - 'comment','value' => esc($receiving_info['comment'], 'attr'), 'id' => 'comment', 'class' => 'form-control input-sm']) ?> + 'comment','value' => esc($receiving_info['comment']), 'id' => 'comment', 'class' => 'form-control input-sm']) ?>
      diff --git a/app/Views/receivings/receipt.php b/app/Views/receivings/receipt.php index 2c172cc12..ca4dfaf7c 100644 --- a/app/Views/receivings/receipt.php +++ b/app/Views/receivings/receipt.php @@ -162,7 +162,7 @@
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/receivings/receiving.php b/app/Views/receivings/receiving.php index 9b82311da..a7cbdd6ce 100644 --- a/app/Views/receivings/receiving.php +++ b/app/Views/receivings/receiving.php @@ -39,14 +39,14 @@ if (isset($success)) - 'mode_form', 'class' => 'form-horizontal panel panel-default']) ?> + 'mode_form', 'class' => 'form-horizontal panel panel-default']) ?>
      • - "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?> + "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
      • - "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?> + "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
      • - "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?> + "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
        • $item) { ?> - 'form-horizontal', 'id' => "cart_$line"]) ?> + 'form-horizontal', 'id' => "cart_$line"]) ?>
      @@ -184,7 +184,7 @@ if (isset($success)) @@ -204,9 +204,9 @@ if (isset($success)) 'data-toggle' => "toggle", 'data-size' => 'small', 'data-onstyle' => 'success', - 'data-on' => '' . esc($config['currency_symbol'], 'attr') .'', + 'data-on' => '' . esc($config['currency_symbol']) .'', 'data-off' => '%', - 'data-line' => esc($line, 'attr'), + 'data-line' => esc($line), 'checked' => $item['discount_type'] ]) ?> @@ -242,7 +242,7 @@ if (isset($success)) echo form_input ([ 'name' => 'description', 'class' => 'form-control input-sm', - 'value' => esc($item['description'], 'attr') + 'value' => esc($item['description']) ]); } else @@ -250,7 +250,7 @@ if (isset($success)) if ($item['description'] != '') //TODO: !==? { echo $item['description']; - echo form_hidden('description', esc($item['description'], 'attr')); + echo form_hidden('description', esc($item['description'])); } else { @@ -332,7 +332,7 @@ if (isset($success)) else { ?> - 'select_supplier_form', 'class' => 'form-horizontal']) ?> + 'select_supplier_form', 'class' => 'form-horizontal']) ?>
      - 'finish_receiving_form', 'class' => 'form-horizontal']) ?> + 'finish_receiving_form', 'class' => 'form-horizontal']) ?>
      'comment', 'id' => 'comment', 'class' => 'form-control input-sm', - 'value' => esc($comment, 'attr'), + 'value' => esc($comment), 'rows' => '4' ]) ?>
      @@ -439,7 +439,7 @@ if (isset($success)) 'name' => 'recv_reference', 'id' => 'recv_reference', 'class' => 'form-control input-sm', - 'value' => esc($reference, 'attr'), + 'value' => esc($reference), 'size' => 5 ]) ?> @@ -452,7 +452,7 @@ if (isset($success))
      'description', 'class' => 'form-control input-sm', 'value' => esc($item['description'], 'attr'), 'onClick' => 'this.select();']); + echo form_input (['name' => 'description', 'class' => 'form-control input-sm', 'value' => esc($item['description']), 'onClick' => 'this.select();']); } else { diff --git a/app/Views/sales/tax_invoice.php b/app/Views/sales/tax_invoice.php index f0ae5883c..dca467822 100644 --- a/app/Views/sales/tax_invoice.php +++ b/app/Views/sales/tax_invoice.php @@ -262,7 +262,7 @@ $(document).ready(function()
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/suppliers/form.php b/app/Views/suppliers/form.php index 734263eb5..85999b69a 100644 --- a/app/Views/suppliers/form.php +++ b/app/Views/suppliers/form.php @@ -18,7 +18,7 @@ 'name' => 'company_name', 'id' => 'company_name_input', 'class' => 'form-control input-sm', - 'value' => esc($person_info->company_name, 'attr') + 'value' => esc($person_info->company_name) ]) ?> @@ -38,7 +38,7 @@ 'name' => 'agency_name', 'id' => 'agency_name_input', 'class' => 'form-control input-sm', - 'value' => esc($person_info->agency_name, 'attr') + 'value' => esc($person_info->agency_name) ]) ?> @@ -53,7 +53,7 @@ 'name' => 'account_number', 'id' => 'account_number', 'class' => 'form-control input-sm', - 'value' => esc($person_info->account_number, 'attr') + 'value' => esc($person_info->account_number) ]) ?> @@ -66,7 +66,7 @@ 'name' => 'tax_id', 'id' => 'tax_id', 'class' => 'form-control input-sm', - 'value' => esc($person_info->tax_id, 'attr') + 'value' => esc($person_info->tax_id) ]) ?> diff --git a/app/Views/taxes/tax_rates_form.php b/app/Views/taxes/tax_rates_form.php index 36e794f04..1be7f3c5a 100644 --- a/app/Views/taxes/tax_rates_form.php +++ b/app/Views/taxes/tax_rates_form.php @@ -19,21 +19,21 @@
      'control-label col-xs-3']) ?>
      - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
      'control-label col-xs-3']) ?>
      - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
      'control-label col-xs-3']) ?>
      - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
      @@ -44,7 +44,7 @@ 'name' => 'tax_rate', 'id' => 'tax_rate', 'class' => 'form-control input-sm text-uppercase', - 'value' => esc($tax_rate, 'attr') + 'value' => esc($tax_rate) ]) ?> % @@ -55,7 +55,7 @@
      'control-label col-xs-3']) ?>
      - 'form-control input-sm']) ?> + 'form-control input-sm']) ?>
      ') ?> 'quantity', 'class' => 'form-control input-sm', 'value' => to_quantity_decimals($item['quantity']),'onClick' => 'this.select();']) ?> 'form-control input-sm'] ) ?> 'payment_types', diff --git a/app/Views/reports/date_input.php b/app/Views/reports/date_input.php index 82d3d8673..d97d6ff72 100644 --- a/app/Views/reports/date_input.php +++ b/app/Views/reports/date_input.php @@ -38,7 +38,7 @@ if(isset($error)) ?> 'required control-label col-xs-2']) ?>
      - 'input_type', 'class' => 'form-control']) ?> + 'input_type', 'class' => 'form-control']) ?>
      'required control-label col-xs-2']) ?>
      - 'discount_type_id', 'class' => 'form-control']) ?> + 'discount_type_id', 'class' => 'form-control']) ?>
      'required control-label col-xs-2']) ?>
      - 'location_id', 'class' => 'form-control']) ?> + 'location_id', 'class' => 'form-control']) ?>
      'required control-label col-xs-2']) ?>
      - +
      'required control-label col-xs-2']) ?>
      - +
      @@ -55,4 +55,4 @@ $(document).ready(function() window.location = [window.location, $("#location_id").val(), $("#item_count").val()].join("/"); }); }); - \ No newline at end of file + diff --git a/app/Views/reports/specific_customer_input.php b/app/Views/reports/specific_customer_input.php index 196322719..ba948baa2 100644 --- a/app/Views/reports/specific_customer_input.php +++ b/app/Views/reports/specific_customer_input.php @@ -31,23 +31,23 @@ if(isset($error))
      - 'required control-label col-xs-2']) ?> + 'required control-label col-xs-2']) ?>
      - +
      'required control-label col-xs-2']) ?>
      - +
      'required control-label col-xs-2']) ?>
      - +
      diff --git a/app/Views/reports/specific_input.php b/app/Views/reports/specific_input.php index 3ec8f17d2..38397f781 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']) ?>
      - 'discount_type_id', 'class' => 'form-control']) ?> + 'discount_type_id', 'class' => 'form-control']) ?>
      - 'required control-label col-xs-2']) ?> + 'required control-label col-xs-2']) ?>
      - +
      'required control-label col-xs-2']) ?>
      - +
      diff --git a/app/Views/sales/form.php b/app/Views/sales/form.php index b645b875a..692440932 100644 --- a/app/Views/sales/form.php +++ b/app/Views/sales/form.php @@ -41,10 +41,10 @@ 'control-label col-xs-3']) ?>
      - 'invoice_number', 'size'=>10, 'value' => esc($sale_info['invoice_number'], 'attr'), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?> + 'invoice_number', 'size'=>10, 'value' => esc($sale_info['invoice_number']), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?> - 'invoice_number', 'value' => esc($sale_info['invoice_number'], 'attr'), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?> + 'invoice_number', 'value' => esc($sale_info['invoice_number']), 'id' => 'invoice_number', 'class' => 'form-control input-sm']) ?>
      @@ -59,7 +59,7 @@
      'control-label col-xs-3']) ?>
      - 'payment_types_new', 'class' => 'form-control']) ?> + 'payment_types_new', 'class' => 'form-control']) ?>
      @@ -88,15 +88,15 @@ payment_id) ?> payment_type, lang('Sales.giftcard'))) ): ?> - "payment_type_$i", 'value' => esc($row->payment_type, 'attr'), 'id' => "payment_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?> + "payment_type_$i", 'value' => esc($row->payment_type), 'id' => "payment_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?> - payment_type, 'attr'), ['id' => "payment_types_$i", 'class' => 'form-control']) ?> + payment_type), ['id' => "payment_types_$i", 'class' => 'form-control']) ?>
      - + "payment_amount_$i", 'value' => $row->payment_amount, 'id' => "payment_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) //TODO: add type attribute ?> @@ -113,7 +113,7 @@ payment_type, lang('Sales.giftcard')))): ?> "refund_type_$i", 'value'=>lang('Sales.cash'), 'id' => "refund_type_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?> - "refund_types_$i", 'class' => 'form-control']) ?> + "refund_types_$i", 'class' => 'form-control']) ?>
      @@ -137,7 +137,7 @@
      'control-label col-xs-3']) ?>
      - 'customer_name', 'value' => esc($selected_customer_name, 'attr'), 'id' => 'customer_name', 'class' => 'form-control input-sm']) ?> + 'customer_name', 'value' => esc($selected_customer_name), 'id' => 'customer_name', 'class' => 'form-control input-sm']) ?>
      @@ -145,7 +145,7 @@
      'control-label col-xs-3']) ?>
      - 'employee_name', 'value' => esc($selected_employee_name, 'attr'), 'id' => 'employee_name', 'class' => 'form-control input-sm']) ?> + 'employee_name', 'value' => esc($selected_employee_name), 'id' => 'employee_name', 'class' => 'form-control input-sm']) ?>
      @@ -153,7 +153,7 @@
      'control-label col-xs-3']) ?>
      - 'comment', 'value' => esc($sale_info['comment'], 'attr'), 'id' => 'comment', 'class' => 'form-control input-sm']) ?> + 'comment', 'value' => esc($sale_info['comment']), 'id' => 'comment', 'class' => 'form-control input-sm']) ?>
      diff --git a/app/Views/sales/invoice.php b/app/Views/sales/invoice.php index 48b74a5d2..8c0ae960c 100644 --- a/app/Views/sales/invoice.php +++ b/app/Views/sales/invoice.php @@ -260,7 +260,7 @@ $(document).ready(function()
      - <?php echo esc($barcode, ' style='padding-top:4%;' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/sales/invoice_email.php b/app/Views/sales/invoice_email.php index e7113e0e1..56f878abf 100644 --- a/app/Views/sales/invoice_email.php +++ b/app/Views/sales/invoice_email.php @@ -207,7 +207,7 @@ if(isset($error_message))
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/sales/receipt_default.php b/app/Views/sales/receipt_default.php index 5d45bed36..d432094f1 100644 --- a/app/Views/sales/receipt_default.php +++ b/app/Views/sales/receipt_default.php @@ -242,7 +242,7 @@
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/sales/receipt_email.php b/app/Views/sales/receipt_email.php index 38eddb904..29709f186 100644 --- a/app/Views/sales/receipt_email.php +++ b/app/Views/sales/receipt_email.php @@ -222,7 +222,7 @@
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/sales/receipt_short.php b/app/Views/sales/receipt_short.php index 73945f466..823bb84c5 100644 --- a/app/Views/sales/receipt_short.php +++ b/app/Views/sales/receipt_short.php @@ -215,7 +215,7 @@
      - <?php echo esc($barcode, ' src='data:image/png;base64,' />
      + <?php echo esc($barcode) ?>
      diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php index cacdce6a8..27c18b13f 100644 --- a/app/Views/sales/register.php +++ b/app/Views/sales/register.php @@ -267,7 +267,7 @@ if(isset($success)) ?>       		'hidden', 'name' => 'item_id', 'value' => $item['item_id']]) ?> - 'item_description', 'id' => 'item_description', 'class' => 'form-control input-sm', 'value' => esc($item['description'], 'attr'), 'tabindex' => ++$tabindex]) ?> + 'item_description', 'id' => 'item_description', 'class' => 'form-control input-sm', 'value' => esc($item['description']), 'tabindex' => ++$tabindex]) ?>