mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-01 21:21:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add show taxes checkbox value (state was not persisted)

Browse Source 
Disable printing options when unchecking print after sale
This commit is contained in:
jekkos-t520
2015-02-17 22:58:10 +01:00
parent aa969273db
commit 13f6640576
2 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
application/views/configs/receipt_config.php
View File

@@ -11,11 +11,11 @@ echo form_open('config/save_receipt/',array('id'=>'receipt_config_form'));
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_receipt_show_taxes').':', 'config_receipt_show_taxes',array('class'=>'wide')); ?>
<div class='form_field'>
<?php
echo form_checkbox(array(
'name'=>'receipt_show_taxes',
'id'=>'receipt_show_taxes',
'checked'=>$this->config->item('receipt_show_taxes')));?>
<?php echo form_checkbox(array(
'name'=>'receipt_show_taxes',
'value'=>'receipt_show_taxes',
'id'=>'receipt_show_taxes',
'checked'=>$this->config->item('receipt_show_taxes')));?>
</div>
</div>
@@ -76,56 +76,56 @@ echo form_open('config/save_receipt/',array('id'=>'receipt_config_form'));
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_print_top_margin').':', 'print_top_margin',array('class'=>'wide required')); ?>
<div class='form_field'>
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_top_margin',
'id'=>'print_top_margin',
'value'=>$this->config->item('print_top_margin')));?>
px
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_top_margin',
'id'=>'print_top_margin',
'value'=>$this->config->item('print_top_margin')));?>
px
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_print_left_margin').':', 'print_left_margin',array('class'=>'wide required')); ?>
<div class='form_field'>
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_left_margin',
'id'=>'print_left_margin',
'value'=>$this->config->item('print_left_margin')));?>
px
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_left_margin',
'id'=>'print_left_margin',
'value'=>$this->config->item('print_left_margin')));?>
px
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_print_bottom_margin').':', 'print_bottom_margin',array('class'=>'wide required')); ?>
<div class='form_field'>
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_bottom_margin',
'id'=>'print_bottom_margin',
'value'=>$this->config->item('print_bottom_margin')));?>
px
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_bottom_margin',
'id'=>'print_bottom_margin',
'value'=>$this->config->item('print_bottom_margin')));?>
px
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('config_print_right_margin').':', 'print_right_margin',array('class'=>'wide required')); ?>
<div class='form_field'>
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_right_margin',
'id'=>'print_right_margin',
'value'=>$this->config->item('print_right_margin')));?>
px
<?php echo form_input(array(
'type'=>'number',
'min'=>'0',
'max'=>'20',
'name'=>'print_right_margin',
'id'=>'print_right_margin',
'value'=>$this->config->item('print_right_margin')));?>
px
</div>
</div>
@@ -149,14 +149,18 @@ echo form_close();
//validation and submit handling
$(document).ready(function()
{
var printers = window.jsPrintSetup ? jsPrintSetup.getPrintersList().split(',') : [];
var printers = (window.jsPrintSetup && jsPrintSetup.getPrintersList() && jsPrintSetup.getPrintersList().split(',')) || [];
$.each(printers, function(key, value)
{
$('#receipt_printer').append($('<option>', { value : value }).text(value));
});
$("input[id*='margin'], #print_footer, #print_header, #receipt_printer, #print_silently").prop('disabled', !window.jsPrintSetup);
$('#receipt_printer option[value="<?php echo $this->config->item('receipt_printer'); ?>"]').attr('selected', 'selected');
var print_after_sale = $("#print_after_sale").is(":checked");
$("#print_after_sale").change(function()
{
$("input[id*='margin'], #print_footer, #print_header, #receipt_printer, #print_silently").prop('disabled', !$(this).is(":checked"));
});
$("input[id*='margin'], #print_footer, #print_header, #receipt_printer, #print_silently").prop('disabled', !window.jsPrintSetup || !print_after_sale);
$('#receipt_printer option[value="<?php echo $this->config->item('receipt_printer'); ?>"]').prop('selected', true);
var dialog_confirmed = window.jsPrintSetup;
$.validator.addMethod("addon_installed", function(value, element)
@@ -238,4 +242,4 @@ $(document).ready(function()
}
});
});
</script>
</script>

4
application/views/sales/receipt.php
View File

@@ -39,7 +39,7 @@ $(window).load(function()
var printers = jsPrintSetup.getPrintersList().split(',');
// get right printer here..
for(var index in printers) {
var default_ticket_printer = '<?=$this->Appconfig->get('receipt_printer')?>';
var default_ticket_printer = '<? echo $this->Appconfig->get('receipt_printer')?>';
var selected_printer = printers[index];
if (selected_printer == default_ticket_printer) {
// select epson label printer
@@ -158,7 +158,7 @@ if (isset($error_message))
<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_sub_total'); ?></td>
<td style='text-align:right;border-top:2px solid #000000;'><?php echo to_currency($subtotal); ?></td>
</tr>
<?php if ($this->Appconfig->get('receipt_show_taxes') == ''): ?>
<?php if (!$this->Appconfig->get('receipt_show_taxes')): ?>
<?php foreach($taxes as $name=>$value) { ?>
<tr>
<td colspan="3" style='text-align:right;'><?php echo $name; ?>:</td>