git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change rounding adj: error

Browse Source
This commit is contained in:
phyusin
2018-05-04 14:59:15 +06:30
parent fcbd240e5e
commit 6eecd2bdb7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/origami/payments_controller.rb
View File

@@ -279,6 +279,9 @@ class Origami::PaymentsController < BaseOrigamiController
new_total = Sale.get_rounding_adjustment(saleObj.grand_total) new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
@rounding_adj = new_total-saleObj.grand_total @rounding_adj = new_total-saleObj.grand_total
saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj) saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj)
@sale_data.grand_total = new_total
@sale_data.old_grand_total = saleObj.grand_total
@sale_data.rounding_adjustment = @rounding_adj
else else
@rounding_adj = @sale_data.rounding_adjustment @rounding_adj = @sale_data.rounding_adjustment
end end

2
app/views/origami/sales/show.html.erb
View File

@@ -387,6 +387,6 @@ $('#re-print').click(function() {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
window.location.href = '/origami/'+ sale_id + "/reprint" window.location.href = '/origami/'+ sale_id + "/reprint"
return false; // return false;
}); });
</script> </script>