Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

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

@@ -246,8 +246,20 @@ $('#junction_pay').on('click',function(){
 			};
 
 			resError = function(err_message){
+				if(err_message != "ERROR: Verification cancelled"){
 					$("#loading_wrapper").hide();
-		    	swal ( "Oops" ,  err_message ,  "error" );
+		    		swal({
+	     				title: "Oops!",
+	     				text: err_message,
+	     				type: "error",
+	     				html: true,
+						closeOnConfirm: false,
+						closeOnCancel: false,
+						allowOutsideClick: false
+	     			}, function () {
+	     				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/others_payment";
+	     			});
+				}
 		    };
 		    // 	$("#loading_wrapper").hide();
 		    // 	$.ajax({type: "POST",