From 1d9164aaf0d267d2e4ef09763f898d3351b88c50 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 2 Feb 2018 18:03:43 +0630
Subject: [PATCH] update quick service for payment

---
 app/assets/javascripts/addorder.js            |  2 +-
 .../origami/addorders_controller.rb           |  3 --
 .../origami/credit_payments_controller.rb     |  1 +
 app/controllers/origami/jcb_controller.rb     |  2 +-
 app/controllers/origami/master_controller.rb  |  2 +-
 app/controllers/origami/mpu_controller.rb     |  2 +-
 .../origami/others_payments_controller.rb     |  1 +
 .../origami/payments_controller.rb            |  1 +
 .../origami/paypar_payments_controller.rb     |  1 +
 .../origami/redeem_payments_controller.rb     |  1 +
 .../origami/unionpay_controller.rb            |  4 +-
 app/controllers/origami/visa_controller.rb    |  2 +-
 .../origami/credit_payments/index.html.erb    |  5 ++-
 app/views/origami/home/show.html.erb          |  2 +-
 app/views/origami/jcb/index.html.erb          |  5 ++-
 app/views/origami/master/index.html.erb       |  5 ++-
 app/views/origami/mpu/index.html.erb          |  6 ++-
 .../origami/others_payments/index.html.erb    |  4 +-
 app/views/origami/payments/show.html.erb      | 38 +++++++++++++++----
 .../origami/redeem_payments/index.html.erb    |  3 +-
 app/views/origami/rooms/show.html.erb         |  2 +-
 app/views/origami/unionpay/index.html.erb     |  6 ++-
 app/views/origami/visa/index.html.erb         |  5 ++-
 config/routes.rb                              | 28 ++++++++------
 24 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 60bcbcc3..e330015a 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -797,7 +797,7 @@ $(function() {
        success:function(result){
         console.log(result)
           if (result.status) {
-            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/payment"
+            window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"
           }
            // window.location.href = "/origami/quick_service"
           } 
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index b601a0e6..a6e9c737 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -136,9 +136,6 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
         @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
         result = {:status=> @status, :data => @sale }
         render :json => result.to_json
-        puts @status
-        puts @sale.to_json
-        puts "ssssssssssssssssssss"
       end
   end
 
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index 404b1506..d70ef870 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -1,6 +1,7 @@
 class Origami::CreditPaymentsController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
 
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index b8c7e7e0..e17c773e 100755
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -2,7 +2,7 @@ class Origami::JcbController < BaseOrigamiController
 
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit jcb_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index b3813577..95710f11 100755
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -2,7 +2,7 @@ class Origami::MasterController < BaseOrigamiController
 
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit master_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index 7b7ef5a0..6eb2a0a0 100755
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -1,7 +1,7 @@
 class Origami::MpuController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit mpu_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total     = sale_data.grand_total
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 16c7edae..e4a39662 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   def index
   	@membership_rebate_balance = 0
   	@sale_id = params[:sale_id]
+  	@cashier_type   = params[:type]
   	@payment_method_setting = PaymentMethodSetting.all
 
   	@rebate = MembershipSetting.find_by_rebate(1)
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 6fa61bc7..0e3245ca 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -146,6 +146,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
   def show
     sale_id = params[:sale_id]
+    @cashier_type   = params[:type]
 
     @member_discount = MembershipSetting.find_by_discount(1)
     
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 5a15aa8c..4a4944ca 100755
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -1,6 +1,7 @@
 class Origami::PayparPaymentsController < BaseOrigamiController
 	def create
 		sale_id = params[:sale_id]
+		@cashier_type   = params[:type]
 		redeem_amount = params[:redeem_amount]
 		membership_id = params[:membership_id]
 		payment_method = "paypar"
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 2fdedf32..4b0c70f8 100755
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -2,6 +2,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  	def index
  		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
+        @cashier_type   = params[:type]
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb
index fc15b7f5..7f084fd4 100644
--- a/app/controllers/origami/unionpay_controller.rb
+++ b/app/controllers/origami/unionpay_controller.rb
@@ -1,7 +1,7 @@
 class Origami::UnionpayController < BaseOrigamiController
 	def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit unionpay_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
@@ -23,8 +23,6 @@ class Origami::UnionpayController < BaseOrigamiController
           others = others + sale_payment.payment_amount
         end
     end
-    puts "unionpaycount"
-    puts @unionpaycount
     @can_unionpay = total - @unionpaycount - others
     @member_discount = MembershipSetting.find_by_discount(1)
     @sub_total       = sale_data.total_amount
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index b872aec3..f04ec001 100755
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -1,7 +1,7 @@
 class Origami::VisaController < BaseOrigamiController
   def index
     @sale_id = params[:sale_id]
-
+    @cashier_type   = params[:type]
     # limit visa_amount
     sale_data = Sale.find_by_sale_id(@sale_id)
     total = sale_data.grand_total
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index 82e66d7e..827ae6d4 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -115,6 +115,7 @@
 </div>
 </div>
 </div>
+ <span id="cashier_type" class="hidden"><%=@cashier_type%></span>
 <script>
   $(document).ready(function() {
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
@@ -122,6 +123,7 @@
        $('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash")));
      }
    });
+  cashier_type = $('#cashier_type').text();
   $(document).on('click', '.cashier_number', function(event){
     event.stopPropagation();
     event.preventDefault();
@@ -165,6 +167,7 @@
     return false;
   }
 });
+
   $('#credit_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
@@ -184,7 +187,7 @@
               closeOnCancel: false,
               allowOutsideClick: false
             }, function () {
-              window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+              window.location.href = '/origami/sale/'+ sale_id  +"/"+ cashier_type  + "/payment";
             });            
           }
         }
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 8440f354..71666293 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -665,7 +665,7 @@
 
     $('#pay').on('click', function () {
         var sale_id = $('#sale_id').val();
-        window.location.href = '/origami/sale/' + sale_id + "/payment";
+        window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
     });
 
     // Bill Request
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index ada30a8b..945ac11c 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -119,6 +119,7 @@
 </div>
 </div>
 <script>
+var cashier_type = "<%= @cashier_type %>";  
 	$(document).ready(function() {
 		var sale_id = "<%= @sale_id %>";
 		var bank_integration = "<%= @bank_integration %>";
@@ -140,7 +141,7 @@
 				  closeOnCancel: false,
 				  allowOutsideClick: false
 				}, function () {
-					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+					window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
 				});
 			}
 		}
@@ -228,7 +229,7 @@ $('#jcb_pay').on('click',function(){
 	            closeOnCancel: false,
 	            allowOutsideClick: false
 	              }, function () {
-	                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+	                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
 	              });
 	            }
 	          }
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index f2f3756c..66d19bb5 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -120,6 +120,7 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function() {
       var sale_id = "<%= @sale_id %>";
       var bank_integration = "<%= @bank_integration %>";
@@ -141,7 +142,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
           }, function () {
-            window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+            window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
           });
         }
       }
@@ -226,7 +227,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 747049b9..2c00bf2e 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -125,6 +125,7 @@
 	$(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")));
@@ -143,7 +144,7 @@
 				  closeOnCancel: false,
 				  allowOutsideClick: false
 				}, function () {
-					window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+					window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment/others_payment";
 				});
 			}
 		}
@@ -198,6 +199,7 @@
 		var sale_id = "<%= @sale_id %>";
 		var receipt_no = "<%= @receipt_no %>";
 		var bank_integration = "<%= @bank_integration %>";
+		var cashier_type = "<%= @cashier_type %>";
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
@@ -230,7 +232,7 @@
 		            closeOnCancel: false,
 		            allowOutsideClick: false
 		              }, function () {
-		                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+		                window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+ "/payment";
 		              });
 		            }
 		          }
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index e8eebbac..7c22ad03 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	
 	<div class="row">
 		<div class="col-lg-11col-md-11 col-sm-11">
 			<div >
@@ -29,6 +28,7 @@
 <input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
 <script type="text/javascript">
 	/* start check first bill or not*/
+	var cashier_type = "<%= @cashier_type %>";
         var receipt_no = "";
         if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
           receipt_no = ($("#receipt_no").html()).trim();
@@ -47,7 +47,7 @@
 	$('.others-payment').on('click',function(){
 		var input_type = $(this).attr("data-type");
 		var sale_id = $(this).attr("data-sale-id");
-		window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/" + input_type;
+		window.location.href = '/origami/sale/'+ sale_id  +"/"+ cashier_type  + "/payment/others_payment/" + input_type;
 	})
 
 	$('#back').on('click',function(){
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 96f69da9..d73a7ed6 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -2,7 +2,6 @@
   <div id="loading_wrapper" style="display:none;">
     <div id="loading"></div>
   </div>
-
   <div class="row clearfix">
     <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
       <div class="card">
@@ -303,6 +302,7 @@
 </div>
 
 <script>
+var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
@@ -337,7 +337,12 @@
 
     $("#back").on('click', function() {
       localStorage.removeItem('cash');
-      window.location.href = '/origami/table/'+ dining_id;
+      if (cashier_type=="cashier") {
+        window.location.href = '/origami/table/'+ dining_id;
+      }else{
+        window.location.href = '/origami/quick_service';
+      }  
+      
     });
 
     if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
@@ -407,19 +412,20 @@
   });
 
   $( document ).ready(function() {
+     
     // Disable click event cash to prevent
     $(".payment .cash-color").off('click');
 
     $('#credit_payment').click(function() {
       var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"
+      window.location.href = '/origami/sale/'+ sale_id  +"/"+cashier_type+"/payment/credit_payment"
       return false;
     });
 
     $('#card_payment').click(function() {
       localStorage.setItem("cash",$('#cash').text() );
       var sale_id = $('#sale_id').text();
-      window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
+      window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment"
       return false;
     });
 
@@ -492,7 +498,11 @@
                     closeOnCancel: false,
                     allowOutsideClick: false
                   }, function () {
-                    window.location.href = '/origami';
+                    if (cashier_type=="cashier") {
+                      window.location.href = '/origami';
+                    }else{
+                      window.location.href = '/origami/quick_service';
+                    }                    
                   });
                 }else{         
                   $('#pay').text("Pay");
@@ -504,7 +514,11 @@
                    closeOnCancel: false,
                    allowOutsideClick: false
                  }, function () {
-                  window.location.href = '/origami';
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  }                  
                 });
                 }
               }
@@ -525,7 +539,11 @@
               type: 'POST',
               url: ajax_url,
               success: function () {
-                window.location.href = '/origami/';
+               if (cashier_type=="cashier") {
+                 window.location.href = '/origami';
+               }else{
+                 window.location.href = '/origami/quick_service';
+               }  
               }
             })
          });
@@ -573,7 +591,11 @@
                title: "Information!",
                text: 'Thank You !',
              }, function () {
-              window.location.href = '/origami';
+              if (cashier_type=="cashier") {
+                window.location.href = '/origami';
+              }else{
+                window.location.href = '/origami/quick_service';
+              }  
             });
             }
             
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb
index d250e0b7..5698eb41 100755
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -108,6 +108,7 @@
 	</div>
 </div>
 <script type="text/javascript">
+    var cashier_type = "<%= @cashier_type %>"; 
 	$(document).ready(function() {
 		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
 			else {
@@ -185,7 +186,7 @@
 								closeOnCancel: false,
 								allowOutsideClick: false
 							}, function () {
-								window.location.href = '/origami/sale/'+ sale_id  + "/payment"
+								window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment"
 							});
 
 						}else{
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 385129bf..fda2eb54 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -669,7 +669,7 @@ $('#pay').on('click',function() {
       type: "POST",
         url: '/origami/sale/'+ sale_id + "/rounding_adj",
         success:function(result){          
-          window.location.href = '/origami/sale/'+ sale_id + "/payment";
+          window.location.href = '/origami/sale/'+ sale_id + "/cashier/payment";
         }
     });
    
diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb
index 37476be9..e1425947 100755
--- a/app/views/origami/unionpay/index.html.erb
+++ b/app/views/origami/unionpay/index.html.erb
@@ -120,6 +120,8 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>"; 
+  
   $(document).ready(function() {
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
@@ -143,7 +145,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
         });
       }
     }
@@ -230,7 +232,7 @@
                 closeOnCancel: false,
                 allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index f9a693c1..49c2e23d 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -120,6 +120,7 @@
 </div>
 </div>
 <script>
+  var cashier_type = "<%= @cashier_type %>";  
   $(document).ready(function() {
     var sale_id = "<%= @sale_id %>";
     var bank_integration = "<%= @bank_integration %>";
@@ -143,7 +144,7 @@
           closeOnCancel: false,
           allowOutsideClick: false
         }, function () {
-          window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment";
+          window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment/others_payment";
         });
       }
     }
@@ -232,7 +233,7 @@
             closeOnCancel: false,
             allowOutsideClick: false
               }, function () {
-                window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+                window.location.href = '/origami/sale/'+ sale_id  + "/"+cashier_type+"/payment";
               });
             }
           }
diff --git a/config/routes.rb b/config/routes.rb
index 5c755179..1b23f1b2 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -84,8 +84,11 @@ scope "(:locale)", locale: /en|mm/ do
 
   #--------- Cashier ------------#
   namespace :origami do
-    get "dashboard" => "dashboard#index"
+    get "dashboard" => "dashboard#index" 
+
     get "quick_service" => "quick_service#index"
+    
+    # post '/:quick_service/create' => "quick_service#create", :defaults => { :format => 'json' }   
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]
@@ -154,7 +157,7 @@ scope "(:locale)", locale: /en|mm/ do
     #--------- Payment ------------#
     post 'sale/:sale_id/rounding_adj' => 'payments#rounding_adj', :as => "calculate_rouding_adjs"
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => {:format => 'json'}
-    get 'sale/:sale_id/payment' => 'payments#show'
+    get 'sale/:sale_id/:type/payment' => 'payments#show'
 
     post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'}
     post 'payment/cash' => 'payments#create'
@@ -167,15 +170,15 @@ scope "(:locale)", locale: /en|mm/ do
     post 'payment/credit' => 'credit_payments#create'
     post 'payment/voucher' => 'voucher_payments#create'
 
-    get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
-    get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
-    get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
-    get 'sale/:sale_id/payment/others_payment/VISA' => "visa#index"
-    get 'sale/:sale_id/payment/others_payment/Master' => "master#index"
-    get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
-    get 'sale/:sale_id/payment/others_payment/UNIONPAY' => "unionpay#index"
-    get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
-    get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index"
+    get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index"
+    get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
+    get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
+    get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
+    get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/void' => 'void#overall_void'
@@ -222,6 +225,9 @@ scope "(:locale)", locale: /en|mm/ do
     post "bank_integration/settle_trans", to: "bank_integration#settle_trans", as:"settle_trans"
     post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
 
+   
+    
+
   end
 
   #--------- Waiter/Ordering Station ------------#