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"
             }
           }
-          } 
+       } 
     });
   });
 

app/assets/stylesheets/origami.scss

@@ -314,7 +314,7 @@ tr.discount-item-row:hover {
 	position: relative;
 	left: 42%;
 	top: 30%;
-	background-color: #d9534f;	
+	background-color: #32ad1a;	
 	color: #fff;
 	text-align: center;
     width: 200px;
@@ -396,3 +396,27 @@ i.logout_icon{
 	color: #fff !important;
 	background-color: #5DADE2 !important;
 }
+
+/* Start Is Member Modal */
+#is_memberModal .modal-body {
+	height: 200px !important;
+}
+
+#is_memberModal .btn {
+	width: 80%;
+}
+/* End Is Member Modal */
+
+/* Start iframe */
+iframe {
+	border: none;
+	overflow: hidden !important;
+	width: 400px;
+	height: 550px;
+}
+
+#pdfModal .btn {
+	width: 150%;
+	height: 100%;
+}
+/* End iframe */