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

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-07-09 09:44:36 +06:30
parent 794c4e9ed2 146f727f46
commit a60f80a874
35 changed files with 257 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -674,7 +674,7 @@ var pdf_view = '<%=@pdf_view%>';
payment_type = '';
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
// if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment");
// console.log(payment_type)
// console.log(parseInt(jQuery.inArray("MPU", payment_type)))
@@ -700,7 +700,7 @@ var pdf_view = '<%=@pdf_view%>';
$("#card_payment").hide();
}
}
}
// }
/* end check first bill or not*/
var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
@@ -792,8 +792,7 @@ var pdf_view = '<%=@pdf_view%>';
var credit = $('#credit').text();
var card = $('#card').text();
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : '';
var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
if (credit <= 0) {
calculate_member_discount(sale_id,tax_type);
}
@@ -1059,7 +1058,6 @@ var pdf_view = '<%=@pdf_view%>';
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