SQA urgent issues

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

@@ -241,7 +241,7 @@ $('#cash_out').on('click',function(){
 
 $('#close_cashier').on('click',function(e){
     e.preventDefault(); // Prevent the href from redirecting directly
-    var linkURL = '/origami/shift/close';
+    var linkURL = '/origami/shift/cashier/close';
     warnBeforeRedirect(linkURL);
 })
 

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

@@ -34,7 +34,9 @@
             <i class="material-icons">reply</i>
              <%= t("views.btn.back") %>
           </button>
-			
+          <% if current_user.role != "waiter" %>
+            <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
+			    <% end %>
         </div>
     </div>
 </div>
@@ -51,4 +53,22 @@
     $('#back').on('click', function () {
         window.location.href = '/origami/quick_service';
     })
+
+    $('#close_cashier').on('click',function(e){
+      e.preventDefault(); // Prevent the href from redirecting directly
+      var linkURL = '/origami/shift/quick_service/close';
+      warnBeforeRedirect(linkURL);
+    });
+
+    function warnBeforeRedirect(linkURL) {
+      swal({
+        title: "Alert!", 
+        text: "Are you sure you want to close cashier?", 
+        type: "warning",
+        showCancelButton: true
+      }, function() {
+        // Redirect the user
+        window.location.href = linkURL;
+      });
+    }
 </script>

app/views/origami/pending_order/show.html.erb

@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
  <!-- Column One -->
- <div class="col-lg-6 col-md-6 col-sm-6">
+ <div class="col-lg-5 col-md-5 col-sm-5">
     <div class="card">
       <div class="card-header">
         <strong id="order-title"> PENDING ORDER </strong>
@@ -148,7 +148,7 @@
      </div>
   </div>
  <!-- Column Three -->
- <div class="col-lg-1 col-md-1 col-sm-1">
+ <div class="col-lg-2 col-md-2 col-sm-2">
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
    <% if current_user.role != "waiter" || @status != "sale"%>
    <button type="button" id="addorder" class="btn bg-blue btn-block">Add Order</button>
@@ -167,6 +167,9 @@
    <% if @status != "sale"%>
       <button type="button" id="request_bills" class="btn btn-block bg-blue waves-effect">Req.Bill</button>
    <%end%>
+   <% if current_user.role != "waiter" %>
+      <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
+   <% end %>
  </div>
 </div>
 </div>
@@ -203,12 +206,11 @@ $(document).ready(function(){
           url: ajax_url,
           // data: 'order_id='+ order_id,
           success: function (result) {
-            console.log(result)
               if (!result.status) {
                 swal("Information!", result.error_message);
               }
               else {              
-                window.location.href = '../pending_order/'+ result.data;
+                location.reload();
               }
           }
       });   
@@ -269,5 +271,23 @@ $(document).ready(function(){
     }
     return false;
   });
+
+  $('#close_cashier').on('click',function(e){
+    e.preventDefault(); // Prevent the href from redirecting directly
+    var linkURL = '/origami/shift/quick_service/close';
+    warnBeforeRedirect(linkURL);
+  });
+
+  function warnBeforeRedirect(linkURL) {
+    swal({
+      title: "Alert!", 
+      text: "Are you sure you want to close cashier?", 
+      type: "warning",
+      showCancelButton: true
+    }, function() {
+      // Redirect the user
+      window.location.href = linkURL;
+    });
+  }
 });
 </script>

app/views/origami/shifts/show.html.erb

@@ -58,6 +58,7 @@
   </div>
 </div>
 <script>
+  var type = '<%= @type %>';
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
@@ -72,7 +73,11 @@
   });
 
   $('#back').on('click',function(){
-    window.location.href = '/origami';
+    if(type!='quick_service'){
+      window.location.href = '/origami';
+    }else{
+      window.location.href = '/origami/quick_service';
+    }
   });
 
   /** start CB Card Settle process **/
@@ -90,7 +95,7 @@
         closeOnCancel: false,
         allowOutsideClick: false
       }, function () {
-        window.location.href = '/origami/shift/close';
+        window.location.href = '/origami/shift/'+type+'/close';
       });
     }
   });
@@ -115,7 +120,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/shift/close';
+          window.location.href = '/origami/shift/'+type+'/close';
         });
       }
   }