diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 3e11666d..2ae1a664 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -527,6 +527,7 @@ function getCreditData(){
 }
 
 function getCreditSales(filter, customer){
+	$(".credit_items").hide();
 	$(".tbd_credit_lists").empty();
 	var html_credit_items = $("#html_credit_items").html();
 	var receipt_no = "";
@@ -548,6 +549,7 @@ function getCreditSales(filter, customer){
 				var credit_sales = data.data;
 				// console.log(credit_sales);
 				if(credit_sales.length > 0){
+					$(".credit_items").show();
 					for (var i = 0; i < credit_sales.length ; i++) {
 						var sale_date = new Date(credit_sales[i].sale_date);
 						var receipt_date = sale_date.getFullYear() +'-'+ (sale_date.getMonth() > 10 ? sale_date.getMonth() : '0' + sale_date.getMonth()) +'-'+ (sale_date.getDate() > 10 ? sale_date.getDate() : '0' + sale_date.getDate());
@@ -563,7 +565,6 @@ function getCreditSales(filter, customer){
 					}
 				}
 			}else{
-				$(".credit_items").empty();
 				$(".tbd_credit_lists").html(data.message);
 			}
 		}
diff --git a/app/controllers/origami/credit_sales_controller.rb b/app/controllers/origami/credit_sales_controller.rb
index 97f1d38c..6ecf3a46 100644
--- a/app/controllers/origami/credit_sales_controller.rb
+++ b/app/controllers/origami/credit_sales_controller.rb
@@ -1,5 +1,6 @@
 class Origami::CreditSalesController < BaseOrigamiController
   def show
+    @cashier_type = params[:type]
     @webview = false
     if check_mobile
       @webview = true  
@@ -11,8 +12,8 @@ class Origami::CreditSalesController < BaseOrigamiController
     @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
     @customers = Customer.pluck("customer_id, name")
 
-    sale_payment = SalePayment.find_by_sale_payment_id(params[:sale_payment_id])
-    @sale = Sale.find_by_sale_id(sale_payment.sale_id)
+    @sale_payment = SalePayment.find_by_sale_payment_id(params[:sale_payment_id])
+    @sale = Sale.find_by_sale_id(@sale_payment.sale_id)
     @sale_taxes = []
     sale_taxes = SaleTax.where("sale_id = ?", @sale.sale_id)
     if !sale_taxes.empty?
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 2ca8b45a..dd172af6 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -219,9 +219,16 @@ class Origami::PaymentsController < BaseOrigamiController
   end
 
   def show
-    sale_id = params[:sale_id]
+    if params[:sale_id]
+      sale_id = params[:sale_id]
+    end
     @cashier_type   = params[:type]
-
+    if params[:sale_payment_id]
+      sale_payment_id = params[:sale_payment_id]
+      @sale_payment = SalePayment.find(params[:sale_payment_id])
+      sale_id = @sale_payment.sale_id
+    end
+    
     @member_discount = MembershipSetting.find_by_discount(1)
     
     if Sale.exists?(sale_id)
diff --git a/app/views/origami/credit_sales/show.html.erb b/app/views/origami/credit_sales/show.html.erb
index c374e75d..bdee34ff 100755
--- a/app/views/origami/credit_sales/show.html.erb
+++ b/app/views/origami/credit_sales/show.html.erb
@@ -6,19 +6,19 @@
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
      <li class="nav-item">
-       <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
+       <a class="nav-link " data-toggle="tab" href="#completed" role="tab"><%= t :competed %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
+       <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
      </li>
      <li class="nav-item credit_items">
-       <a class="nav-link active" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
+       <a class="nav-link active" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
      </li>
    </ul>
    <!-- Nav tabs - End -->
@@ -288,6 +288,10 @@
    <td class="charges-name"><strong>Grand Total:</strong></td>
    <td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
  </tr>
+ <tr class="bg-red">
+   <td class="charges-name"><strong>Credit Amount:</strong></td>
+   <td class="item-attr"><strong id="credit_amount"><%= @sale_payment.payment_amount rescue 0%></strong></td>
+ </tr>
  <tr class="rebate_amount"></tr>
 </table>
 </div>
@@ -316,6 +320,7 @@
 <!-- script data for credit lists -->
 
 <script>
+  var cashier_type = '<%= @cashier_type %>';
   $(document).ready(function(){
     /* check webview loaded*/
     var webview = <%= @webview %>;
@@ -342,15 +347,9 @@
   });
 
   $('#pay').on('click',function() {
-   // var sale_id = $('#sale_id').val();
-   // var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
-   // $.ajax({
-   //  type: "POST",
-   //  url: '/origami/sale/'+ sale_id + "/rounding_adj",
-   //  success:function(result){          
-   //    window.location.href = '/origami/sale/'+ sale_id + "/payment";
-   //  }
-    // });
+    var sale_id = '<%= @sale.sale_id %>';
+    var sale_payment_id = '<%= @sale_payment.sale_payment_id %>';
+    window.location.href = '/origami/sale/'+ sale_payment_id + "/"+cashier_type+"/credit_sales";
   });
 
   $('#back').on('click',function(){
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 7ad5cf0f..93e1f8bd 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -21,7 +21,7 @@
          <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
        </li>
        <li class="nav-item credit_items">
-         <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
+         <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
        </li>
      </ul>
      <!-- Nav tabs - End -->
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 79aa367e..2494da1b 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -20,7 +20,7 @@
           <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
         </li>
         <li class="nav-item credit_items">
-          <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
+          <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
         </li>
       </ul>
       <!-- Nav tabs - End -->
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index 37c4e7e8..a74089bb 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -6,19 +6,19 @@
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
      <li class="nav-item">
-       <a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
+       <a class="nav-link " data-toggle="tab" href="#completed" role="tab"><%= t :competed %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+       <a class="nav-link" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link active" data-toggle="tab" href="#orders" role="tab">Orders</a>
+       <a class="nav-link active" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
      </li>
      <li class="nav-item credit_items">
-        <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
+        <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
       </li>
    </ul>
    <!-- Nav tabs - End -->
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 248258e7..c260a617 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -167,20 +167,42 @@
         <div class="col-md-8"><strong>Amount Due</strong></div>
         <div class="col-md-4">
           <strong>
-            <span id="grand_total" class="hidden"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%></span>
-            <span id="amount_due"><%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></span></strong>
+            <span id="grand_total" class="hidden">
+              <% if @sale_payment.nil? %>
+                <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+              <% else %>
+                <%= number_with_precision(@sale_payment.payment_amount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+              <% end %>
+            </span>
+            <span id="amount_due">
+              <% if @sale_payment.nil? %>
+                <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+              <% else %>
+                <%= number_with_precision(@sale_payment.payment_amount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i)%>
+              <% end %>
+            </span>
+          </strong>
         </div>
       </div>
      
       <div class="row payment cash-color p-l-5 p-r-5">
         <div class="col-md-8">Cash</div>
-        <div class="col-md-4" id="cash" ><%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
-      </div>
-
-      <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
-        <div class="col-md-8">Credit</div>
-        <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+        <div class="col-md-4" id="cash" >
+          <% if @sale_payment.nil? %>
+            <%= number_with_precision(@cash, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+          <% else %>
+            <%= number_with_precision(0, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+          <% end %>
+        </div>
       </div>
+      <% if @sale_payment.nil? %>
+        <div class="row payment credit-color p-l-5 p-r-5" id="credit_payment" >
+          <div class="col-md-8">Credit</div>
+          <div class="col-md-4" id="credit"><%= number_with_precision(@credit, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %></div>
+        </div>
+      <% else %>
+        <div class="col-md-4 hidden" id="credit">0</div>
+      <% end %>
       <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0 && @unionpaycount == 0.0 && @alipaycount == 0.0 && @paymalcount == 0.0 && @junctionpaycount == 0.0 && @dingacount == 0.0 && @giftvouchercount == 0.0 %>
         <div class="row payment other-payment-color" id="card_payment" >
           <div class="col-md-8">Other Payments</div>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index b64fc4df..8f0ee5c5 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -9,19 +9,19 @@
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
    <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Completed</a>
+       <a class="nav-link" data-toggle="tab" href="#completed" role="tab"><%= t :competed %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
+       <a class="nav-link " data-toggle="tab" href="#tables" role="tab"><%= t :tables %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link active" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
+       <a class="nav-link active" data-toggle="tab" href="#rooms" role="tab"><%= t :rooms %></a>
      </li>
      <li class="nav-item">
-       <a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
+       <a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
      </li>
       <li class="nav-item credit_items">
-        <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
+        <a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credits %></a>
       </li>
    </ul>
    <!-- Nav tabs - End -->
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4f96ef4e..66e35892 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -81,7 +81,8 @@ en:
   completed: "Completed"
   processed: "Processed"
   delivery_details: "Delivery Details"
-
+  credits: "Credits"
+  
   views:
     btn:
       create: "Create"
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index c6ea5dfa..3aa5cb09 100644
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -76,7 +76,8 @@ mm:
   completed: "Completed"
   processed: "Processed"
   delivery_details: "Delivery Details"
-  
+  credits: "အကြွေးများ"
+
   views:
     btn:       
       create: "အသစ်တည်ဆောက်ရန်"
diff --git a/config/routes.rb b/config/routes.rb
index f15b9710..ad66f6e3 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -287,9 +287,10 @@ scope "(:locale)", locale: /en|mm/ do
     post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
     post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
 
-    #credit sales
+    #credit payment routes
     post '/:type/credit_sales' => "dashboard#get_credit_sales", :as => "get_credit_sales", :defaults => { :format => 'json' }
     get '/:type/credit_sales/:sale_payment_id' => "credit_sales#show"
+    get 'sale/:sale_payment_id/:type/credit_sales' => "payments#show"
   end
 
   #--------- Waiter/Ordering Station ------------#