mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-24 17:18:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix totals calculation in receivings module

Browse Source
This commit is contained in:
jekkos-t520 committed 2014-10-20 18:31:33 +02:00
1 parent 31877528b1
commit 08dcd9e384
2 files changed
+1 -126
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/libraries/Receiving_lib.php
+1 -1
View File
@@ -354,7 +354,7 @@ class Receiving_lib
$total = 0;
foreach($this->get_cart() as $item)
{
$total =+ $this->get_item_total($item['quantity'], $item['price'], $item['discount']);
$total += $this->get_item_total($item['quantity'], $item['price'], $item['discount']);
}
return $total;
application/views/sales/edit.php
-125
View File
@@ -1,125 +0,0 @@
<?php $this->load->view("partial/header"); ?>
<div id="edit_sale_wrapper">
<h1><?php echo $this->lang->line('sales_edit_sale'); ?> POS <?php echo $sale_info['sale_id']; ?></h1>
<?php echo form_open("sales/save/".$sale_info['sale_id'],array('id'=>'sales_edit_form')); ?>
<ul id="error_message_box"></ul>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('sales_receipt').':', 'customer'); ?>
<div class='form_field'>
<?php echo anchor('sales/receipt/'.$sale_info['sale_id'], 'POS '.$sale_info['sale_id'], array('target' => '_blank'));?>
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('sales_date').':', 'date'); ?>
<div class='form_field'>
<?php echo form_input(array('name'=>'date','value'=>date('m/d/Y', strtotime($sale_info['sale_time'])), 'id'=>'date'));?>
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('sales_customer').':', 'customer'); ?>
<div class='form_field'>
<?php echo form_input(array('name' => 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id'));?>
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('sales_employee').':', 'employee'); ?>
<div class='form_field'>
<?php echo form_dropdown('employee_id', $employees, $sale_info['employee_id'], 'id="employee_id"');?>
</div>
</div>
<div class="field_row clearfix">
<?php echo form_label($this->lang->line('sales_comment').':', 'comment'); ?>
<div class='form_field'>
<?php echo form_textarea(array('name'=>'comment','value'=>$sale_info['comment'],'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
</div>
</div>
<?php
echo form_submit(array(
'name'=>'submit',
'id'=>'submit',
'value'=>$this->lang->line('common_submit'),
'class'=>'submit_button float_left')
);
?>
</form>
<?php echo form_open("sales/delete/".$sale_info['sale_id'],array('id'=>'sales_delete_form')); ?>
<?php
echo form_submit(array(
'name'=>'submit',
'id'=>'submit',
'value'=>$this->lang->line('sales_delete_entire_sale'),
'class'=>'delete_button float_right')
);
?>
</form>
</div>
<div id="feedback_bar"></div>
<?php $this->load->view("partial/footer"); ?>
<script type="text/javascript" language="javascript">
$(document).ready(function()
{
$('#date').datePicker({startDate: '01/01/1970'});
$("#sales_delete_form").submit(function()
{
if (!confirm('<?php echo $this->lang->line("sales_delete_confirmation"); ?>'))
{
return false;
}
});
var formatItem = function(row) {
return [row[0], "|", row[1]].join("");
};
var autoCompleter = $("#customer_id").autocomplete('<?php echo site_url("sales/customer_search"); ?>', {
minChars:0,
delay:15,
max:100,
cacheLength: 1,
formatItem: formatItem,
formatResult : formatItem
});
$('#sales_edit_form').validate({
submitHandler:function(form)
{
var selectedCustomer = autoCompleter.val();
var selectedCustomerId = selectedCustomer.replace(/(\w)\|.*/, "$1");
selectedCustomerId && autoCompleter.val(selectedCustomerId);
$(form).ajaxSubmit({
success:function(response)
{
if(response.success)
{
set_feedback(response.message,'success_message',false);
autoCompleter.val(selectedCustomer);
}
else
{
set_feedback(response.message,'error_message',true);
}
},
dataType:'json'
});
},
errorLabelContainer: "#error_message_box",
wrapper: "li",
rules:
{
},
messages:
{
}
});
});
</script>