Replaces calls to config('OSPOS') in views

- the settings array is now passed through the Secure Controller to the view
This commit is contained in:
objecttothis
2023-02-13 14:45:54 +04:00
committed by Steve Ireland
parent b041f8f8f0
commit bde3cb22c8
59 changed files with 429 additions and 429 deletions

View File

@@ -85,7 +85,7 @@ foreach($definition_values as $definition_id => $definition_value)
<script type="text/javascript">
(function() {
<?php echo view('partial/datepicker_locale', ['config' => '{ minView: 2, format: "'.dateformat_bootstrap(config('OSPOS')->settings['dateformat'] . '"}')]) ?>
<?php echo view('partial/datepicker_locale', ['config' => '{ minView: 2, format: "'.dateformat_bootstrap($config['dateformat'] . '"}')]) ?>
var enable_delete = function() {
$('.remove_attribute_btn').click(function() {
@@ -134,4 +134,4 @@ foreach($definition_values as $definition_id => $definition_value)
refresh();
});
})();
</script>
</script>

View File

@@ -15,7 +15,7 @@
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'definition_id'
});
});

View File

@@ -43,7 +43,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'open_amount_cash',
@@ -52,7 +52,7 @@
'value' => to_currency_no_money($cash_ups_info->open_amount_cash)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -63,7 +63,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'transfer_amount_cash',
@@ -73,7 +73,7 @@
])
?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -106,7 +106,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'closed_amount_cash',
@@ -115,7 +115,7 @@
'value'=>to_currency_no_money($cash_ups_info->closed_amount_cash)]
) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -138,7 +138,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'closed_amount_due',
@@ -147,7 +147,7 @@
'value'=>to_currency_no_money($cash_ups_info->closed_amount_due)]
) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -158,7 +158,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'closed_amount_card',
@@ -167,7 +167,7 @@
'value'=>to_currency_no_money($cash_ups_info->closed_amount_card)]
) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -178,7 +178,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'closed_amount_check',
@@ -187,7 +187,7 @@
'value'=>to_currency_no_money($cash_ups_info->closed_amount_check)]
) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -198,7 +198,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'closed_amount_total',
@@ -209,7 +209,7 @@
]
) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -256,12 +256,12 @@ $(document).ready(function()
<?php echo view('partial/datepicker_locale') ?>
$('#open_date').datetimepicker({
format: "<?php echo dateformat_bootstrap(config('OSPOS')->settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>",
startDate: "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . esc(config('OSPOS')->settings['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
format: "<?php echo dateformat_bootstrap($config['dateformat']) . ' ' . dateformat_bootstrap($config['timeformat']) ?>",
startDate: "<?php echo date($config['dateformat'] . ' ' . esc($config['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
<?php
$t = config('OSPOS')->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: "<?php echo dateformat_bootstrap(config('OSPOS')->settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>",
startDate: "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . esc(config('OSPOS')->settings['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
format: "<?php echo dateformat_bootstrap($config['dateformat']) . ' ' . dateformat_bootstrap($config['timeformat']) ?>",
startDate: "<?php echo date($config['dateformat'] . ' ' . esc($config['timeformat'], 'js'), mktime(0, 0, 0, 1, 1, 2010)) ?>",
<?php
$t = config('OSPOS')->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,

View File

@@ -27,7 +27,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'cashup_id',
queryParams: function() {
return $.extend(arguments[0], {

View File

@@ -12,7 +12,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.barcode_type'), 'barcode_type', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('barcode_type', esc($support_barcode, 'attr'), esc(config('OSPOS')->settings['barcode_type'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('barcode_type', esc($support_barcode, 'attr'), esc($config['barcode_type'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -53,7 +53,7 @@
<?php echo form_dropdown(
'barcode_font',
esc($this->barcode_lib->listfonts('fonts'), 'attr'),
esc(config('OSPOS')->settings['barcode_font'], 'attr'),
esc($config['barcode_font'], 'attr'),
['class' => 'form-control input-sm required']
) ?>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
&nbsp
<label class="control-label">
@@ -93,7 +93,7 @@
<?php echo form_radio ([
'name' => 'barcode_content',
'value' => 'id',
'checked' => config('OSPOS')->settings['barcode_content' === 'id']
'checked' => $config['barcode_content' === 'id']
]) ?>
<?php echo lang('Config.barcode_id') ?>
</label>
@@ -101,7 +101,7 @@
<?php echo form_radio ([
'name' => 'barcode_content',
'value' => 'number',
'checked' => config('OSPOS')->settings['barcode_content'] === 'number']) ?>
'checked' => $config['barcode_content'] === 'number']) ?>
<?php echo lang('Config.barcode_number') ?>
</label>
&nbsp
@@ -110,7 +110,7 @@
<?php echo form_checkbox ([
'name' => 'barcode_generate_if_empty',
'value' => 'barcode_generate_if_empty',
'checked' => config('OSPOS')->settings['barcode_generate_if_empty']
'checked' => $config['barcode_generate_if_empty']
]) ?>
<?php echo lang('Config.barcode_generate_if_empty') ?>
</label>
@@ -121,7 +121,7 @@
<?php echo form_label(lang('Config.barcode_formats'), 'barcode_formats', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-4'>
<?php
$barcode_formats = json_decode(config('OSPOS')->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']);
?>
</div>
<label class="control-label col-sm-1"><?php echo lang('Config.barcode_second_row').' ' ?></label>
@@ -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']) ?>
</div>
<label class="control-label col-sm-1"><?php echo lang('Config.barcode_third_row').' ' ?></label>
<div class='col-sm-2'>
@@ -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']) ?>
</div>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">%</span>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>

View File

@@ -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'])
?>
</div>
@@ -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')
]) ?>
</div>
</div>
@@ -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')
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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'])
?>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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')
]) ?>
</div>
</div>
@@ -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')
]) ?>
</div>
</div>

View File

@@ -18,11 +18,11 @@
<div class='col-sm-10'>
<div class="form-group form-group-sm row">
<div class='col-sm-3'>
<?php echo form_dropdown('theme', $themes, esc(config('OSPOS')->settings['theme'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'theme-change']) ?>
<?php echo form_dropdown('theme', $themes, esc($config['theme'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'theme-change']) ?>
</div>
<div class="col-sm-7">
<a href="<?php echo 'https://bootswatch.com/3/' . ('bootstrap' == (config('OSPOS')->settings['theme']) ? 'default' : esc(config('OSPOS')->settings['theme'])) ?>" target="_blank" rel=”noopener”>
<span><?php echo lang('Config.theme_preview') . ' ' . ucfirst(esc(config('OSPOS')->settings['theme'])) . ' ' ?></span><span class="glyphicon glyphicon-new-window"></span>
<a href="<?php echo 'https://bootswatch.com/3/' . ('bootstrap' == ($config['theme']) ? 'default' : esc($config['theme'])) ?>" target="_blank" rel=”noopener”>
<span><?php echo lang('Config.theme_preview') . ' ' . ucfirst(esc($config['theme'])) . ' ' ?></span><span class="glyphicon glyphicon-new-window"></span>
</a>
</div>
</div>
@@ -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']
) ?>
</div>
@@ -55,7 +55,7 @@
'type' => 'number',
'min' => 0,
'max' => 100,
'value' => config('OSPOS')->settings['default_sales_discount']
'value' => $config['default_sales_discount']
]) ?>
<span class="input-group-btn">
<?php echo form_checkbox ([
@@ -65,9 +65,9 @@
'data-toggle' => 'toggle',
'data-size' => 'normal',
'data-onstyle' => 'success',
'data-on' => '<b>' . esc(config('OSPOS')->settings['currency_symbol'], 'attr').'</b>',
'data-on' => '<b>' . esc($config['currency_symbol'], 'attr').'</b>',
'data-off' => '<b>%</b>',
'checked' => config('OSPOS')->settings['default_sales_discount_type']
'checked' => $config['default_sales_discount_type']
]) ?>
</span>
</div>
@@ -85,7 +85,7 @@
'type' => 'number',
'min' => 0,
'max' => 100,
'value' => config('OSPOS')->settings['default_receivings_discount']
'value' => $config['default_receivings_discount']
]) ?>
<span class="input-group-btn">
<?php echo form_checkbox ([
@@ -95,9 +95,9 @@
'data-toggle' => 'toggle',
'data-size' => 'normal',
'data-onstyle' => 'success',
'data-on' => '<b>' . esc(config('OSPOS')->settings['currency_symbol'], 'attr') . '</b>',
'data-on' => '<b>' . esc($config['currency_symbol'], 'attr') . '</b>',
'data-off' => '<b>%</b>',
'checked' => config('OSPOS')->settings['default_receivings_discount_type']
'checked' => $config['default_receivings_discount_type']
]) ?>
</span>
</div>
@@ -111,7 +111,7 @@
'name' => 'enforce_privacy',
'id' => 'enforce_privacy',
'value' => 'enforce_privacy',
'checked' => config('OSPOS')->settings['enforce_privacy']
'checked' => $config['enforce_privacy']
]) ?>
&nbsp
<label class="control-label">
@@ -127,7 +127,7 @@
'name' => 'receiving_calculate_average_price',
'id' => 'receiving_calculate_average_price',
'value' => 'receiving_calculate_average_price',
'checked' => config('OSPOS')->settings['receiving_calculate_average_price']
'checked' => $config['receiving_calculate_average_price']
]) ?>
</div>
</div>
@@ -142,7 +142,7 @@
'type' => 'number',
'min' => 10,
'max' => 1000,
'value' => config('OSPOS')->settings['lines_per_page']
'value' => $config['lines_per_page']
]) ?>
</div>
</div>
@@ -158,7 +158,7 @@
'top' => lang('Config.top'),
'bottom' => lang('Config.bottom')
],
esc(config('OSPOS')->settings['notify_vertical_position'], 'attr'),
esc($config['notify_vertical_position'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -170,7 +170,7 @@
'center' => lang('Config.center'),
'right' => lang('Config.right')
],
esc(config('OSPOS')->settings['notify_horizontal_position'], 'attr'),
esc($config['notify_horizontal_position'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -192,7 +192,7 @@
'type' => 'number',
'min' => 128,
'max' => 3840,
'value' => config('OSPOS')->settings['image_max_width'],
'value' => $config['image_max_width'],
'data-toggle' => 'tooltip',
'data-placement' => 'top',
'title' => lang('Config.image_max_width_tooltip')
@@ -209,7 +209,7 @@
'type' => 'number',
'min' => 128,
'max' => 3840,
'value' => config('OSPOS')->settings['image_max_height'],
'value' => $config['image_max_height'],
'data-toggle' => 'tooltip',
'data-placement' => 'top',
'title' => lang('Config.image_max_height_tooltip')
@@ -226,7 +226,7 @@
'type' => 'number',
'min' => 128,
'max' => 2048,
'value' => config('OSPOS')->settings['image_max_size'],
'value' => $config['image_max_size'],
'data-toggle' => 'tooltip',
'data-placement' => 'top',
'title' => lang('Config.image_max_size_tooltip')
@@ -257,7 +257,7 @@
'name' => 'gcaptcha_enable',
'id' => 'gcaptcha_enable',
'value' => 'gcaptcha_enable',
'checked' => config('OSPOS')->settings['gcaptcha_enable']
'checked' => $config['gcaptcha_enable']
]) ?>
<label class="control-label">
<a href="https://www.google.com/recaptcha/admin" target="_blank">
@@ -274,7 +274,7 @@
'name' => 'gcaptcha_site_key',
'id' => 'gcaptcha_site_key',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['gcaptcha_site_key'], 'attr')
'value' => esc($config['gcaptcha_site_key'], 'attr')
]) ?>
</div>
</div>
@@ -286,7 +286,7 @@
'name' => 'gcaptcha_secret_key',
'id' => 'gcaptcha_secret_key',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['gcaptcha_secret_key'], 'attr')
'value' => esc($config['gcaptcha_secret_key'], 'attr')
]) ?>
</div>
</div>
@@ -306,7 +306,7 @@
'unit_price' => lang('Items.unit_price'),
'cost_price' => lang('Items.cost_price')
],
esc(config('OSPOS')->settings['suggestions_first_column'], 'attr'),
esc($config['suggestions_first_column'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -323,7 +323,7 @@
'unit_price' => lang('Items.unit_price'),
'cost_price' => lang('Items.cost_price')
],
esc(config('OSPOS')->settings['suggestions_second_column'], 'attr'),
esc($config['suggestions_second_column'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -340,7 +340,7 @@
'unit_price' => lang('Items.unit_price'),
'cost_price' => lang('Items.cost_price')
],
esc(config('OSPOS')->settings['suggestions_third_column'], 'attr'),
esc($config['suggestions_third_column'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -356,14 +356,14 @@
<?php echo form_radio ([
'name' => 'giftcard_number',
'value' => 'series',
'checked' => config('OSPOS')->settings['giftcard_number'] == 'series']) ?>
'checked' => $config['giftcard_number'] == 'series']) ?>
<?php echo lang('Config.giftcard_series') ?>
</label>
<label class="radio-inline">
<?php echo form_radio ([
'name' => 'giftcard_number',
'value' => 'random',
'checked' => config('OSPOS')->settings['giftcard_number'] == 'random']) ?>
'checked' => $config['giftcard_number'] == 'random']) ?>
<?php echo lang('Config.giftcard_random') ?>
</label>
</div>
@@ -376,7 +376,7 @@
'name' => 'derive_sale_quantity',
'id' => 'derive_sale_quantity',
'value' => 'derive_sale_quantity',
'checked' => config('OSPOS')->settings['derive_sale_quantity']
'checked' => $config['derive_sale_quantity']
]) ?>
&nbsp
<label class="control-label">
@@ -404,7 +404,7 @@
'name' => 'multi_pack_enabled',
'id' => 'multi_pack_enabled',
'value' => 'multi_pack_enabled',
'checked' => config('OSPOS')->settings['multi_pack_enabled']
'checked' => $config['multi_pack_enabled']
]) ?>
</div>
</div>
@@ -416,7 +416,7 @@
'name' => 'include_hsn',
'id' => 'include_hsn',
'value' => 'include_hsn',
'checked' => config('OSPOS')->settings['include_hsn']
'checked' => $config['include_hsn']
]) ?>
</div>
</div>
@@ -428,7 +428,7 @@
'name' => 'category_dropdown',
'id' => 'category_dropdown',
'value' => 'category_dropdown',
'checked' => config('OSPOS')->settings['category_dropdown']
'checked' => $config['category_dropdown']
]) ?>
</div>
</div>

View File

@@ -19,7 +19,7 @@
'name' => 'company',
'id' => 'company',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['company'], 'attr')
'value' => esc($config['company'], 'attr')
]) ?>
</div>
</div>
@@ -32,7 +32,7 @@
<div class="fileinput-new thumbnail" style="width: 200px; height: 200px;"></div>
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 200px; max-height: 200px;">
<img data-src="holder.js/100%x100%" alt="<?php echo lang('Config.company_logo') ?>"
src="<?php if($logo_exists) echo esc(base_url('uploads/' . config('OSPOS')->settings['company_logo']), 'url'); else echo '' ?>"
src="<?php if($logo_exists) echo esc(base_url('uploads/' . $config['company_logo']), 'url'); else echo '' ?>"
style="max-height: 100%; max-width: 100%;">
</div>
<div>
@@ -54,7 +54,7 @@
'name' => 'address',
'id' => 'address',
'class' => 'form-control input-sm required',
'value'=> esc(config('OSPOS')->settings['address'], 'attr')
'value'=> esc($config['address'], 'attr')
]) ?>
</div>
</div>
@@ -68,7 +68,7 @@
'name' => 'website',
'id' => 'website',
'class' => 'form-control input-sm',
'value'=> esc(config('OSPOS')->settings['website'], 'url')
'value'=> esc($config['website'], 'url')
]) ?>
</div>
</div>
@@ -84,7 +84,7 @@
'id' => 'email',
'type' => 'email',
'class' => 'form-control input-sm',
'value'=> esc(config('OSPOS')->settings['email'], 'attr')
'value'=> esc($config['email'], 'attr')
]) ?>
</div>
</div>
@@ -99,7 +99,7 @@
'name' => 'phone',
'id' => 'phone',
'class' => 'form-control input-sm required',
'value'=> esc(config('OSPOS')->settings['phone'], 'attr')
'value'=> esc($config['phone'], 'attr')
]) ?>
</div>
</div>
@@ -114,7 +114,7 @@
'name' => 'fax',
'id' => 'fax',
'class' => 'form-control input-sm',
'value'=> esc(config('OSPOS')->settings['fax'], 'attr')
'value'=> esc($config['fax'], 'attr')
]) ?>
</div>
</div>
@@ -127,7 +127,7 @@
'name' => 'return_policy',
'id' => 'return_policy',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['return_policy'], 'attr')
'value' => esc($config['return_policy'], 'attr')
]) ?>
</div>
</div>

View File

@@ -17,7 +17,7 @@
'name' => 'invoice_enable',
'value' => 'invoice_enable',
'id' => 'invoice_enable',
'checked' => config('OSPOS')->settings['invoice_enable']
'checked' => $config['invoice_enable']
]) ?>
</div>
</div>
@@ -25,7 +25,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.invoice_type'), 'invoice_type', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-3'>
<?php echo form_dropdown('invoice_type', esc($invoice_type_options, 'attr'), esc(config('OSPOS')->settings['invoice_type'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('invoice_type', esc($invoice_type_options, 'attr'), esc($config['invoice_type'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>
@@ -36,7 +36,7 @@
'name' => 'recv_invoice_format',
'id' => 'recv_invoice_format',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['recv_invoice_format'], 'attr')
'value' => esc($config['recv_invoice_format'], 'attr')
]) ?>
</div>
</div>
@@ -48,7 +48,7 @@
'name' => 'invoice_default_comments',
'id' => 'invoice_default_comments',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['invoice_default_comments'], 'attr')
'value' => esc($config['invoice_default_comments'], 'attr')
]) ?>
</div>
</div>
@@ -60,7 +60,7 @@
'name' => 'invoice_email_message',
'id' => 'invoice_email_message',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['invoice_email_message'], 'attr')
'value' => esc($config['invoice_email_message'], 'attr')
]) ?>
</div>
</div>
@@ -68,7 +68,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.line_sequence'), 'line_sequence', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('line_sequence', esc($line_sequence_options, 'attr'), esc(config('OSPOS')->settings['line_sequence'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('line_sequence', esc($line_sequence_options, 'attr'), esc($config['line_sequence'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>
@@ -79,7 +79,7 @@
'name' => 'sales_invoice_format',
'id' => 'sales_invoice_format',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['sales_invoice_format'], 'attr')
'value' => esc($config['sales_invoice_format'], 'attr')
]) ?>
</div>
</div>
@@ -92,7 +92,7 @@
'name' => 'last_used_invoice_number',
'id' => 'last_used_invoice_number',
'class' => 'form-control input-sm required',
'value' => config('OSPOS')->settings['last_used_invoice_number']
'value' => $config['last_used_invoice_number']
]) ?>
</div>
</div>
@@ -104,7 +104,7 @@
'name' => 'sales_quote_format',
'id' => 'sales_quote_format',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['sales_quote_format'], 'attr')
'value' => esc($config['sales_quote_format'], 'attr')
]) ?>
</div>
</div>
@@ -117,7 +117,7 @@
'name' => 'last_used_quote_number',
'id' => 'last_used_quote_number',
'class' => 'form-control input-sm required',
'value'=>config('OSPOS')->settings['last_used_quote_number']
'value'=>$config['last_used_quote_number']
]) ?>
</div>
</div>
@@ -129,7 +129,7 @@
'name' => 'quote_default_comments',
'id' => 'quote_default_comments',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['quote_default_comments'], 'attr')
'value' => esc($config['quote_default_comments'], 'attr')
]) ?>
</div>
</div>
@@ -141,7 +141,7 @@
'name' => 'work_order_enable',
'value' => 'work_order_enable',
'id' => 'work_order_enable',
'checked' => config('OSPOS')->settings['work_order_enable']
'checked' => $config['work_order_enable']
]) ?>
</div>
</div>
@@ -153,7 +153,7 @@
'name' => 'work_order_format',
'id' => 'work_order_format',
'class' => 'form-control input-sm',
'value' => esc(config('OSPOS')->settings['work_order_format'], 'attr')
'value' => esc($config['work_order_format'], 'attr')
]) ?>
</div>
</div>
@@ -166,7 +166,7 @@
'name' => 'last_used_work_order_number',
'id' => 'last_used_work_order_number',
'class' => 'form-control input-sm required',
'value' => config('OSPOS')->settings['last_used_work_order_number']
'value' => $config['last_used_work_order_number']
]) ?>
</div>
</div>

View File

@@ -16,8 +16,8 @@
<?php echo form_label(lang('Config.number_locale'), 'number_locale', ['class' => 'control-label col-xs-2']) ?>
<div class='row'>
<div class='col-xs-1'>
<?php echo form_input('number_locale', esc(config('OSPOS')->settings['number_locale'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'number_locale']) ?>
<?php echo form_hidden('save_number_locale', esc(config('OSPOS')->settings['number_locale'], 'attr')) ?>
<?php echo form_input('number_locale', esc($config['number_locale'], 'attr'), ['class' => 'form-control input-sm', 'id' => 'number_locale']) ?>
<?php echo form_hidden('save_number_locale', esc($config['number_locale'], 'attr')) ?>
</div>
<div class="col-xs-2">
<label class="control-label">
@@ -39,7 +39,7 @@
'name' => 'thousands_separator',
'id' => 'thousands_separator',
'value' => 'thousands_separator',
'checked' => config('OSPOS')->settings['thousands_separator']
'checked' => $config['thousands_separator']
]) ?>
</div>
</div>
@@ -51,7 +51,7 @@
'name' => 'currency_symbol',
'id' => 'currency_symbol',
'class' => 'form-control input-sm number_locale',
'value' => esc(config('OSPOS')->settings['currency_symbol'], 'attr')
'value' => esc($config['currency_symbol'], 'attr')
]) ?>
</div>
</div>
@@ -78,7 +78,7 @@
'1' => '1',
'2' => '2'
],
config('OSPOS')->settings['currency_decimals'],
$config['currency_decimals'],
['class' => 'form-control input-sm']
) ?>
</div>
@@ -96,7 +96,7 @@
'3' => '3',
'4' => '4'
],
config('OSPOS')->settings['tax_decimals'],
$config['tax_decimals'],
['class' => 'form-control input-sm']
) ?>
</div>
@@ -113,7 +113,7 @@
'2' => '2',
'3' => '3'
],
config('OSPOS')->settings['quantity_decimals'],
$config['quantity_decimals'],
['class' => 'form-control input-sm']
) ?>
</div>
@@ -130,7 +130,7 @@
'1' => '1',
'2' => '2'
],
config('OSPOS')->settings['cash_decimals'],
$config['cash_decimals'],
['class' => 'form-control input-sm']
) ?>
</div>
@@ -144,7 +144,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.cash_rounding'), 'cash_rounding_code', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('cash_rounding_code', esc($rounding_options, 'attr'), config('OSPOS')->settings['cash_rounding_code'], ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('cash_rounding_code', esc($rounding_options, 'attr'), $config['cash_rounding_code'], ['class' => 'form-control input-sm']) ?>
</div>
</div>
@@ -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('OSPOS')->settings['payment_options_order'], 'attr'),
esc($config['payment_options_order'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -169,7 +169,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.country_codes'), 'country_codes', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-1'>
<?php echo form_input('country_codes', esc(config('OSPOS')->settings['country_codes'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_input('country_codes', esc($config['country_codes'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
<div class="col-xs-1">
<label class="control-label">
@@ -197,7 +197,7 @@
<?php echo form_dropdown(
'timezone',
get_timezones(),
config('OSPOS')->settings['timezone'] ? esc(config('OSPOS')->settings['timezone'], 'attr') : date_default_timezone_get(), ['class' => 'form-control input-sm']) ?>
$config['timezone'] ? esc($config['timezone'], 'attr') : date_default_timezone_get(), ['class' => 'form-control input-sm']) ?>
</div>
</div>
@@ -207,14 +207,14 @@
<?php echo form_dropdown(
'dateformat',
get_dateformats(),
esc(config('OSPOS')->settings['dateformat'], 'attr'),
esc($config['dateformat'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
<div class='col-sm-2'>
<?php echo form_dropdown('timeformat',
get_timeformats(),
config('OSPOS')->settings['timeformat'], ['class' => 'form-control input-sm']
$config['timeformat'], ['class' => 'form-control input-sm']
) ?>
</div>
</div>
@@ -226,7 +226,7 @@
'name' => 'date_or_time_format',
'id' => 'date_or_time_format',
'value' => 'date_or_time_format',
'checked' => config('OSPOS')->settings['date_or_time_format']
'checked' => $config['date_or_time_format']
]) ?>
</div>
</div>
@@ -250,7 +250,7 @@
'11' => lang('Config.financial_year_nov'),
'12' => lang('Config.financial_year_dec')
],
config('OSPOS')->settings['financial_year'], ['class' => 'form-control input-sm']
$config['financial_year'], ['class' => 'form-control input-sm']
) ?>
</div>
</div>

View File

@@ -13,7 +13,7 @@
'name' => 'msg_uid',
'id' => 'msg_uid',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['msg_uid'], 'attr')
'value' => esc($config['msg_uid'], 'attr')
]) ?>
</div>
</div>
@@ -28,7 +28,7 @@
'name' => 'msg_pwd',
'id' => 'msg_pwd',
'class' => 'form-control input-sm required',
'value' => esc(config('OSPOS')->settings['msg_pwd'], 'attr')
'value' => esc($config['msg_pwd'], 'attr')
]) ?>
</div>
</div>
@@ -43,7 +43,7 @@
'name' => 'msg_src',
'id' => 'msg_src',
'class' => 'form-control input-sm required',
'value' => config('OSPOS')->settings['msg_src'] == NULL ? esc(config('OSPOS')->settings['company'], 'attr') : esc(config('OSPOS')->settings['msg_src'], 'attr')
'value' => $config['msg_src'] == NULL ? esc($config['company'], 'attr') : esc($config['msg_src'], 'attr')
]) ?>
</div>
</div>
@@ -56,7 +56,7 @@
'name' => 'msg_msg',
'id' => 'msg_msg',
'class' => 'form-control input-sm',
'value' => config('OSPOS')->settings['msg_msg'],
'value' => $config['msg_msg'],
'placeholder' => lang('Config.msg_msg_placeholder')
]) ?>
</div>

View File

@@ -12,7 +12,7 @@
'receipt_default' => lang('Config.receipt_default'),
'receipt_short' => lang('Config.receipt_short')
],
esc(config('OSPOS')->settings['receipt_template'], 'attr'),
esc($config['receipt_template'], 'attr'),
['class' => 'form-control input-sm']
) ?>
</div>
@@ -29,7 +29,7 @@
'name' => 'receipt_font_size',
'id' => 'receipt_font_size',
'class' => 'form-control input-sm required',
'value' => config('OSPOS')->settings['receipt_font_size']
'value' => $config['receipt_font_size']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>
@@ -47,7 +47,7 @@
'name' => 'print_delay_autoreturn',
'id' => 'print_delay_autoreturn',
'class' => 'form-control input-sm required',
'value' => config('OSPOS')->settings['print_delay_autoreturn']
'value' => $config['print_delay_autoreturn']
]) ?>
<span class="input-group-addon input-sm">s</span>
</div>
@@ -61,7 +61,7 @@
<?php echo form_radio ([
'name' => 'email_receipt_check_behaviour',
'value' => 'always',
'checked' => config('OSPOS')->settings['email_receipt_check_behaviour'] == 'always'
'checked' => $config['email_receipt_check_behaviour'] == 'always'
]) ?>
<?php echo lang('Config.email_receipt_check_behaviour_always') ?>
</label>
@@ -69,7 +69,7 @@
<?php echo form_radio ([
'name' => 'email_receipt_check_behaviour',
'value' => 'never',
'checked' => config('OSPOS')->settings['email_receipt_check_behaviour'] == 'never'
'checked' => $config['email_receipt_check_behaviour'] == 'never'
]) ?>
<?php echo lang('Config.email_receipt_check_behaviour_never') ?>
</label>
@@ -77,7 +77,7 @@
<?php echo form_radio ([
'name' => 'email_receipt_check_behaviour',
'value' => 'last',
'checked' => config('OSPOS')->settings['email_receipt_check_behaviour'] == 'last'
'checked' => $config['email_receipt_check_behaviour'] == 'last'
]) ?>
<?php echo lang('Config.email_receipt_check_behaviour_last') ?>
</label>
@@ -91,7 +91,7 @@
<?php echo form_radio ([
'name' => 'print_receipt_check_behaviour',
'value' => 'always',
'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'always'
'checked' => $config['print_receipt_check_behaviour'] == 'always'
]) ?>
<?php echo lang('Config.print_receipt_check_behaviour_always') ?>
</label>
@@ -99,7 +99,7 @@
<?php echo form_radio ([
'name' => 'print_receipt_check_behaviour',
'value' => 'never',
'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'never'
'checked' => $config['print_receipt_check_behaviour'] == 'never'
]) ?>
<?php echo lang('Config.print_receipt_check_behaviour_never') ?>
</label>
@@ -107,7 +107,7 @@
<?php echo form_radio ([
'name' => 'print_receipt_check_behaviour',
'value' => 'last',
'checked' => config('OSPOS')->settings['print_receipt_check_behaviour'] == 'last'
'checked' => $config['print_receipt_check_behaviour'] == 'last'
]) ?>
<?php echo lang('Config.print_receipt_check_behaviour_last') ?>
</label>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -193,7 +193,7 @@
'name' => 'print_silently',
'id' => 'print_silently',
'value' => 'print_silently',
'checked' => config('OSPOS')->settings['print_silently']
'checked' => $config['print_silently']
]) ?>
</div>
</div>
@@ -205,7 +205,7 @@
'name' => 'print_header',
'id' => 'print_header',
'value' => 'print_header',
'checked' => config('OSPOS')->settings['print_header']
'checked' => $config['print_header']
]) ?>
</div>
</div>
@@ -217,7 +217,7 @@
'name' => 'print_footer',
'id' => 'print_footer',
'value' => 'print_footer',
'checked' => config('OSPOS')->settings['print_footer']
'checked' => $config['print_footer']
]) ?>
</div>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>
@@ -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']
]) ?>
<span class="input-group-addon input-sm">px</span>
</div>

View File

@@ -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']
]) ?>
</div>
</div>

View File

@@ -182,7 +182,7 @@
?>
<br>
<div id="timezone" style="font-weight:600;"></div><br><br>
<div id="ostimezone" style="display:none;" ><?php echo esc(config('OSPOS')->settings['timezone']) ?></div><br>
<div id="ostimezone" style="display:none;" ><?php echo esc($config['timezone']) ?></div><br>
<br>
</div>
</div>
@@ -204,6 +204,6 @@
});
if($('#timezone').html() !== $('#ostimezone').html())
document.getElementById("TimeError").innerHTML = '<span style="color: red;"><?php echo lang('Config.timezone_error') ?></span><br><br><?php echo lang('Config.user_timezone') ?><div id="timezoneE" style="font-weight:600;"></div><br><?php echo lang('Config.os_timezone') ?><div id="ostimezoneE" style="font-weight:600;"><?php echo esc(config('OSPOS')->settings['timezone']) ?></div><br>';
document.getElementById("TimeError").innerHTML = '<span style="color: red;"><?php echo lang('Config.timezone_error') ?></span><br><br><?php echo lang('Config.user_timezone') ?><div id="timezoneE" style="font-weight:600;"></div><br><?php echo lang('Config.os_timezone') ?><div id="ostimezoneE" style="font-weight:600;"><?php echo esc($config['timezone']) ?></div><br>';
</script>
</div>

View File

@@ -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']
]) ?>
</div>
</div>

View File

@@ -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')
]) ?>
</div>
</div>
@@ -31,7 +31,7 @@
'name' => 'tax_included',
'id' => 'tax_included',
'value' => 'tax_included',
'checked' => config('OSPOS')->settings['tax_included']
'checked' => $config['tax_included']
]) ?>
</div>
</div>
@@ -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')]) ?>
</div>
<div class="col-xs-1 input-group">
<?php echo form_input ([
'name' => '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'])
]) ?>
<span class="input-group-addon input-sm">%</span>
</div>
@@ -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')
]) ?>
</div>
<div class="col-xs-1 input-group">
@@ -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'])
]) ?>
<span class="input-group-addon input-sm">%</span>
</div>
@@ -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']
]) ?>
</div>
</div>
@@ -92,21 +92,21 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.default_tax_code'), 'default_tax_code', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('default_tax_code', esc($tax_code_options, 'attr'), esc(config('OSPOS')->settings['default_tax_code'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('default_tax_code', esc($tax_code_options, 'attr'), esc($config['default_tax_code'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.default_tax_category'), 'default_tax_category', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('default_tax_category', esc($tax_category_options, 'attr'), esc(config('OSPOS')->settings['default_tax_category'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('default_tax_category', esc($tax_category_options, 'attr'), esc($config['default_tax_category'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>
<div class="form-group form-group-sm">
<?php echo form_label(lang('Config.default_tax_jurisdiction'), 'default_tax_jurisdiction', ['class' => 'control-label col-xs-2']) ?>
<div class='col-xs-2'>
<?php echo form_dropdown('default_tax_jurisdiction', esc($tax_jurisdiction_options, 'attr'), esc(config('OSPOS')->settings['default_tax_jurisdiction'], 'attr'), ['class' => 'form-control input-sm']) ?>
<?php echo form_dropdown('default_tax_jurisdiction', esc($tax_jurisdiction_options, 'attr'), esc($config['default_tax_jurisdiction'], 'attr'), ['class' => 'form-control input-sm']) ?>
</div>
</div>

View File

@@ -46,7 +46,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Customers.consent'), 'consent', ['class' => 'required control-label col-xs-3']) ?>
<div class='col-xs-1'>
<?php echo form_checkbox('consent', '1', $person_info->consent == '' ? !config('OSPOS')->settings['enforce_privacy'] : (boolean)$person_info->consent) ?>
<?php echo form_checkbox('consent', '1', $person_info->consent == '' ? !$config['enforce_privacy'] : (boolean)$person_info->consent) ?>
</div>
</div>
@@ -129,7 +129,7 @@
</div>
</div>
<?php if(config('OSPOS')->settings['customer_reward_enable'] == TRUE): ?>
<?php if($config['customer_reward_enable'] == TRUE): ?>
<div class="form-group form-group-sm">
<?php echo form_label(lang('Customers.rewards_package'), 'rewards', ['class' => 'control-label col-xs-3']) ?>
<div class='col-xs-8'>
@@ -225,7 +225,7 @@
<div class="col-xs-4">
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'total',
@@ -235,7 +235,7 @@
'disabled' => ''
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -246,7 +246,7 @@
<div class="col-xs-4">
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'max',
@@ -256,7 +256,7 @@
'disabled' => ''
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -267,7 +267,7 @@
<div class="col-xs-4">
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'min',
@@ -277,7 +277,7 @@
'disabled' => ''
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -288,7 +288,7 @@
<div class="col-xs-4">
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'average',
@@ -298,7 +298,7 @@
'disabled' => ''
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>

View File

@@ -73,7 +73,7 @@
<div class='col-xs-6'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'amount',
@@ -82,7 +82,7 @@
'value' => to_currency_no_money($expenses_info->amount)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -93,7 +93,7 @@
<div class='col-xs-6'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'tax_amount',
@@ -102,7 +102,7 @@
'value' => to_currency_no_money($expenses_info->tax_amount)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>

View File

@@ -27,7 +27,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers) ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'expense_id',
onLoadSuccess: function(response) {
if($("#table tbody tr").length > 1) {

View File

@@ -14,7 +14,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers) ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'expense_category_id',
});

View File

@@ -29,7 +29,7 @@
<?php
$class = '';
if(config('OSPOS')->settings['giftcard_number'] == 'series')
if($config['giftcard_number'] == 'series')
{
$class = ' required';
}
@@ -51,7 +51,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></span>
<span class="input-group-addon input-sm"><?php echo esc($config['currency_symbol']) ?></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'giftcard_amount',
@@ -60,7 +60,7 @@
'value'=>to_currency_no_money($giftcard_value)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></span>
<?php endif; ?>
</div>
</div>
@@ -113,7 +113,7 @@ $(document).ready(function()
rules:
{
<?php
if(config('OSPOS')->settings['giftcard_number'] == 'series')
if($config['giftcard_number'] == 'series')
{
?>
giftcard_number:
@@ -146,7 +146,7 @@ $(document).ready(function()
messages:
{
<?php
if(config('OSPOS')->settings['giftcard_number'] == 'series')
if($config['giftcard_number'] == 'series')
{
?>
giftcard_number:

View File

@@ -12,7 +12,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers) ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'giftcard_id'
});
});
@@ -37,4 +37,4 @@ $(document).ready(function()
<table id="table"></table>
</div>
<?php echo view('partial/footer') ?>
<?php echo view('partial/footer') ?>

View File

@@ -14,7 +14,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers) ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'item_kit_id'
});
@@ -52,4 +52,4 @@ $(document).ready(function()
<table id="table"></table>
</div>
<?php echo view('partial/footer') ?>
<?php echo view('partial/footer') ?>

View File

@@ -62,7 +62,7 @@
<div class="input-group">
<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-tag"></span></span>
<?php
if(config('OSPOS')->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) ?> <?php echo lang('Items.kit') ?>
</label>
<?php
if(config('OSPOS')->settings['derive_sale_quantity'] == '1')
if($config['derive_sale_quantity'] == '1')
{
?>
<label class="radio-inline">
@@ -192,7 +192,7 @@
<div class="col-xs-4">
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'cost_price',
@@ -202,7 +202,7 @@
'value' => to_currency_no_money($item_info->cost_price)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -213,7 +213,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'unit_price',
@@ -223,7 +223,7 @@
'value' => to_currency_no_money($item_info->unit_price)
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -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('OSPOS')->settings['default_tax_1_name'], 'attr')
'value' => isset($item_tax_info[0]['name']) ? esc($item_tax_info[0]['name'], 'attr') : esc($config['default_tax_1_name'], 'attr')
]) ?>
</div>
<div class="col-xs-4">
@@ -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')
]) ?>
</div>
<div class="col-xs-4">
@@ -420,7 +420,7 @@
</div>
<?php
if(config('OSPOS')->settings['multi_pack_enabled'] == '1')
if($config['multi_pack_enabled'] == '1')
{
?>
<div class="form-group form-group-sm">

View File

@@ -49,7 +49,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'cost_price',
@@ -57,7 +57,7 @@
'class' => 'form-control input-sm'
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -68,7 +68,7 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if (!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input ([
'name' => 'unit_price',
@@ -76,7 +76,7 @@
'class' => 'form-control input-sm'
]) ?>
<?php if (currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -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')
]) ?>
</div>
<div class="col-xs-4">
@@ -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'])
]) ?>
<span class="input-group input-group-addon"><b>%</b></span>
</div>
@@ -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')
]) ?>
</div>
<div class="col-xs-4">
@@ -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'])
]) ?>
<span class="input-group input-group-addon"><b>%</b></span>
</div>

View File

@@ -32,7 +32,7 @@ $(document).ready(function()
// load the preset daterange picker
<?php echo view('partial/daterangepicker') ?>
// set the beginning of time as starting date
$('#daterangepicker').data('daterangepicker').setStartDate("<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,01,01,2010)) ?>");
$('#daterangepicker').data('daterangepicker').setStartDate("<?php echo date($config['dateformat'], mktime(0,0,0,01,01,2010)) ?>");
// update the hidden inputs with the selected dates before submitting the search data
var start_date = "<?php echo date('Y-m-d', mktime(0,0,0,01,01,2010)) ?>";
$("#daterangepicker").on('apply.daterangepicker', function(ev, picker) {
@@ -52,7 +52,7 @@ $(document).ready(function()
employee_id: <?php echo $employee->get_logged_in_employee_info()->person_id ?>,
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'items.item_id',
queryParams: function() {
return $.extend(arguments[0], {

View File

@@ -34,7 +34,7 @@
<div class="form-group form-group-sm">
<?php echo form_label(lang('Messages.message'), 'message_label', ['for' => 'message', 'class' => 'control-label col-xs-2 required']) ?>
<div class="col-xs-10">
<?php echo form_textarea (['class' => 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc(config('OSPOS')->settings['msg_msg'], 'attr')]) ?>
<?php echo form_textarea (['class' => 'form-control input-sm required', 'name' => 'message', 'id' => 'message', 'value' => esc($config['msg_msg'], 'attr')]) ?>
</div>
</div>
</fieldset>

View File

@@ -2,11 +2,11 @@
var pickerconfig = function(config) {
return $.extend({
format: "<?php echo dateformat_bootstrap(config('OSPOS')->settings['dateformat']) . ' ' . dateformat_bootstrap(config('OSPOS')->settings['timeformat']) ?>",
format: "<?php echo dateformat_bootstrap($config['dateformat']) . ' ' . dateformat_bootstrap($config['timeformat']) ?>",
<?php
$t = config('OSPOS')->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) {
}, <?php echo $config ?? '{}' ?>);
};
$.fn.datetimepicker.dates['<?php echo config('OSPOS')->settings['language'] ?>'] = {
$.fn.datetimepicker.dates['<?php echo $config['language'] ?>'] = {
days: [
"<?php echo lang('Cal.sunday') ?>",
"<?php echo lang('Cal.monday') ?>",
@@ -87,13 +87,13 @@ $.fn.datetimepicker.dates['<?php echo config('OSPOS')->settings['language'] ?>']
],
today: "<?php echo lang('Datepicker.today') ?>",
<?php
if( strpos(config('OSPOS')->settings['timeformat'], 'a') !== false )
if( strpos($config['timeformat'], 'a') !== false )
{
?>
meridiem: ["am", "pm"],
<?php
}
elseif( strpos(config('OSPOS')->settings['timeformat'], 'A') !== false )
elseif( strpos($config['timeformat'], 'A') !== false )
{
?>
meridiem: ["AM", "PM"],

View File

@@ -1,5 +1,5 @@
<?php $this->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": {
"<?php echo lang('Datepicker.today') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.today_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
],
"<?php echo lang('Datepicker.yesterday') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.last_7') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.last_30') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.this_month') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y")-1)-1) ?>"
],
"<?php echo lang('Datepicker.same_month_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")+1,1,date("Y")-1)-1) ?>"
],
"<?php echo lang('Datepicker.last_month') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.this_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,1,1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
],
"<?php echo lang('Datepicker.last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,1,1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,1,1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.this_financial_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),1,date("Y")+1)-1) ?>"
],
"<?php echo lang('Datepicker.last_financial_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,$config['financial_year'],1,date("Y"))-1) ?>"
],
"<?php echo lang('Datepicker.all_time') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,1,1,2010)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
"<?php echo date($config['dateformat'], mktime(0,0,0,1,1,2010)) ?>",
"<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
],
},
"locale": {
"format": '<?php echo dateformat_momentjs(config('OSPOS')->settings['dateformat']) ?>',
"format": '<?php echo dateformat_momentjs($config['dateformat']) ?>',
"separator": " - ",
"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
@@ -100,10 +100,10 @@
"firstDay": <?php echo lang('Datepicker.weekstart') ?>
},
"alwaysShowCalendars": true,
"startDate": "<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
"endDate": "<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
"minDate": "<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,01,01,2010)) ?>",
"maxDate": "<?php echo date(config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
"startDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
"endDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>",
"minDate": "<?php echo date($config['dateformat'], mktime(0,0,0,01,01,2010)) ?>",
"maxDate": "<?php echo date($config['dateformat'], mktime(0,0,0,date("m"),date("d")+1,date("Y"))-1) ?>"
}, 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": {
"<?php echo lang('Datepicker.today') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['dateformat'], mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
],
"<?php echo lang('Datepicker.today_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y")-1)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
],
"<?php echo lang('Datepicker.yesterday') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-1,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d")-1,date("Y"))) ?>"
],
"<?php echo lang('Datepicker.last_7') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-6,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
],
"<?php echo lang('Datepicker.last_30') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d")-29,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
],
"<?php echo lang('Datepicker.this_month') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
],
"<?php echo lang('Datepicker.same_month_to_same_day_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y")-1)) ?>"
],
"<?php echo lang('Datepicker.same_month_last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y")-1)) ?>"
],
"<?php echo lang('Datepicker.last_month') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),0,date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m")-1,1,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),0,date("Y"))) ?>"
],
"<?php echo lang('Datepicker.this_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
],
"<?php echo lang('Datepicker.last_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,12,31,date("Y")-1)) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,12,31,date("Y")-1)) ?>"
],
"<?php echo lang('Datepicker.this_financial_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y"))) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y"))) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m")+1,0,date("Y"))) ?>"
],
"<?php echo lang('Datepicker.last_financial_year') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,config('OSPOS')->settings['financial_year'],1,date("Y")-1)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,config('OSPOS')->settings['financial_year'],0,date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,$config['financial_year'],1,date("Y")-1)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,$config['financial_year'],0,date("Y"))) ?>"
],
"<?php echo lang('Datepicker.all_time') ?>": [
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,1,1,2010)) ?>",
"<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,1,1,2010)) ?>",
"<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
],
},
"locale": {
"format": '<?php echo dateformat_momentjs(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat']) ?>',
"format": '<?php echo dateformat_momentjs($config['dateformat'] . ' ' . $config['timeformat']) ?>',
"separator": " - ",
"applyLabel": "<?php echo lang('Datepicker.apply') ?>",
"cancelLabel": "<?php echo lang('Datepicker.cancel') ?>",
@@ -212,10 +212,10 @@
"timePicker": true,
"timePickerSeconds": true,
"alwaysShowCalendars": true,
"startDate": "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"endDate": "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>",
"minDate": "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(0,0,0,01,01,2010)) ?>",
"maxDate": "<?php echo date(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
"startDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,date("m"),date("d"),date("Y"))) ?>",
"endDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>",
"minDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(0,0,0,01,01,2010)) ?>",
"maxDate": "<?php echo date($config['dateformat'] . ' ' . $config['timeformat'],mktime(23,59,59,date("m"),date("d"),date("Y"))) ?>"
}, function(start, end, label) {
start_date = start.format('YYYY-MM-DD HH:mm:ss');
end_date = end.format('YYYY-MM-DD HH:mm:ss');

View File

@@ -8,12 +8,12 @@
clock_tick();
var update_clock = function update_clock() {
document.getElementById('liveclock').innerHTML = moment().format("<?php echo dateformat_momentjs(config('OSPOS')->settings['dateformat'] . ' ' . config('OSPOS')->settings['timeformat']) ?>");
document.getElementById('liveclock').innerHTML = moment().format("<?php echo dateformat_momentjs($config['dateformat'] . ' ' . $config['timeformat']) ?>");
}
$.notifyDefaults({ placement: {
align: "<?php echo esc(config('OSPOS')->settings['notify_horizontal_position'], 'js') ?>",
from: "<?php echo esc(config('OSPOS')->settings['notify_vertical_position'], 'js') ?>"
align: "<?php echo esc($config['notify_horizontal_position'], 'js') ?>",
from: "<?php echo esc($config['notify_vertical_position'], 'js') ?>"
}});
var cookie_name = "<?php echo esc(config('Cookie')->prefix, 'js') . esc(config('Security')->cookieName, 'js') ?>";

View File

@@ -11,12 +11,12 @@ function printdoc()
if (window.jsPrintSetup)
{
// set top margins in millimeters
jsPrintSetup.setOption('marginTop', '<?php echo config('OSPOS')->settings['print_top_margin'] ?>');
jsPrintSetup.setOption('marginLeft', '<?php echo config('OSPOS')->settings['print_left_margin'] ?>');
jsPrintSetup.setOption('marginBottom', '<?php echo config('OSPOS')->settings['print_bottom_margin'] ?>');
jsPrintSetup.setOption('marginRight', '<?php echo config('OSPOS')->settings['print_right_margin'] ?>');
jsPrintSetup.setOption('marginTop', '<?php echo $config['print_top_margin'] ?>');
jsPrintSetup.setOption('marginLeft', '<?php echo $config['print_left_margin'] ?>');
jsPrintSetup.setOption('marginBottom', '<?php echo $config['print_bottom_margin'] ?>');
jsPrintSetup.setOption('marginRight', '<?php echo $config['print_right_margin'] ?>');
<?php if (!config('OSPOS')->settings['print_header'])
<?php if (!$config['print_header'])
{
?>
// set page header
@@ -25,7 +25,7 @@ function printdoc()
jsPrintSetup.setOption('headerStrRight', '');
<?php
}
if (!config('OSPOS')->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();
<?php if (!config('OSPOS')->settings['print_silently'])
<?php if (!$config['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 = "<?php echo site_url('sales') ?>";
}, <?php echo config('OSPOS')->settings['print_delay_autoreturn'] * 1000 ?>);
}, <?php echo $config['print_delay_autoreturn'] * 1000 ?>);
});
<?php

View File

@@ -196,7 +196,7 @@ $(document).ready(function()
}
},
language : '<?php echo current_language_code() ?>',
country_codes: '<?php echo esc(config('OSPOS')->settings['country_codes'], 'js') ?>'
country_codes: '<?php echo esc($config['country_codes'], 'js') ?>'
});
});
</script>
</script>

View File

@@ -14,7 +14,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'people.person_id',
enableActions: function()
{

View File

@@ -33,25 +33,25 @@
<div id="receipt_wrapper">
<div id="receipt_header">
<?php
if (config('OSPOS')->settings['company_logo'] != '')
if ($config['company_logo'] != '')
{
?>
<div id="company_name"><img id="image" src="<?php echo esc(base_url('uploads/' . config('OSPOS')->settings['company_logo']), 'url') ?>" alt="company_logo" /></div>
<div id="company_name"><img id="image" src="<?php echo esc(base_url('uploads/' . $config['company_logo']), 'url') ?>" alt="company_logo" /></div>
<?php
}
?>
<?php
if (config('OSPOS')->settings['receipt_show_company_name'])
if ($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name"><?php echo esc($config['company']) ?></div>
<?php
}
?>
<div id="company_address"><?php echo esc(nl2br(config('OSPOS')->settings['address'])) ?></div>
<div id="company_phone"><?php echo esc(config('OSPOS')->settings['phone']) ?></div>
<div id="company_address"><?php echo esc(nl2br($config['address'])) ?></div>
<div id="company_phone"><?php echo esc($config['phone']) ?></div>
<div id="sale_receipt"><?php echo lang('Receivings.receipt') ?></div>
<div id="sale_time"><?php echo esc($transaction_time) ?></div>
</div>
@@ -158,7 +158,7 @@
</table>
<div id="sale_return_policy">
<?php echo esc(nl2br(config('OSPOS')->settings['return_policy'])) ?>
<?php echo esc(nl2br($config['return_policy'])) ?>
</div>
<div id='barcode'>

View File

@@ -204,7 +204,7 @@ if (isset($success))
'data-toggle' => "toggle",
'data-size' => 'small',
'data-onstyle' => 'success',
'data-on' => '<b>' . esc(config('OSPOS')->settings['currency_symbol'], 'attr') .'</b>',
'data-on' => '<b>' . esc($config['currency_symbol'], 'attr') .'</b>',
'data-off' => '<b>%</b>',
'data-line' => esc($line, 'attr'),
'checked' => $item['discount_type']

View File

@@ -73,7 +73,7 @@ if(isset($error))
<div class="form-group form-group-sm">
<?php echo form_label(lang('Reports.discount_type'), 'reports_discount_type_label', ['class' => 'required control-label col-xs-2']) ?>
<div id='report_discount_type' class="col-xs-3">
<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc(config('OSPOS')->settings['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc($config['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
</div>
</div>
<?php
@@ -115,4 +115,4 @@ $(document).ready(function()
window.location = [window.location, start_date, end_date, $("#input_type").val() || 0, $("#location_id").val() || 'all', $("#discount_type_id").val() || 0 ].join("/");
});
});
</script>
</script>

View File

@@ -52,13 +52,13 @@
if( currency_side() )
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -119,4 +119,4 @@
];
new Chartist.Bar('#chart1', data, options, responsiveOptions);
</script>
</script>

View File

@@ -49,13 +49,13 @@
if(currency_side())
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -122,4 +122,4 @@
];
new Chartist.Bar('#chart1', data, options, responsiveOptions);
</script>
</script>

View File

@@ -68,13 +68,13 @@
if( currency_side() )
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -121,13 +121,13 @@
if( currency_side() )
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -150,13 +150,13 @@
if( currency_side() )
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -205,4 +205,4 @@
data.element.replace(circle);
}
});
</script>
</script>

View File

@@ -41,13 +41,13 @@
if( currency_side() )
{
?>
return value + '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>';
return value + '<?php echo esc($config['currency_symbol'], 'js') ?>';
<?php
}
else
{
?>
return '<?php echo esc(config('OSPOS')->settings['currency_symbol'], 'js') ?>' + value;
return '<?php echo esc($config['currency_symbol'], 'js') ?>' + value;
<?php
}
}
@@ -91,4 +91,4 @@
});
}
});
</script>
</script>

View File

@@ -36,7 +36,7 @@ if(isset($error))
<div class="form-group form-group-sm">
<?php echo form_label(lang('Reports.discount_type'), 'reports_discount_type_label', ['class' => 'required control-label col-xs-2']) ?>
<div id='report_discount_type' class="col-xs-3">
<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc(config('OSPOS')->settings['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
<?php echo form_dropdown('discount_type', esc($discount_type_options, 'attr'), esc($config['default_sales_discount_type'], 'attr'), ['id' => 'discount_type_id', 'class' => 'form-control']) ?>
</div>
</div>
<?php
@@ -60,7 +60,7 @@ if(isset($error))
'class' => 'form-control input-sm required',
'type' => 'number',
'min' => 0,
'value' => config('OSPOS')->settings['default_sales_discount']]) ?>
'value' => $config['default_sales_discount']]) ?>
</div>
<?php
}

View File

@@ -54,7 +54,7 @@
stickyHeader: true,
stickyHeaderOffsetLeft: $('#table').offset().left + 'px',
stickyHeaderOffsetRight: $('#table').offset().right + 'px',
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
sortable: true,
showExport: true,
exportDataType: 'all',

View File

@@ -36,7 +36,7 @@
var details_data = <?php echo json_encode(esc($details_data, 'js')) ?>;
<?php
if(config('OSPOS')->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 = <?php echo json_encode(esc($details_data_rewards, 'js')) ?>;
@@ -63,7 +63,7 @@
stickyHeader: true,
stickyHeaderOffsetLeft: $('#table').offset().left + 'px',
stickyHeaderOffsetRight: $('#table').offset().right + 'px',
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
pagination: true,
sortable: true,
showColumns: true,
@@ -88,7 +88,7 @@
});
<?php
if(config('OSPOS')->settings['customer_reward_enable'] == TRUE && !empty($details_data_rewards))
if($config['customer_reward_enable'] == TRUE && !empty($details_data_rewards))
{
?>
$detail.append('<table></table>').find("table").bootstrapTable({

View File

@@ -34,7 +34,7 @@
</div>
<?php
if(config('OSPOS')->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']))`
{
?>
<div class="form-group form-group-sm">
@@ -64,11 +64,11 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if(!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input(['name' => '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 ?>
<?php if(currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -96,11 +96,11 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if(!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol'], 'attr') ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol'], 'attr') ?></b></span>
<?php endif; ?>
<?php echo form_input (['name' => "payment_amount_$i", 'value' => $row->payment_amount, 'id' => "payment_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) //TODO: add type attribute ?>
<?php if(currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>
@@ -119,11 +119,11 @@
<div class='col-xs-4'>
<div class="input-group input-group-sm">
<?php if(!currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
<?php echo form_input (['name' => "refund_amount_$i", 'value' => $row->cash_refund, 'id' => "refund_amount_$i", 'class' => 'form-control input-sm', 'readonly' => 'true']) ?>
<?php if(currency_side()): ?>
<span class="input-group-addon input-sm"><b><?php echo esc(config('OSPOS')->settings['currency_symbol']) ?></b></span>
<span class="input-group-addon input-sm"><b><?php echo esc($config['currency_symbol']) ?></b></span>
<?php endif; ?>
</div>
</div>

View File

@@ -79,19 +79,19 @@ $(document).ready(function()
<div id="logo">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo base_url('uploads/' . config('OSPOS')->settings['company_logo']) ?>" alt="company_logo" />
<img id="image" src="<?php echo base_url('uploads/' . $config['company_logo']) ?>" alt="company_logo" />
<?php
}
?>
<div>&nbsp</div>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo config('OSPOS')->settings['company'] ?></div>
<div id="company_name"><?php echo $config['company'] ?></div>
<?php
}
?>
@@ -253,11 +253,11 @@ $(document).ready(function()
<div id="terms">
<div id="sale_return_policy">
<h5>
<span><?php echo nl2br(esc(config('OSPOS')->settings['payment_message'])) ?></span>
<span><?php echo nl2br(esc($config['payment_message'])) ?></span>
<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . ': ' . esc($comments) ?></span>
<span style='padding:4%;'><?php echo esc(config('OSPOS')->settings['invoice_default_comments']) ?></span>
<span style='padding:4%;'><?php echo esc($config['invoice_default_comments']) ?></span>
</h5>
<div style='padding:2%;'><?php echo nl2br(esc(config('OSPOS')->settings['return_policy'])) ?></div>
<div style='padding:2%;'><?php echo nl2br(esc($config['return_policy'])) ?></div>
</div>
<div id='barcode'>
<img alt='<?php echo esc($barcode, 'attr') ?>' style='padding-top:4%;' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
@@ -272,7 +272,7 @@ $(window).on("load", function()
// install firefox addon in order to use this plugin
if(window.jsPrintSetup)
{
<?php if(!config('OSPOS')->settings['print_header'])
<?php if(!$config['print_header'])
{
?>
// set page header
@@ -282,7 +282,7 @@ $(window).on("load", function()
<?php
}
if(!config('OSPOS')->settings['print_footer'])
if(!$config['print_footer'])
{
?>
// set empty page footer

View File

@@ -40,10 +40,10 @@ if(isset($error_message))
<table id="info">
<tr>
<td id="logo">
<?php if(config('OSPOS')->settings['company_logo'] != '')
<?php if($config['company_logo'] != '')
{
?>
<img id="image" src="data:<?php echo esc($mimetype) ?>;base64,<?php echo base64_encode(file_get_contents('uploads/' . esc(config('OSPOS')->settings['company_logo']))) ?>" alt="company_logo" />
<img id="image" src="data:<?php echo esc($mimetype) ?>;base64,<?php echo base64_encode(file_get_contents('uploads/' . esc($config['company_logo']))) ?>" alt="company_logo" />
<?php
}
?>
@@ -52,7 +52,7 @@ if(isset($error_message))
</tr>
<tr>
<td id="company-title" id="company">
<?php echo esc(config('OSPOS')->settings['company']) ?><br/>
<?php echo esc($config['company']) ?><br/>
<?php echo nl2br(esc($company_info)) ?>
</td>
<td id="meta">
@@ -201,10 +201,10 @@ if(isset($error_message))
<div id="terms">
<div id="sale_return_policy">
<h5>
<span><?php echo nl2br(config('OSPOS')->settings['payment_message']) ?></span>
<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? config('OSPOS')->settings['invoice_default_comments'] : $comments) ?></span>
<span><?php echo nl2br($config['payment_message']) ?></span>
<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? $config['invoice_default_comments'] : $comments) ?></span>
</h5>
<?php echo nl2br(config('OSPOS')->settings['return_policy']) ?>
<?php echo nl2br($config['return_policy']) ?>
</div>
<div id='barcode'>
<img alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>

View File

@@ -36,7 +36,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name),'url') ?>',
headers: <?php echo esc($table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'sale_id',
onLoadSuccess: function(response) {
if($("#table tbody tr").length > 1) {

View File

@@ -75,19 +75,19 @@ if (isset($error_message))
<div id="logo">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->settings['company_logo'], 'url')) ?>" alt="company_logo" />
<img id="image" src="<?php echo base_url('uploads/' . esc($config['company_logo'], 'url')) ?>" alt="company_logo" />
<?php
}
?>
<div>&nbsp</div>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name"><?php echo esc($config['company']) ?></div>
<?php
}
?>
@@ -215,7 +215,7 @@ if (isset($error_message))
<div id="sale_return_policy">
<h5>
<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . ': ' . esc($comments) ?></span>
<span style='padding:4%;'><?php echo esc(config('OSPOS')->settings['quote_default_comments']) ?></span>
<span style='padding:4%;'><?php echo esc($config['quote_default_comments']) ?></span>
</h5>
</div>
</div>
@@ -228,7 +228,7 @@ if (isset($error_message))
if (window.jsPrintSetup)
{
<?php
if(!config('OSPOS')->settings['print_header'])
if(!$config['print_header'])
{
?>
// set page header
@@ -238,7 +238,7 @@ if (isset($error_message))
<?php
}
if(!config('OSPOS')->settings['print_footer'])
if(!$config['print_footer'])
{
?>
// set empty page footer

View File

@@ -34,10 +34,10 @@
<table id="info">
<tr>
<td id="logo">
<?php if(config('OSPOS')->settings['company_logo'] != '')
<?php if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo 'uploads/' . esc(config('OSPOS')->settings['company_logo'],'url') ?>" alt="company_logo" />
<img id="image" src="<?php echo 'uploads/' . esc($config['company_logo'],'url') ?>" alt="company_logo" />
<?php
}
?>
@@ -49,7 +49,7 @@
<tr>
<td id="company-title">
<div id="company">
<?php echo esc(config('OSPOS')->settings['company']) ?>
<?php echo esc($config['company']) ?>
<?php echo nl2br(esc($company_info)) ?>
</div>
</td>
@@ -154,10 +154,10 @@
<div id="terms">
<div id="sale_return_policy">
<h5>
<span><?php echo nl2br(esc(config('OSPOS')->settings['payment_message'])) ?></span>
<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? config('OSPOS')->settings['quote_default_comments'] : esc($comments)) ?></span>
<span><?php echo nl2br(esc($config['payment_message'])) ?></span>
<span><?php echo lang('Sales.comments') . ': ' . (empty($comments) ? $config['quote_default_comments'] : esc($comments)) ?></span>
</h5>
<?php echo nl2br(esc(config('OSPOS')->settings['return_policy'])) ?>
<?php echo nl2br(esc($config['return_policy'])) ?>
</div>
<div id='barcode'>
<?php echo $quote_number ?>

View File

@@ -55,6 +55,6 @@ if (isset($error_message))
<?php endif; ?>
</div>
<?php echo view('sales/' . config('OSPOS')->settings['receipt_template']) ?>
<?php echo view('sales/' . $config['receipt_template']) ?>
<?php echo view('partial/footer') ?>

View File

@@ -16,30 +16,30 @@
*/
?>
<div id="receipt_wrapper" style="font-size:<?php echo config('OSPOS')->settings['receipt_font_size'] ?>px">
<div id="receipt_wrapper" style="font-size:<?php echo $config['receipt_font_size'] ?>px">
<div id="receipt_header">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<div id="company_name">
<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->settings['company_logo'], 'url')) ?>" alt="company_logo" />
<img id="image" src="<?php echo base_url('uploads/' . esc($config['company_logo'], 'url')) ?>" alt="company_logo" />
</div>
<?php
}
?>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo config('OSPOS')->settings['company'] ?></div>
<div id="company_name"><?php echo $config['company'] ?></div>
<?php
}
?>
<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->settings['address'])) ?></div>
<div id="company_phone"><?php echo esc(config('OSPOS')->settings['phone']) ?></div>
<div id="company_address"><?php echo nl2br(esc($config['address'])) ?></div>
<div id="company_phone"><?php echo esc($config['phone']) ?></div>
<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
<div id="sale_time"><?php echo($transaction_time) ?></div>
</div>
@@ -75,7 +75,7 @@
<th style="width:20%;"><?php echo lang('Sales.quantity') ?></th>
<th style="width:20%;" class="total-value"><?php echo lang('Sales.total') ?></th>
<?php
if(config('OSPOS')->settings['receipt_show_tax_ind'])
if($config['receipt_show_tax_ind'])
{
?>
<th style="width:20%;"></th>
@@ -93,9 +93,9 @@
<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
<td><?php echo to_currency($item['price']) ?></td>
<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
<td class="total-value"><?php echo to_currency($item[(config('OSPOS')->settings['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
<td class="total-value"><?php echo to_currency($item[($config['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
<?php
if(config('OSPOS')->settings['receipt_show_tax_ind'])
if($config['receipt_show_tax_ind'])
{
?>
<td><?php echo $item['taxed_flag'] ?></td>
@@ -105,14 +105,14 @@
</tr>
<tr>
<?php
if(config('OSPOS')->settings['receipt_show_description'])
if($config['receipt_show_description'])
{
?>
<td colspan="2"><?php echo esc($item['description']) ?></td>
<?php
}
if(config('OSPOS')->settings['receipt_show_serialnumber'])
if($config['receipt_show_serialnumber'])
{
?>
<td><?php echo esc($item['serialnumber']) ?></td>
@@ -148,7 +148,7 @@
?>
<?php
if(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)
if($config['receipt_show_total_discount'] && $discount > 0)
{
?>
<tr>
@@ -164,7 +164,7 @@
?>
<?php
if(config('OSPOS')->settings['receipt_show_taxes'])
if($config['receipt_show_taxes'])
{
?>
<tr>
@@ -189,7 +189,7 @@
<tr>
</tr>
<?php $border = (!config('OSPOS')->settings['receipt_show_taxes'] && !(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)); ?>
<?php $border = (!$config['receipt_show_taxes'] && !($config['receipt_show_total_discount'] && $discount > 0)); ?>
<tr>
<td colspan="3" style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo lang('Sales.total') ?></td>
<td style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo to_currency($total) ?></td>
@@ -238,7 +238,7 @@
</table>
<div id="sale_return_policy">
<?php echo nl2br(config('OSPOS')->settings['return_policy']) ?>
<?php echo nl2br($config['return_policy']) ?>
</div>
<div id="barcode">

View File

@@ -16,27 +16,27 @@
<div id="receipt_wrapper" style="width:100%;">
<div id="receipt_header" style="text-align:center;">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<div id="company_name">
<img id="image" src="data:image/png;base64,<?php echo base64_encode(file_get_contents('uploads/' . config('OSPOS')->settings['company_logo'])) ?>" alt="company_logo" />
<img id="image" src="data:image/png;base64,<?php echo base64_encode(file_get_contents('uploads/' . $config['company_logo'])) ?>" alt="company_logo" />
</div>
<?php
}
?>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name" style="font-size:150%; font-weight:bold;"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name" style="font-size:150%; font-weight:bold;"><?php echo esc($config['company']) ?></div>
<?php
}
?>
<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->settings['address'])) ?></div>
<div id="company_phone"><?php echo esc(config('OSPOS')->settings['phone']) ?></div>
<div id="company_address"><?php echo nl2br(esc($config['address'])) ?></div>
<div id="company_phone"><?php echo esc($config['phone']) ?></div>
<br>
<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
<div id="sale_time"><?php echo esc($transaction_time) ?></div>
@@ -77,18 +77,18 @@
<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
<td><?php echo to_currency($item['price']) ?></td>
<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
<td style="text-align:right;"><?php echo to_currency($item[(config('OSPOS')->settings['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
<td style="text-align:right;"><?php echo to_currency($item[($config['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
</tr>
<tr>
<?php
if(config('OSPOS')->settings['receipt_show_description'])
if($config['receipt_show_description'])
{
?>
<td colspan="2"><?php echo esc($item['description']) ?></td>
<?php
}
if(config('OSPOS')->settings['receipt_show_serialnumber'])
if($config['receipt_show_serialnumber'])
{
?>
<td><?php echo esc($item['serialnumber']) ?></td>
@@ -122,7 +122,7 @@
}
}
if(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)
if($config['receipt_show_total_discount'] && $discount > 0)
{
?>
<tr>
@@ -138,7 +138,7 @@
?>
<?php
if(config('OSPOS')->settings['receipt_show_taxes'])
if($config['receipt_show_taxes'])
{
?>
<tr>
@@ -163,7 +163,7 @@
<tr>
</tr>
<?php $border = (!config('OSPOS')->settings['receipt_show_taxes'] && !(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)) ?>
<?php $border = (!$config['receipt_show_taxes'] && !($config['receipt_show_total_discount'] && $discount > 0)) ?>
<tr>
<td colspan="3" style="<?php echo $border ? 'border-top: 2px solid black;' : '' ?>text-align:right;"><?php echo lang('Sales.total') ?></td>
<td style="<?php echo $border ? 'border-top: 2px solid black;' : '' ?>text-align:right"><?php echo to_currency($total) ?></td>
@@ -216,7 +216,7 @@
</table>
<div id="sale_return_policy" style="text-align:center">
<?php echo nl2br(esc(config('OSPOS')->settings['return_policy'])) ?>
<?php echo nl2br(esc($config['return_policy'])) ?>
</div>
<br>

View File

@@ -13,30 +13,30 @@
* @var string $barcode
*/
?>
<div id="receipt_wrapper" style="font-size:<?php echo esc(config('OSPOS')->settings['receipt_font_size']) ?>px">
<div id="receipt_wrapper" style="font-size:<?php echo esc($config['receipt_font_size']) ?>px">
<div id="receipt_header">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<div id="company_name">
<img id="image" src="<?php echo base_url('uploads/' . esc(config('OSPOS')->settings['company_logo'], 'url')) ?>" alt="company_logo" />
<img id="image" src="<?php echo base_url('uploads/' . esc($config['company_logo'], 'url')) ?>" alt="company_logo" />
</div>
<?php
}
?>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name"><?php echo esc($config['company']) ?></div>
<?php
}
?>
<div id="company_address"><?php echo nl2br(esc(config('OSPOS')->settings['address'])) ?></div>
<div id="company_phone"><?php echo esc(config('OSPOS')->settings['phone']) ?></div>
<div id="company_address"><?php echo nl2br(esc($config['address'])) ?></div>
<div id="company_phone"><?php echo esc($config['phone']) ?></div>
<div id="sale_receipt"><?php echo lang('Sales.receipt') ?></div>
<div id="sale_time"><?php echo esc($transaction_time) ?></div>
</div>
@@ -78,11 +78,11 @@
<tr>
<td><?php echo esc(ucfirst($item['name'] . ' ' . $item['attribute_values'])) ?></td>
<td><?php echo to_quantity_decimals($item['quantity']) ?></td>
<td class="total-value"><?php echo to_currency($item[(config('OSPOS')->settings['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
<td class="total-value"><?php echo to_currency($item[($config['receipt_show_total_discount'] ? 'total' : 'discounted_total')]) ?></td>
</tr>
<tr>
<?php
if(config('OSPOS')->settings['receipt_show_description'])
if($config['receipt_show_description'])
{
?>
<td colspan="2"><?php echo esc($item['description']) ?></td>
@@ -90,7 +90,7 @@
}
?>
<?php
if(config('OSPOS')->settings['receipt_show_serialnumber'])
if($config['receipt_show_serialnumber'])
{
?>
<td><?php echo esc($item['serialnumber']) ?></td>
@@ -128,7 +128,7 @@
?>
<?php
if(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)
if($config['receipt_show_total_discount'] && $discount > 0)
{
?>
<tr>
@@ -144,7 +144,7 @@
?>
<?php
if(config('OSPOS')->settings['receipt_show_taxes'])
if($config['receipt_show_taxes'])
{
?>
<tr>
@@ -169,7 +169,7 @@
<tr>
</tr>
<?php $border = (!config('OSPOS')->settings['receipt_show_taxes'] && !(config('OSPOS')->settings['receipt_show_total_discount'] && $discount > 0)); ?>
<?php $border = (!$config['receipt_show_taxes'] && !($config['receipt_show_total_discount'] && $discount > 0)); ?>
<tr>
<td colspan="2" style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo lang('Sales.total') ?></td>
<td style="text-align:right;<?php echo $border ? 'border-top: 2px solid black;' : '' ?>"><?php echo to_currency($total) ?></td>
@@ -211,7 +211,7 @@
</table>
<div id="sale_return_policy">
<?php echo nl2br(esc(config('OSPOS')->settings['return_policy'])) ?>
<?php echo nl2br(esc($config['return_policy'])) ?>
</div>
<div id="barcode">

View File

@@ -73,7 +73,7 @@ if(isset($success))
<?php echo form_dropdown('mode', esc($modes), esc($mode), ['onchange' => "$('#mode_form').submit();", 'class' => 'selectpicker show-menu-arrow', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
</li>
<?php
if(config('OSPOS')->settings['dinner_table_enable'] == TRUE)
if($config['dinner_table_enable'] == TRUE)
{
?>
<li class="pull-left first_li">
@@ -240,7 +240,7 @@ if(isset($success))
<div class="input-group">
<?php echo form_input (['name' => 'discount', 'class' => 'form-control input-sm', 'value' => $item['discount_type'] ? to_currency_no_money($item['discount']) : to_decimals($item['discount']), 'tabindex' => ++$tabindex, 'onClick' => 'this.select();']) ?>
<span class="input-group-btn">
<?php echo form_checkbox (['id' => 'discount_toggle', 'name' => 'discount_toggle', 'value' => 1, 'data-toggle' => "toggle",'data-size' => 'small', 'data-onstyle' => 'success', 'data-on' => '<b>' . config('OSPOS')->settings['currency_symbol'] . '</b>', 'data-off' => '<b>%</b>', 'data-line' => esc($line), 'checked' => $item['discount_type']]) ?>
<?php echo form_checkbox (['id' => 'discount_toggle', 'name' => 'discount_toggle', 'value' => 1, 'data-toggle' => "toggle",'data-size' => 'small', 'data-onstyle' => 'success', 'data-on' => '<b>' . $config['currency_symbol'] . '</b>', 'data-off' => '<b>%</b>', 'data-line' => esc($line), 'checked' => $item['discount_type']]) ?>
</span>
</div>
</td>
@@ -391,7 +391,7 @@ if(isset($success))
<th style="width: 55%;"><?php echo lang('Sales.customer_discount') ?></th>
<th style="width: 45%; text-align: right;"><?php echo ($customer_discount_type == FIXED) ? to_currency($customer_discount) : $customer_discount . '%' ?></th>
</tr>
<?php if(config('OSPOS')->settings['customer_reward_enable'] == TRUE): ?>
<?php if($config['customer_reward_enable'] == TRUE): ?>
<?php
if(!empty($customer_rewards))
{
@@ -678,7 +678,7 @@ if(isset($success))
</div>
</div>
<?php
if(($mode == 'sale_invoice') && config('OSPOS')->settings['invoice_enable'] == TRUE)
if(($mode == 'sale_invoice') && $config['invoice_enable'] == TRUE)
{
?>
<div class="row">
@@ -849,7 +849,7 @@ $(document).ready(function()
});
<?php
if(config('OSPOS')->settings['invoice_enable'] == TRUE)
if($config['invoice_enable'] == TRUE)
{
?>
$('#sales_invoice_number').keyup(function() {

View File

@@ -22,7 +22,7 @@ use App\Models\Customer;
<th><?php echo lang('Sales.suspended_doc_id') ?></th>
<th><?php echo lang('Sales.date') ?></th>
<?php
if(config('OSPOS')->settings['dinner_table_enable'] == TRUE)
if($config['dinner_table_enable'] == TRUE)
{
?>
<th><?php echo lang('Sales.table') ?></th>
@@ -42,9 +42,9 @@ use App\Models\Customer;
?>
<tr>
<td><?php echo $suspended_sale['doc_id'] ?></td>
<td><?php echo date(config('OSPOS')->settings['dateformat'], strtotime($suspended_sale['sale_time'])) ?></td>
<td><?php echo date($config['dateformat'], strtotime($suspended_sale['sale_time'])) ?></td>
<?php
if(config('OSPOS')->settings['dinner_table_enable'] == TRUE)
if($config['dinner_table_enable'] == TRUE)
{
?>
<td><?php echo esc($this->Dinner_table->get_name($suspended_sale['dinner_table_id'])) ?></td>

View File

@@ -79,19 +79,19 @@ $(document).ready(function()
<div id="logo">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo esc(base_url('uploads/' . config('OSPOS')->settings['company_logo']), 'url') ?>" alt="company_logo" />
<img id="image" src="<?php echo esc(base_url('uploads/' . $config['company_logo']), 'url') ?>" alt="company_logo" />
<?php
}
?>
<div>&nbsp</div>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name"><?php echo esc($config['company']) ?></div>
<?php
}
?>
@@ -255,11 +255,11 @@ $(document).ready(function()
<div id="terms">
<div id="sale_return_policy">
<h5>
<span><?php echo nl2br(config('OSPOS')->settings['payment_message']) ?></span>
<span><?php echo nl2br($config['payment_message']) ?></span>
<span style='padding:4%;'><?php echo empty($comments) ? '' : lang('Sales.comments') . esc(": $comments") ?></span>
<span style='padding:4%;'><?php echo esc(config('OSPOS')->settings['invoice_default_comments']) ?></span>
<span style='padding:4%;'><?php echo esc($config['invoice_default_comments']) ?></span>
</h5>
<div style='padding:2%;'><?php echo nl2br(esc(config('OSPOS')->settings['return_policy'])) ?></div>
<div style='padding:2%;'><?php echo nl2br(esc($config['return_policy'])) ?></div>
</div>
<div id='barcode'>
<img style='padding-top:4%;' alt='<?php echo esc($barcode, 'attr') ?>' src='data:image/png;base64,<?php echo esc($barcode, 'attr') ?>' /><br>
@@ -274,7 +274,7 @@ $(window).on("load", function()
// install firefox addon in order to use this plugin
if(window.jsPrintSetup)
{
<?php if(!config('OSPOS')->settings['print_header'])
<?php if(!$config['print_header'])
{
?>
// set page header
@@ -284,7 +284,7 @@ $(window).on("load", function()
<?php
}
if(!config('OSPOS')->settings['print_footer'])
if(!$config['print_footer'])
{
?>
// set empty page footer

View File

@@ -77,19 +77,19 @@ if(isset($error_message))
<div id="logo">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo base_url('uploads/' . config('OSPOS')->settings['company_logo']) ?>" alt="company_logo" />
<img id="image" src="<?php echo base_url('uploads/' . $config['company_logo']) ?>" alt="company_logo" />
<?php
}
?>
<div>&nbsp</div>
<?php
if(config('OSPOS')->settings['receipt_show_company_name'])
if($config['receipt_show_company_name'])
{
?>
<div id="company_name"><?php echo esc(config('OSPOS')->settings['company']) ?></div>
<div id="company_name"><?php echo esc($config['company']) ?></div>
<?php
}
?>
@@ -219,7 +219,7 @@ if(isset($error_message))
// install firefox addon in order to use this plugin
if(window.jsPrintSetup)
{
<?php if(!config('OSPOS')->settings['print_header'])
<?php if(!$config['print_header'])
{
?>
// set page header
@@ -229,7 +229,7 @@ if(isset($error_message))
<?php
}
if(!config('OSPOS')->settings['print_footer'])
if(!$config['print_footer'])
{
?>
// set empty page footer

View File

@@ -33,10 +33,10 @@
<tr>
<td id="logo">
<?php
if(config('OSPOS')->settings['company_logo'] != '')
if($config['company_logo'] != '')
{
?>
<img id="image" src="<?php echo esc('uploads/' . config('OSPOS')->settings['company_logo'], 'url') ?>" alt="company_logo" />
<img id="image" src="<?php echo esc('uploads/' . $config['company_logo'], 'url') ?>" alt="company_logo" />
<?php
}
?>
@@ -47,7 +47,7 @@
</tr>
<tr>
<td id="company-title">
<pre><?php echo esc(config('OSPOS')->settings['company']) ?></pre>
<pre><?php echo esc($config['company']) ?></pre>
<pre><?php echo esc($company_info) ?></pre>
</td>
<td id="meta">

View File

@@ -11,7 +11,7 @@ $(document).ready(function()
table_support.init({
resource: '<?php echo esc(site_url($controller_name), 'url') ?>',
headers: <?php echo esc($tax_rate_table_headers, 'js') ?>,
pageSize: <?php echo config('OSPOS')->settings['lines_per_page'] ?>,
pageSize: <?php echo $config['lines_per_page'] ?>,
uniqueId: 'tax_rate_id'
});
});