change ordr reservation api

2018-04-11 14:38:16 +06:30
parent 27e70f1a86
commit 9b2312d3ba
8 changed files with 269 additions and 68 deletions
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -336,8 +336,24 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
          }
        });
  }else{
+  	if(payment_type!="master"){
+		payment_type = payment_type.toUpperCase();
+	}else{
+		payment_type = "Master";
+	}
+	
  	$("#loading_wrapper").hide();
-    swal ( "Oops" ,  resMsg.toString() ,  "error" );
+    swal({
+		  title: 'Oops',
+		  text: resMsg.toString(),
+		  type: 'error',
+		  html: true,
+		  closeOnConfirm: false,
+		  closeOnCancel: false,
+		  allowOutsideClick: false
+		}, function () {
+		window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/"+payment_type;
+	});
  }
 }