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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2017-12-15 15:18:25 +06:30
parent 9a6c5fda13 0ff76ca98a
commit 60a58bc948
8 changed files with 75 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,11 +389,11 @@
}else{
$(this).off("click");
var sale_id = $('#sale_id').text();
var item_row = $('.is_card');
// var item_row = $('.is_card');
if (item_row.length < 1) {
// if (item_row.length < 1) {
calculate_member_discount(sale_id);
}
// }
// payment
var cash = $('#cash').text();
@@ -517,15 +517,20 @@
var sub_total = $('#sub-total').text();
var member_id = $('#membership_id').text();
var member_discount = $('#member_discount').text();
var item_row = $('.is_card');
if (member_id && member_discount) {
if (item_row.length < 1) {
is_card = false
}else{
is_card = true
}
$.ajax({
type: "POST",
url: "/origami/" + sale_id + "/member_discount",
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
async: false,
success:function(result){
}
});
}