Pull from master

app/assets/javascripts/addorder.js

@@ -880,13 +880,24 @@ $(function() {
       dataType: "json",
        success:function(result){
           if (result.status) {
+            console.log(result)
             if (result.data == null){
-               window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+               swal({
+                  title: "Please Open Shift !",
+                  text: result.status,
+                  type: "warning",
+                  confirmButtonColor: "#DD6B55",
+                  confirmButtonText: "Ok",
+                  closeOnConfirm: false
+              }, function () {
+                  window.location.href = '/origami/quick_service/pending_order/' + $('#sale_id').text();
+              });
+
             }else{
             window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
             }
           }
-          } 
+       } 
     });
   });