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

add override sale tax for member discount

Browse Source
This commit is contained in:
phyusin
2018-05-30 10:20:36 +06:30
parent fee2a0431f
commit a9070ebe0d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/origami/payments/show.html.erb
View File

@@ -762,7 +762,7 @@ var customer_name = "<%= @customer.name %>";
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : '';
if (credit <= 0) {
calculate_member_discount(sale_id);
calculate_member_discount(sale_id,tax_type);
}
$("#pdfModal").on('shown.bs.modal', function () {
@@ -1049,7 +1049,7 @@ var customer_name = "<%= @customer.name %>";
});
}
function calculate_member_discount(sale_id) {
function calculate_member_discount(sale_id,tax_type) {
var sub_total = $('#sub-total').text();
var member_id = $('#membership_id').text();
var member_discount = $('#member_discount').text();
@@ -1064,7 +1064,7 @@ var customer_name = "<%= @customer.name %>";
$.ajax({
type: "POST",
url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':cashier_type },
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':cashier_type, 'tax_type':tax_type },
async: false,
success:function(result){
}