From 0c4a2e17612638c9f1d6d906fc471aea4dc48da1 Mon Sep 17 00:00:00 2001 From: yarzar_code Date: Mon, 10 Aug 2020 15:39:18 +0630 Subject: [PATCH] close on confirm changed --- app/assets/javascripts/foodcourt/addorder.js | 3 ++- app/views/foodcourt/payments/show.html.erb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/foodcourt/addorder.js b/app/assets/javascripts/foodcourt/addorder.js index cf23f214..4fa66ab0 100644 --- a/app/assets/javascripts/foodcourt/addorder.js +++ b/app/assets/javascripts/foodcourt/addorder.js @@ -123,8 +123,9 @@ function update_sale(membership_id, customer_id, customer_name, sale_id) { confirmButtonColor: "green", confirmButtonText: "Yes!", cancelButtonClass: 'btn btn-danger customer_assign_cancel', - closeOnConfirm: false, + closeOnConfirm: true, }, function () { + $("#oqs_loading_wrapper").show(); $.ajax({ type: "POST", url: "/foodcourt/"+sale_id+"/"+cashier_type+"/customers/update_sale" , diff --git a/app/views/foodcourt/payments/show.html.erb b/app/views/foodcourt/payments/show.html.erb index 56811bc7..d8a1d4b6 100755 --- a/app/views/foodcourt/payments/show.html.erb +++ b/app/views/foodcourt/payments/show.html.erb @@ -945,8 +945,9 @@ $(document).ready(function(){ confirmButtonColor: "green", confirmButtonText: "Yes!", cancelButtonClass: 'btn btn-danger', - closeOnConfirm: false, + closeOnConfirm: true, }, function () { + $("#loading_wrapper").show(); $.ajax({ type: "POST", url: "/foodcourt/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,