Merge branch 'r-1902001-01' into foodcourt

app/views/origami/customers/index.html.erb

@@ -9,7 +9,9 @@
     </span>
   </ul>
 </div> -->
-
+<div id="loading_wrapper" style="display:none;">
+  <div id="loading"></div>
+</div>
 
 <div class="row">
   <div class="col-lg-12 col-md-12 col-sm-12">
@@ -657,13 +659,14 @@
 
     swal({
       title: "Confirmation !",
-      text: 'Are You Sure to assign this customer' + customer + '!',
+      text: 'Are you sure to assign this customer' + customer + '!',
       showCancelButton: true,
       confirmButtonColor: "green",
       confirmButtonText: "Yes!",
       cancelButtonClass: 'btn btn-danger',
-      closeOnConfirm: false,
+      closeOnConfirm: true,
     }, function () {
+      $( "#loading_wrapper").show();
       $.ajax({
         type: "POST",
         url: "/origami/"+sale_id+"/"+cashier_type+"/customers/update_sale" ,