diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d7afc4db..842b236b 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -230,14 +230,14 @@ function setCommPorts(comPortLists) {
 }
 
 /** pay with CB bank **/
-function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no) {
+function pay_withBank(cmd_type, payment_type, bnk_bill_amount,sale_id,receipt_no,cashier_type) {
 	$("#loading_wrapper").show();
     var com_port = $("#com_port_name").val();
-    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port);
+    reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type);
 }
 
 //add req data to card_sale_trans table
-function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port) {
+function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, receipt_no, com_port,cashier_type) {
   var jobj = {"cmd_type" : cmd_type, "payment_type" : "CARD", "amt" : bnk_bill_amount, "sale_id" : sale_id, "inv_no" : receipt_no, "com_port" : com_port};
   $.ajax({
       type: "POST",
@@ -247,14 +247,14 @@ function reqCardSaleTrans(cmd_type, payment_type, bnk_bill_amount, sale_id, rece
       success: function(data) {
           if (data.status == "success"){
             card_sale_trans_id = data.card_sale_trans_id;
-            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port);
+            resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type);
           }
        }
     });
 }
 
 //add res data to card_sale_trans table
-function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port) {
+function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amount, sale_id, receipt_no,com_port,cashier_type) {
 
   var resMsg = "";
   var card_payment_type="";
@@ -281,7 +281,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
           dataType: "json",
           success: function(data) {
             if(data.status == "success"){
-                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port);
+                resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type);
             }
           }
         });
@@ -292,7 +292,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 }
 
 
-function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port) {
+function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type) {
 	$("#loading_wrapper").hide();
     var jobj = $.parseJSON(resMsg);
     if(jobj.STATUS == "Approved"){
@@ -309,7 +309,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 						closeOnCancel: false,
 						allowOutsideClick: false
          			}, function () {
-         				window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+         				window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment";
          			});
          		}
          	}
@@ -327,7 +327,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
 		  closeOnCancel: false,
 		  allowOutsideClick: false
 		}, function () {
-				window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/"+payment_type;
+				window.location.href = '/origami/sale/'+ sale_id +"/"+cashier_type + "/payment/others_payment/"+payment_type;
 			});
     }
 }
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 837c9f43..b6512146 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -214,7 +214,7 @@ $('#jcb_pay').on('click',function(){
 			// }
 	    //end member discount
 	    if(bank_integration == '1'){
-		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
+		    pay_withBank("SALE", "jcb", amount, sale_id, receipt_no,cashier_type);
 		}else{
 			$.ajax({type: "POST",
 	          url: "<%= origami_payment_jcb_path %>",
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index f5c8f06b..fa90de18 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -212,7 +212,7 @@
         // }
       //end member discount
       if(bank_integration == '1'){
-        pay_withBank("SALE", "master", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "master", amount, sale_id, receipt_no,cashier_type);
       }else{
         $.ajax({type: "POST",
           url: "<%= origami_payment_master_path %>",
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f40ce252..79e7bbe5 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -122,10 +122,11 @@
 	</div>
 </div>
 <script>
+	var cashier_type = "<%= @cashier_type %>";
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
-		var cashier_type = "<%= @cashier_type %>";
+		
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
 				$('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
@@ -217,7 +218,7 @@
 			// }
 	    //end member discount
 	    	if(bank_integration == '1'){
-	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
+	      		pay_withBank("SALE", "mpu", amount, sale_id, receipt_no,cashier_type);
 	      	}else{
 	      		$.ajax({type: "POST",
 		          url: "<%= origami_payment_mpu_path %>",
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 5dee20f1..e407cc46 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -216,7 +216,7 @@
       //end member discount
       var bank_integration = "<%= @bank_integration %>";
       if(bank_integration == '1'){
-        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no, cashier_type);
       }
       else{
         $.ajax({type: "POST",
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index 2970ba44..2824ef15 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -217,7 +217,7 @@
       //end member discount
       var bank_integration = "<%= @bank_integration %>";
       if(bank_integration == '1'){
-        pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
+        pay_withBank("SALE", "visa", amount, sale_id, receipt_no,cashier_type);
       }
       else{
         $.ajax({type: "POST",