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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-04-30 15:37:43 +06:30
parent 027550121e ff4cdfa158
commit bf00eceba0
7 changed files with 548 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,7 +826,7 @@
$.ajax({
type: "POST",
url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':'cashier' },
async: false,
success:function(result){
}

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

@@ -530,7 +530,6 @@ var customer_name = "<%= @customer.name %>";
} else{
$("#credit_payment").show();
}
console.log(jQuery.inArray("Master", payment_type))
if(parseInt(jQuery.inArray("MPU", payment_type)) != -1 ||
parseInt(jQuery.inArray("VISA", payment_type)) != -1 ||
parseInt(jQuery.inArray("JCB", payment_type)) != -1 ||
@@ -1020,7 +1019,7 @@ console.log(jQuery.inArray("Master", payment_type))
$.ajax({
type: "POST",
url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card,'cashier_type':cashier_type },
async: false,
success:function(result){
}