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

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

Browse Source
This commit is contained in:
Aung Myo
2018-04-19 10:17:29 +06:30
parent ed8e9836fe 458da62c66
commit 4837d27964
13 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,6 +632,8 @@ var customer_name = "<%= @customer.name %>";
if (credit <= 0) {
calculate_member_discount(sale_id);
}
$("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
$.ajax({type: "POST",
url: "<%= origami_payment_cash_path %>",
@@ -652,13 +654,14 @@ var customer_name = "<%= @customer.name %>";
var msg = '';
}
$("#loading_wrapper" ).hide();
$("#loading_wrapper" ).hide();
//PDF lightbox data
var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
$("#sale_receipt_no").val(result.receipt_no);
$("#filename").val(result.filename);
$("#printer_name").val(result.printer_name);
$("#receipt_pdf").attr("src", result.filename.substring(6));
$("#receipt_pdf").attr("src", pdfPath);
$("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
$("#pdfModalLabel").text("Sale Completed");
$("#changed_amount").text("");

3
app/views/settings/menus/index.html.erb
View File

@@ -115,7 +115,8 @@
url: "/settings/menus/" + menu_id + "/export",
success: function(result){
if(result.status){
swal("Success", "Export Success...", "success");
location.href = result.path.substring(6);
// swal("Success", "Export Success...", "success");
}
}
});