diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js
index 512b2602..59401aeb 100644
--- a/app/assets/javascripts/channels/call_waiter.js
+++ b/app/assets/javascripts/channels/call_waiter.js
@@ -1,12 +1,12 @@
 App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
-//  App.messages = App.cable.subscriptions.create('MessagesChannel', {  
+//  App.messages = App.cable.subscriptions.create('MessagesChannel', {
 
   connected: function() {},
 
   disconnected: function() {},
 
-  received: function(data) {                 
-   
+  received: function(data) {
+
    var hostname = location.hostname.trim();
     if(data.from == "" || hostname == data.from)
     {
@@ -19,7 +19,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
             class_name = ".shift_" + data.shift_ids;
           }
         }
-        var element        = "#notify-wrapper" + class_name;
+        var element        = "#notify-wrapper"+ class_name;
         var animateEnter   = "";
         var animateExit    = "";
         if (time == 'print_error') {
@@ -35,10 +35,10 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
           var text           = " Calling Waiter <br>  "+table.name ;
           style ="width:180px !important;"
         }
-        
+
 
         if (text != null || colorName != null){
-         showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+         showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
        }
 
        function showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
@@ -79,4 +79,3 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', {
     }
   }
 });
-
diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 5861621a..beb676c7 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -1,5 +1,4 @@
-class Api::CallWaitersController < ActionController::API
-
+class Api::CallWaitersController < Api::ApiController
   #List all active customers by name
   def index
     @table_id = params[:dining_id]
@@ -23,10 +22,11 @@ class Api::CallWaitersController < ActionController::API
     end
     ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time,from: from, shift_ids: shift_ids
     # get printer info
+    @shop          = Shop.current_shop
     unique_code    = "CallWaiterPdf"
     print_settings = PrintSetting.find_by_unique_code(unique_code)
     printer        = Printer::ReceiptPrinter.new(print_settings)
-    printer.print_call_waiter(print_settings,@table,@time,current_shop)
+    printer.print_call_waiter(print_settings,@table,@time,@shop)
   end
 
 
diff --git a/app/controllers/api/customers_controller.rb b/app/controllers/api/customers_controller.rb
index 9e6682ae..7a4663b4 100755
--- a/app/controllers/api/customers_controller.rb
+++ b/app/controllers/api/customers_controller.rb
@@ -1,5 +1,5 @@
 class Api::CustomersController < Api::ApiController
-  
+
   #List all active customers by name
   def index
     @customers = Customer.order("name asc")
@@ -10,6 +10,26 @@ class Api::CustomersController < Api::ApiController
     @customer = Customer.find_by(params[:id])
   end
 
+  def create
+    return unless params[:name].present? && params[:email].present? && params[:contact_no].present?
+    @customer = Customer.new(name: params[:name], email: params[:email], contact_no: params[:contact_no])
+    if @customer.save
+      status = true
+    else
+      status = false
+    end
+    render json: status
+  end
+
+  def get_customer_by_phone
+    if @customer = Customer.find_by_contact_no(params[:contact_no])
+      status = true
+    else
+      status = false
+    end
+    render json: status
+  end
+
   #Show customer detail by Order item
   def get_customer_order
     @customer = Customer.find(params[:id])
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4255cdf2..3ea7fe8a 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -795,7 +795,7 @@ class Sale < ApplicationRecord
     payment_methods = SalePayment.where.not(payment_method: ['cash', 'creditnote', 'foc']).distinct.pluck(:payment_method)
 
     sales = select(Sale.column_names)
-    .select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as #{method == 'paypar' ? 'redeem' : method}"}.push('').join(', ')}
+    .select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as `#{method == 'paypar' ? 'redeem' : method}`"}.push('').join(', ')}
     SUM(case when (sale_payments.payment_method='cash') then sale_payments.payment_amount else 0 end) as cash_amount,
     SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) -
     SUM(case when (sale_payments.payment_method not in('creditnote') and sale_audits.sale_audit_id IS NOT NULL) then sale_payments.payment_amount else 0 end) as credit_amount,
@@ -816,7 +816,7 @@ class Sale < ApplicationRecord
     (IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0)) - (IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0) / 21) as net_sale,
     (IFNULL(SUM(case when (sale_status='completed') then grand_total else 0 end),0)) + (IFNULL(SUM(case when (sale_status='completed') then total_discount else 0 end),0)) as gross_sale,
     CAST((CONVERT_TZ(receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
-    #{payment_methods.map { |method| pm = method == 'paypar' ? 'redeem' : method; "SUM(#{pm}) as #{pm}"}.push('').join(', ')}
+    #{payment_methods.map { |method| pm = method == 'paypar' ? 'redeem' : method; "SUM(`#{pm}`) as `#{pm}`"}.push('').join(', ')}
     SUM(cash_amount) as cash_amount,
     SUM(credit_amount) as credit_amount,
     SUM(foc_amount) as foc_amount
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index daffd8cf..bbc7cc20 100755
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -154,7 +154,7 @@ class ShiftSale < ApplicationRecord
 
     shift_other_payments = Sale.select("sales.sale_id,sale_payments.payment_method as name")
     if payment_methods.present?
-      shift_other_payments = shift_other_payments.select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as #{method == 'paypar' ? 'redeem' : method}"}.join(', ')}")
+      shift_other_payments = shift_other_payments.select("#{payment_methods.map { |method| "SUM(case when (sale_payments.payment_method='#{method}') then sale_payments.payment_amount else 0 end) as `#{method == 'paypar' ? 'redeem' : method}`"}.join(', ')}")
     end
     shift_other_payments.select("SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
       .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb
index a66c5b86..871d5a39 100644
--- a/app/uploaders/customer_image_uploader.rb
+++ b/app/uploaders/customer_image_uploader.rb
@@ -20,10 +20,11 @@ class CustomerImageUploader < CarrierWave::Uploader::Base
   end
 
   def filename
-    if Shop.current_shop.nil?
-      "#{original_filename}" if original_filename.present?
+    return unless original_filename.present?
+    if Shop.current_shop.shop_code.nil?
+      "#{original_filename}"
     else
-      "#{Shop.current_shop.shop_code}_#{original_filename}" if original_filename.present?
+      "#{Shop.current_shop.shop_code}_#{original_filename}"
     end
   end
 
diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
index 31ac3b00..d6c48f73 100755
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -23,10 +23,10 @@ if item.is_available
   json.code         item.item_code
   json.name         item.name
   json.alt_name     item.alt_name
-  if !request_url.nil? && request_url != '' && !item.image_path.nil?
-    json.image        request_url + item.image_path.to_s
+  if item.image_path.present?
+    json.image      "#{request_url}#{item.image_path}"
   else
-    json.image        item.image_path.url
+    json.image      ''
   end
   json.description  item.description
   json.information  item.information
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index d881b73f..79bf05c6 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -207,7 +207,7 @@
           <thead>
             <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
             <th><%= t("views.right_panel.detail.receipt_no") %></th>
-            <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>      
+            <th> <%= t :cashier %></th>      
             <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
           </thead>
           <tbody>
diff --git a/app/views/foodcourt/payments/show.html.erb b/app/views/foodcourt/payments/show.html.erb
index 0c194e4c..8d5a2a11 100755
--- a/app/views/foodcourt/payments/show.html.erb
+++ b/app/views/foodcourt/payments/show.html.erb
@@ -564,82 +564,82 @@ $(document).ready(function(){
       sub_total = $('#sub-total').text();
       member = $('#membership_id').text();
 
-          $( "#loading_wrapper").show();
-          if($('#balance').text() > 0){
-            swal ( "Oops", "Insufficient Amount!" ,  "error" );
-            $("#loading_wrapper").hide();
-          }else{
-            $(this).off("click");
-            var sale_id   = $('#sale_id').text();
-            // var item_row  = $('.is_card');
+      $( "#loading_wrapper").show();
+      if($('#balance').text() > 0){
+        swal ( "Oops", "Insufficient Amount!" ,  "error" );
+        $("#loading_wrapper").hide();
+      }else{
+        $(this).off("click");
+        var sale_id   = $('#sale_id').text();
+        // var item_row  = $('.is_card');
 
-            //  payment
-              var cash   = $('#cash').text();
-              var credit = $('#credit').text();
-              var card   = $('#card').text();
-              var kbz_amt = "<%= @kbz_pay_amount %>";
-              var is_kbz = false;
-              if (kbz_amt > 0) {
-                is_kbz = true
+        //  payment
+        var cash   = $('#cash').text();
+        var credit = $('#credit').text();
+        var card   = $('#card').text();
+        var kbz_amt = "<%= @kbz_pay_amount %>";
+        var is_kbz = false;
+        if (kbz_amt > 0) {
+          is_kbz = true
+        }
+
+        var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
+          calculate_member_discount(sale_id,tax_type);
+        /* check credit payment or not*/
+          var url = "<%= foodcourt_payment_cash_path %>";
+        $.ajax({type: "POST",
+          url: url,
+          data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type + "&is_kbz=" + is_kbz,
+          success:function(result){
+            /* start delete receipt no in first bill*/
+            if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+              var receipt_no = ($("#receipt_no").html()).trim();
+              deleteReceiptNoInFirstBillData(receipt_no);
+            }
+            /* end delete receipt no in first bill*/
+
+            localStorage.removeItem("cash");
+            if (result.status) {
+              var msg = result.message;
+            }
+            else{
+              var msg = '';
+            }
+
+            $("#loading_wrapper" ).hide();
+            if(location.pathname.includes("credit_payment")){
+              payment_success_alert();
+            }else{
+              //PDF lightbox data
+              var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
+              $("#sale_receipt_no").val(result.receipt_no);
+              $("#filename").val(result.filename);
+              $("#printer_name").val(result.printer_name);
+              $("#receipt_pdf").attr("src", pdfPath);
+              $("#changed_amount").text("");
+              if($('#balance').text() < 0){
+                <% if precision.to_i > 0 %>
+                  $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
+                <% else %>
+                  $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
+                <% end %>
               }
 
-              var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : 'all';
-                calculate_member_discount(sale_id,tax_type);
-              /* check credit payment or not*/
-                var url = "<%= foodcourt_payment_cash_path %>";
-              $.ajax({type: "POST",
-                url: url,
-                data: "cash="+ cash + "&sale_id=" + sale_id + "&type=" + cashier_type + "&tax_type=" + tax_type + "&is_kbz=" + is_kbz,
-                success:function(result){
-                  /* start delete receipt no in first bill*/
-                  if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
-                    var receipt_no = ($("#receipt_no").html()).trim();
-                    deleteReceiptNoInFirstBillData(receipt_no);
-                  }
-                  /* end delete receipt no in first bill*/
-
-                  localStorage.removeItem("cash");
-                  if (result.status) {
-                    var msg = result.message;
-                  }
-                  else{
-                    var msg = '';
-                  }
-
-                  $("#loading_wrapper" ).hide();
-                  if(location.pathname.includes("credit_payment")){
-                    payment_success_alert();
-                  }else{
-                    //PDF lightbox data
-                    var pdfPath = "/en/pdfjs/minimal?file=" + result.filename.substring(6);
-                    $("#sale_receipt_no").val(result.receipt_no);
-                    $("#filename").val(result.filename);
-                    $("#printer_name").val(result.printer_name);
-                    $("#receipt_pdf").attr("src", pdfPath);
-                    $("#changed_amount").text("");
-                    if($('#balance').text() < 0){
-                      <% if precision.to_i > 0 %>
-                        $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)).toFixed(<%= precision %>));
-                      <% else %>
-                        $("#changed_amount").text('Changed amount  ' + parseFloat($('#balance').text() * (-1)));
-                      <% end %>
-                    }
-
-                    if (pdf_view == 1) {
-                      $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                      $("#pdfModalLabel").text("Sale Completed");
-                    }else{
-                      //PDF lightbox data
-                      print_receipt();
-                    }
-                  }
-                }
-              });
+              if (pdf_view == 1) {
+                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                $("#pdfModalLabel").text("Sale Completed");
+              }else{
+                //PDF lightbox data
+                print_receipt();
+              }
             }
-          var second_display_lookup = $("#display_type").val();
-          if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
-            customer_display_view(null,"reload");
           }
+        });
+      }
+      var second_display_lookup = $("#display_type").val();
+      if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
+        customer_display_view(null,"reload");
+      }
     });
     window.customer_display_view = function(data,status) {
      url = '/foodcourt/customer_view';
@@ -968,9 +968,7 @@ $(document).ready(function(){
     $("#is_memberModal").hide();
     $("#sxModal").attr('data-for', 'member');
     $("#sxModal").show();
-    setTimeout(function(){
-      getCardNo();
-    },100);
+    getCardNo();
   });
 
   function pay_with_card(cardNo) {
@@ -1141,7 +1139,6 @@ $(document).ready(function(){
 
   // get CardNo from Java
   function setCardNo(cardNo){
-
     if(cardNo.length == 16){
       $("#paypar_account_no").val(cardNo);
       if ($("#sxModal").attr("data-for") == 'member') {
@@ -1458,13 +1455,11 @@ $(document).ready(function(){
 
   // Read Card Reader - Paymal payment for FoodCourt
   $(".btn_paymal_member").on('click', function (){
+    console.log('btn_paymal_member');
     $("#is_paymemberModal").hide();
     $("#sxModal").attr('data-for', 'payment');
     $("#sxModal").show();
-    var cardNo = setTimeout(function(){
-      getCardNo();
-     },100);
-     setCardNo(cardNo);
+    getCardNo();
   });
 
   // QR Code Reader
diff --git a/app/views/origami/credit_sales/show.html.erb b/app/views/origami/credit_sales/show.html.erb
index 963dc864..c63d02a3 100755
--- a/app/views/origami/credit_sales/show.html.erb
+++ b/app/views/origami/credit_sales/show.html.erb
@@ -181,8 +181,8 @@
             <thead>
               <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
               <th><%= t("views.right_panel.detail.receipt_no") %></th>
-              <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-              <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+              <th> <%= t :cashier %></th>
+              <th> <%= t :customer %></th>       
               <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
             </thead>
             <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index a583e659..013e087e 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -159,8 +159,8 @@
           <thead>
             <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
             <th><%= t("views.right_panel.detail.receipt_no") %></th>
-            <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-            <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+            <th> <%= t :cashier %></th>
+            <th> <%= t :customer %></th>
             <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
           </thead>
           <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f66127f2..6f92aa21 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -178,8 +178,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                        <th> <%= t :cashier %></th>
+                        <th> <%= t :customer %></th>
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb
index b3b9ae51..73683562 100755
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -45,9 +45,9 @@
             <% if table.get_booking.nil? %>
               <% if table.get_checkout_booking.nil? %>
                 <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
-              <% else %>                            
+              <% else %>
                 <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-              <% end %>                         
+              <% end %>
                   <div class="card-block">
                     <%= table.name %> <br>
                     <%= table.zone.name %>
@@ -55,12 +55,12 @@
                     <div style="font-size:12px;"></div>
                   </div>
                 </div>
-            <% else %>         
+            <% else %>
               <% if table.get_checkout_booking.nil? %>
                 <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
-              <% else %>                       
+              <% else %>
                 <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
-              <% end %>                   
+              <% end %>
               <div class="card-block">
                   <%= table.name %> <br>
                   <%= table.zone.name %>
@@ -108,7 +108,7 @@
                 <div class="card-block">
                   <%= room.name %> <br>
                   <%= room.zone.name %>
-                  <span class="float-right font-12 new_text_<%= room.id %> hide"> 
+                  <span class="float-right font-12 new_text_<%= room.id %> hide">
                 </div>
               </div>
           <% end %>
@@ -167,8 +167,8 @@
         <thead>
           <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
           <th><%= t("views.right_panel.detail.receipt_no") %></th>
-          <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-          <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+          <th> <%= t :cashier %></th>
+          <th> <%= t :customer %></th>
           <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
         </thead>
         <tbody class="tbd_credit_lists"></tbody>
@@ -224,10 +224,10 @@
         <tr>
           <td class='item-name'>
             <%= sale_item.item_name %>
-            <% if !sale_item.set_menu_items.nil?  
-              sale_item.set_menu_items.each do |item_instance| %> 
-              <br><span class="font-13"><%= item_instance %></span> 
-            <% end 
+            <% if !sale_item.set_menu_items.nil?
+              sale_item.set_menu_items.each do |item_instance| %>
+              <br><span class="font-13"><%= item_instance %></span>
+            <% end
             end %>
           </td>
          <td class='item-attr'><%= sale_item.qty %></td>
@@ -316,11 +316,11 @@
    $.ajax({
     type: "POST",
     url: '/origami/sale/'+ sale_id + "/rounding_adj",
-    success:function(result){          
+    success:function(result){
       window.location.href = '/origami/sale/'+ sale_id + "/payment";
     }
   });
-   
+
  });
   $('#back').on('click',function(){
     window.location.href = '/origami/';
@@ -362,7 +362,7 @@
       booking_id = booking[0].booking_id;
     }
     var cashier_type = "cashier";
-    
+
     var ajax_url = "/origami/split_bills";
     $.ajax({
       type: "POST",
@@ -383,7 +383,7 @@
                 window.location.href = '/origami/room/' + dining_id;
               }
             }
-            
+
           }
         }
       });
diff --git a/app/views/origami/pending_order/completed_sale.html.erb b/app/views/origami/pending_order/completed_sale.html.erb
index a90c8d8f..69666372 100644
--- a/app/views/origami/pending_order/completed_sale.html.erb
+++ b/app/views/origami/pending_order/completed_sale.html.erb
@@ -73,8 +73,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                        <th> <%= t :cashier %></th>
+                        <th> <%= t :customer %></th>       
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/pending_order/credit_sale.html.erb b/app/views/origami/pending_order/credit_sale.html.erb
index f8fd7ceb..9d7b42f9 100644
--- a/app/views/origami/pending_order/credit_sale.html.erb
+++ b/app/views/origami/pending_order/credit_sale.html.erb
@@ -70,8 +70,8 @@
                     <thead>
                       <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                       <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                      <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                      <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                      <th> <%= t :cashier %></th>
+                      <th> <%= t :customer %></th>       
                       <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                     </thead>
                     <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb
index fe8ba72f..0bcbbad5 100644
--- a/app/views/origami/pending_order/index.html.erb
+++ b/app/views/origami/pending_order/index.html.erb
@@ -74,8 +74,8 @@
                             <thead>
                               <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                               <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                              <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                              <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                              <th> <%= t :cashier %></th>
+                              <th> <%= t :customer %></th>       
                               <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                             </thead>
                             <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index 993d6e8a..65966157 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -72,8 +72,8 @@
                       <thead>
                         <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                         <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                        <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                        <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                        <th> <%= t :cashier %></th>
+                        <th> <%= t :customer %></th>       
                         <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                       </thead>
                       <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index dd0b84e6..082f91f5 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -199,8 +199,8 @@
                 <thead>
                   <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                   <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                  <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                  <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                  <th> <%= t :cashier %></th>
+                  <th> <%= t :customer %></th>       
                   <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
                 </thead>
                 <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 66aaf379..7cf321bc 100755
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -88,7 +88,7 @@
                  </td> -->
                           <td class="p-1" width="25%">
                             <button data-id="<%= sale_item.id %>" class='btn btn-lg bg-danger waves-effect cancel'>Cancel
-                              Void/Update
+                              <%= sale_item.status %>
                             </button>
                           </td>
                       <% else %>
@@ -147,15 +147,15 @@
          <div class="col-md-4 cashier_number border-top border- border-left green" data-type="nett">Nett</div>
          <div class="col-md-4 cashier_number border-top border- border-left red" data-type="del">Del</div>
          <div class="col-md-4 cashier_number border-top border- border-left orange" data-type="clr">Clr</div>
-       </div>  
-     </div>   
-   </div>  
+       </div>
+     </div>
+   </div>
  </div> -->
     <!-- Column Three -->
     <div class="col-lg-1 col-md-1 col-sm-1">
       <!-- Waiter Buttons -->
       <button type="button" class="btn btn-block btn-lg bg-default waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
-      <button type="button" class="btn btn-danger btn- action-btn" id='cancel_all_void'>Cancel All Void</button>
+      <button type="button" class="btn btn-block btn-lg btn-danger action-btn waves-effect" id='cancel_all_void'>Cancel All</button>
       <button type="button" class="btn btn-block btn-lg bg-blue waves-effect" id='apply'>Apply</button>
     </div>
   </div>
@@ -180,231 +180,205 @@
             <button type="button" class="btn btn-link  p-t-5 p-b-5 bg-blue waves-effect" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
-        
+
       </div>
     </div>
   </div>
 </div>
 <script>
-var cashier_type = "<%= @cashier_type %>"; 
+var cashier_type = "<%= @cashier_type %>";
 var access_code  = localStorage.getItem("access_code");
-    // Bill Request
-    $(document).ready(function () {
+  // Bill Request
+  $(document).ready(function () {
 
-        setHeaderBreadCrumb(_SALE_EDIT_);
-        $('.editModal').on('click', function () {
-        $("#action").attr('data-type', $(this).attr('data-type'));
-        $("#action").attr('data-id', $(this).attr('data-id'));
-        $("#action").text($(this).attr('data-type'))
-    })
-
-        $(".update").on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
-            var qty          = $('#' + sale_item_id + "_qty").val();
-            var price        = $('#' + sale_item_id + "_price").val();
-            var qty_status = true;
-            var price_status = true;
-            if((qty > 0) && (price > 0)){
-              qty_status = true;
-              price_status = true;
-              $('#' + sale_item_id + "_qtyErr").html("");
-              $('#' + sale_item_id + "_priceErr").html("");
-            }else if((qty > 0) && (price <= 0 || price == '')){
-              price_status = false;
-              $('#' + sale_item_id + "_qtyErr").html("");
-              if(price == ''){
-                $('#' + sale_item_id + "_priceErr").html("can't be blank");
-              }else{
-                $('#' + sale_item_id + "_price").val("");
-                $('#' + sale_item_id + "_priceErr").html("Price must be greater than 0");
-              }
-            }else if((qty <= 0 || qty == '') && (price > 0)){
-              qty_status = false;
-              if(qty == ''){
-                $('#' + sale_item_id + "_qtyErr").html("can't be blank");
-              }else{
-                $('#' + sale_item_id + "_qty").val("");
-                $('#' + sale_item_id + "_qtyErr").html("Quantity must be greater than 0");
-              }
-              
-              $('#' + sale_item_id + "_priceErr").html("");
-            }else{
-              qty_status = false;
-              price_status = false;
-              $('#' + sale_item_id + "_qtyErr").html("can't be blank");
-              $('#' + sale_item_id + "_priceErr").html("can't be blank");
-            }
-            
-            if(qty_status && price_status){
-              var ajax_url      = "/origami/item_edit";
-              $.ajax({
-                  type: "POST",
-                  url: ajax_url,
-                  data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price+ "&access_code=" + access_code + "&type=" + cashier_type,
-                  success: function (result) {
-                      swal({
-                          title: "Information!",
-                          text: "Qty and Price was successfully Updated",
-                      }, function () {
-                         location.reload();
-                      });
-                  }
-              });
-            }
-        });
-
-        /*$('.void').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
-            var remark = $("#remark").val();
-            var ajax_url = "/origami/item_void";
-            $.ajax({
-                type: "POST",
-                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark,
-                success: function (result) {
-                    location.reload();
-                }
-            });
-        })
-
-        $('.foc').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
-            var ajax_url = "/origami/item_foc";
-            $.ajax({
-                type: "POST",
-                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark,
-                success: function (result) {
-                    location.reload();
-                }
-            });
-        })*/
-
-        $('#action').on('click', function () {
-            var access_code  = localStorage.getItem("access_code");
-            var sale_item_id = $(this).attr('data-id');
-            var type       = $(this).attr('data-type');
-            var remark       = $("#remark").val();
-            if (type=='foc') {
-              var ajax_url = "/origami/item_foc";
-            }else{
-              var ajax_url = "/origami/item_void";
-            }
-            
-            $.ajax({
-                type: "POST",
-                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + "&remark=" + remark+ "&access_code=" + access_code + "&type=" + cashier_type,
-                success: function (result) {
-                    location.reload();
-                }
-            });
-        })
-
-        $('.cancel').on('click', function () {
-            var sale_item_id = $(this).attr('data-id');
-            var ajax_url = "/origami/item_void_cancel";
-            $.ajax({
-                type: "POST",
-                url: ajax_url,
-                data: 'sale_item_id=' + sale_item_id + '&access_code=' + access_code + "&type=" + cashier_type,
-                success: function (result) {
-                    location.reload();
-                }
-            });
-        })
-
-
-    })
-
-    
-    $('#back').on('click', function () {
-        var table_id = '<%= @table_id %>'
-        var sale_id = "<%= @saleobj.sale_id %>"
-        if (cashier_type=="quick_service" || cashier_type == "food_court") {
-          window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
-        }else{
-          window.location.href = '/origami/table/' + table_id;
-        }        
-    })
-
-    $('#cancel_all_void').on('click', function () {
-        var sale_id = "<%= @saleobj.sale_id %>"
-        var ajax_url = "/origami/cancel_all_void";
-        $.ajax({
-            type: "POST",
-            url: ajax_url,
-            data: 'sale_id=' + sale_id +'&type='+cashier_type,
-            success: function (result) {
-                location.reload();
-            }
-        });
-    })
-
-    $('#apply').on('click', function () {
-        var sale_id = "<%= @saleobj.sale_id %>"
-        var ajax_url = "/origami/apply_void";
-        var table_id = '<%= @table_id %>'
-        $.ajax({
-            type: "POST",
-            url: ajax_url,
-            data: 'sale_id=' + sale_id+'&type='+cashier_type,
-            success: function (result) {
-              if (cashier_type=="quick_service" || cashier_type=="food_court") {
-                window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
-              }else{
-                 window.location.href = '/origami/table/' + table_id;
-              } 
-               
-            }
-        });
-    })
-
-    $( "input" ).focusin(function() {
-      $('.addfocus').removeClass('addfocus'); 
-      $( this ).addClass('addfocus');
+    setHeaderBreadCrumb(_SALE_EDIT_);
+    $('.editModal').on('click', function () {
+      $("#action").attr('data-type', $(this).attr('data-type'));
+      $("#action").attr('data-id', $(this).attr('data-id'));
+      $("#action").text($(this).attr('data-type'))
     });
 
-    $(".cashier_number").on('click', function(event){
-      if(event.handled !== true) {
-        
-        var original_value='';
-        original_value = $('.addfocus').val();
-
-        var input_type = $(this).attr("data-type");
-
-        switch (input_type) {
-          case 'num':
-          var input_value = $(this).attr("data-value");         
-          if (original_value == "0.0"){
-            $('.addfocus').val(input_value);            
-          }
-          else{
-            $('.addfocus').val(original_value + '' + input_value);            
-          }
-          break;
-
-          case 'add':
-          var input_value = $(this).attr("data-value");
-          amount = parseInt(input_value);
-          $('.addfocus').val(amount);                   
-          break;
-
-          case 'del' :
-          var discount_text=$('.addfocus').val();
-          $('.addfocus').val(discount_text.substr(0,discount_text.length-1));   
-          break;
-
-          case 'clr':
-          $('.addfocus').val("");              
-          break;
+    $(".update").on('click', function () {
+      var sale_item_id = $(this).attr('data-id');
+      var qty          = $('#' + sale_item_id + "_qty").val();
+      var price        = $('#' + sale_item_id + "_price").val();
+      var qty_status = true;
+      var price_status = true;
+      if((qty > 0) && (price > 0)){
+        qty_status = true;
+        price_status = true;
+        $('#' + sale_item_id + "_qtyErr").html("");
+        $('#' + sale_item_id + "_priceErr").html("");
+      }else if((qty > 0) && (price <= 0 || price == '')){
+        price_status = false;
+        $('#' + sale_item_id + "_qtyErr").html("");
+        if(price == ''){
+          $('#' + sale_item_id + "_priceErr").html("can't be blank");
+        }else{
+          $('#' + sale_item_id + "_price").val("");
+          $('#' + sale_item_id + "_priceErr").html("Price must be greater than 0");
         }
-        event.handled = true;
-      } else {
-        return false;
+      }else if((qty <= 0 || qty == '') && (price > 0)){
+        qty_status = false;
+        if(qty == ''){
+          $('#' + sale_item_id + "_qtyErr").html("can't be blank");
+        }else{
+          $('#' + sale_item_id + "_qty").val("");
+          $('#' + sale_item_id + "_qtyErr").html("Quantity must be greater than 0");
+        }
+
+        $('#' + sale_item_id + "_priceErr").html("");
+      }else{
+        qty_status = false;
+        price_status = false;
+        $('#' + sale_item_id + "_qtyErr").html("can't be blank");
+        $('#' + sale_item_id + "_priceErr").html("can't be blank");
+      }
+
+      if(qty_status && price_status){
+        var ajax_url      = "/origami/item_edit";
+        $.ajax({
+          type: "POST",
+          url: ajax_url,
+          data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price+ "&access_code=" + access_code + "&type=" + cashier_type,
+          success: function (result) {
+            swal({
+              title: "Information!",
+              text: "Qty and Price was successfully Updated",
+            }, function () {
+              location.reload();
+            });
+          }
+        });
       }
     });
 
+    $('#action').on('click', function () {
+      $(this).attr("disabled", true);
+      var access_code  = localStorage.getItem("access_code");
+      var sale_item_id = $(this).attr('data-id');
+      var type       = $(this).attr('data-type');
+      var remark       = $("#remark").val();
+      if (type=='foc') {
+        var ajax_url = "/origami/item_foc";
+      }else{
+        var ajax_url = "/origami/item_void";
+      }
+
+      $.ajax({
+        type: "POST",
+        url: ajax_url,
+        data: 'sale_item_id=' + sale_item_id + "&remark=" + remark+ "&access_code=" + access_code + "&type=" + cashier_type,
+        success: function (result) {
+          location.reload();
+        }
+      });
+    })
+
+    $('.cancel').on('click', function () {
+      var sale_item_id = $(this).attr('data-id');
+      var ajax_url = "/origami/item_void_cancel";
+      $.ajax({
+        type: "POST",
+        url: ajax_url,
+        data: 'sale_item_id=' + sale_item_id + '&access_code=' + access_code + "&type=" + cashier_type,
+        success: function (result) {
+          location.reload();
+        }
+      });
+    })
+
+
+  })
+
+
+  $('#back').on('click', function () {
+    var table_id = '<%= @table_id %>'
+    var sale_id = "<%= @saleobj.sale_id %>"
+    if (cashier_type=="quick_service" || cashier_type == "food_court") {
+      window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+    }else{
+      window.location.href = '/origami/table/' + table_id;
+    }
+  })
+
+  $('#cancel_all_void').on('click', function () {
+    $(this).attr('disabled', true);
+    var sale_id = "<%= @saleobj.sale_id %>"
+    var ajax_url = "/origami/cancel_all_void";
+    $.ajax({
+      type: "POST",
+      url: ajax_url,
+      data: 'sale_id=' + sale_id +'&type='+cashier_type,
+      success: function (result) {
+        location.reload();
+      }
+    });
+  })
+
+  $('#apply').on('click', function () {
+    $(this).attr('disabled', true)
+    var sale_id = "<%= @saleobj.sale_id %>"
+    var ajax_url = "/origami/apply_void";
+    var table_id = '<%= @table_id %>'
+    $.ajax({
+      type: "POST",
+      url: ajax_url,
+      data: 'sale_id=' + sale_id+'&type='+cashier_type,
+      success: function (result) {
+        if (cashier_type=="quick_service" || cashier_type=="food_court") {
+          window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/';
+        }else{
+           window.location.href = '/origami/table/' + table_id;
+        }
+      }
+    });
+  })
+
+  $( "input" ).focusin(function() {
+    $('.addfocus').removeClass('addfocus');
+    $( this ).addClass('addfocus');
+  });
+
+  $(".cashier_number").on('click', function(event){
+    if(event.handled !== true) {
+      var original_value='';
+      original_value = $('.addfocus').val();
+
+      var input_type = $(this).attr("data-type");
+
+      switch (input_type) {
+        case 'num':
+        var input_value = $(this).attr("data-value");
+        if (original_value == "0.0"){
+          $('.addfocus').val(input_value);
+        }
+        else{
+          $('.addfocus').val(original_value + '' + input_value);
+        }
+        break;
+
+        case 'add':
+        var input_value = $(this).attr("data-value");
+        amount = parseInt(input_value);
+        $('.addfocus').val(amount);
+        break;
+
+        case 'del' :
+        var discount_text=$('.addfocus').val();
+        $('.addfocus').val(discount_text.substr(0,discount_text.length-1));
+        break;
+
+        case 'clr':
+        $('.addfocus').val("");
+        break;
+      }
+      event.handled = true;
+    } else {
+      return false;
+    }
+  });
+
   //check for isNumber
   function isNumberKey(evt) {
     var charCode = (evt.which) ? evt.which : event.keyCode;
@@ -412,16 +386,16 @@ var access_code  = localStorage.getItem("access_code");
       return false;
     } else {
       return true;
-    }      
+    }
   }
 
   function checkQuantity(obj_value,sale_item_id) {
-      if(obj_value == '0'){
-        $("#"+sale_item_id+"_qty").val('1');
-      }
+    if(obj_value == '0'){
+      $("#"+sale_item_id+"_qty").val('1');
+    }
   }
 
   function checkPrice(obj_value,sale_item_id) {
-      
+
   }
 </script>
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index cc033f9b..00f7ae60 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -188,8 +188,8 @@
               <thead>
                 <th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
                 <th><%= t("views.right_panel.detail.receipt_no") %></th>
-                <th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-                <th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>       
+                <th> <%= t :cashier %></th>
+                <th> <%= t :customer %></th>       
                 <th> <%= t("views.right_panel.detail.credit_amount") %> </th>
               </thead>
               <tbody class="tbd_credit_lists"></tbody>
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index ec529e8c..88f8545c 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -13,7 +13,7 @@
           <td><%= @shift.shift_started_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></td>
         </tr>
         <tr>
-          <td><%= t :cashier_name %></td>
+          <td><%= t :cashier %></td>
           <td><%= @shift.employee.name rescue ''%></td>
         </tr>
 
@@ -45,8 +45,8 @@
             </div>
             <div class="modal-body">
                <select class="form-control show-tick sel_com_port"  id="sel_com_port" >
-                 
-                </select>   
+
+                </select>
             </div>
             <div class="modal-footer  p-r-30">
                 <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
@@ -77,7 +77,7 @@
       return false;
     } else {
       return true;
-    }      
+    }
   }
 
   function greaterThanOne(val){
@@ -182,7 +182,7 @@
     if($("#loading_wrapper").is(':visible')){
       resMsg = code2lab.reqBankPayment(cmd_type, payment_type, 1, "", com_port);
     }
-    
+
     if(resMsg.includes("STATUS")){
       var jobj = $.parseJSON(resMsg);
 
diff --git a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
index 241e69df..337a50af 100755
--- a/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
@@ -20,7 +20,7 @@
 				</div>
 
 				<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-					<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+					<label class="font-14"><%= t :customer_name %></label>
 					<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 				</div>
 
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 6ffe0116..3cdf0b57 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -29,14 +29,13 @@
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 				  	<th><%= t("views.right_panel.detail.order_source") %></th>
-				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+				   	<th> <%= t :cashier %></th>
+				  	<th> <%= t :customer %></th>
 				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br>
-				  		<%= t("views.right_panel.detail.shift_name") %></th>
-				  	<th> <%= t :credit %> <%= t("views.right_panel.detail.receipt_date") %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br> <%= t :cashier_name %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <%= t("views.right_panel.detail.amount") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.shift_name") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.receipt_date") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t :cashier %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.amount") %></th>
 				</tr>
 			  </thead>
 			  <tbody>
diff --git a/app/views/reports/credit_payment/index.xls.erb b/app/views/reports/credit_payment/index.xls.erb
index e765af67..6dd15e55 100755
--- a/app/views/reports/credit_payment/index.xls.erb
+++ b/app/views/reports/credit_payment/index.xls.erb
@@ -20,14 +20,13 @@
 					<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 				  	<th> <%= t("views.right_panel.detail.receipt_no") %></th>
 				  	<th><%= t("views.right_panel.detail.order_source") %></th>
-				   	<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
-				  	<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+				   	<th> <%= t :cashier %></th>
+				  	<th> <%= t :customer %></th>
 				  	<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br>
-				  		<%= t("views.right_panel.detail.shift_name") %></th>
-				  	<th> <%= t :credit %> <%= t("views.right_panel.detail.receipt_date") %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <br> <%= t :cashier_name %></th>
-				  	<th> <%= t :credit %> <%= t :payment %> <%= t("views.right_panel.detail.amount") %></th>
+            <th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.shift_name") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.receipt_date") %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t :cashier %></th>
+				  	<th> <%= t :credit_payment %> <br> <%= t("views.right_panel.detail.amount") %></th>
 				</tr>
 			  </thead>
 			  <tbody>
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index 0d04d6ec..4f9f7e28 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -42,29 +42,18 @@
 								<th style='text-align:center;'><%= t("views.right_panel.detail.total_sales") %></th>
 								<% if @tax.blank? %>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.tax") %></th>
-								<% end %>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.net_sales") %></th>
+								<% end %>
+
 							</tr>
 						</thead>
 						<% unless @sale_data.blank? %>
 						<tbody>
 							<% void   = 0 %>
-							<% mpu    = 0 %>
-							<% master = 0 %>
-							<% visa   = 0 %>
-							<% jcb    = 0 %>
-							<% unionpay    	= 0 %>
-							<% alipay    	= 0 %>
-							<% paymal    	= 0 %>
-							<% dinga    	= 0 %>
-							<% junctionpay  = 0 %>
-							<% giftvoucher  = 0 %>
-							<% paypar = 0 %>
 							<% cash   = 0 %>
 							<% credit = 0 %>
 							<% foc    = 0 %>
 							<% discount = 0 %>
-							<% kbzpay = 0 %>
 							<% total    = 0 %>
 							<% grand_total = 0 %>
 							<% old_grand_total = 0 %>
@@ -105,8 +94,8 @@
 								<td style='text-align:right;'><%= number_format(sale[:total_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<% if @tax.blank? %>
 								<td style='text-align:right;'><%= number_format(sale[:tax], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								<% end %>
 								<td style='text-align:right;'><%= number_format(sale[:net_sale], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% end %>
 
 							</tr>
 							<% count = count + 1 %>
@@ -127,8 +116,10 @@
 								<td style='text-align:right;'><%= number_format(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(gross_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(total_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% if @tax.blank? %>
 								<td style='text-align:right;'><%= number_format(tax, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% end %>
 
 							</tr>
 							<tr style="font-weight:600;">
@@ -140,21 +131,21 @@
 								<% @tax.each do |tax|
 									total_tax += tax.tax_amount.to_f %>
 									<tr style="font-weight:600;">
-										<td colspan="<%= colspan %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-										<td colspan="2" style='text-align:right;'><%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
+										<td colspan="1" style='text-align:right;'><%= number_format(tax.tax_amount, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 								<% end %>
 								<% net = grand_total %>
 								<% net = net - rounding_adj%>
 								<% net = net - total_tax %>
 								<tr style="font-weight:600;">
-									<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td colspan="2" style='text-align:right;'><%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+									<td colspan="1" style='text-align:right;'><%= number_format(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 							<% else %>
 							<tr style="font-weight:600;">
-								<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-								<td colspan="2" style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<td colspan="<%= colspan + 2 %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
+								<td colspan="1" style='text-align:right;'><%= number_format(net_sale, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 							</tr>
 							<% end %>
 							</tbody>
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 6d6456bc..7c6ccd33 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -80,7 +80,7 @@
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t :cashier %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
diff --git a/app/views/reports/payment_method/index.xls.erb b/app/views/reports/payment_method/index.xls.erb
index ca543e0d..7bf1a7c2 100755
--- a/app/views/reports/payment_method/index.xls.erb
+++ b/app/views/reports/payment_method/index.xls.erb
@@ -66,7 +66,7 @@
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
-							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+							<th> <%= t :cashier %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t :customer %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index 96a6d4b8..07a9e357 100755
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -20,7 +20,7 @@
 		</div>
 
 		<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-			<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+			<label class="font-14"><%= t :customer_name %></label>
 			<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 		</div>
 
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 528768c9..0e2452ba 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -30,7 +30,7 @@
 							<% if @shift_data.employee %>
 							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
 							<% end %>
-							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 						</tr>
 						<% end %>
 
@@ -116,7 +116,7 @@
 						</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><b><%= number_format(total_sum, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_format(discount_amt, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
@@ -132,7 +132,7 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
 
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index c88c57a9..a83b3357 100755
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -90,8 +90,9 @@
 							<td><%= number_format(result.grand_total, precision: precision.to_i, delimiter: delimiter) rescue '-' %></td>
 						</tr>
 						<% end %>
+            <tr/>
 						<tr style="border-top:4px double #666;">
-							<td colspan="3">&nbsp;</td>
+							<td colspan="4">&nbsp;</td>
 							<td><b><%= number_format(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_format(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
               <% @tax_profiles.each do |tax| %>
@@ -105,22 +106,6 @@
 							<td><b><%= number_format(rounding_adj.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_format(grand_total.to_f, precision: precision.to_i, delimiter: delimiter) rescue '-' %></b></td>
 						</tr>
-						<tr>
-							<td colspan="3">&nbsp;</td>
-							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-
-							<% @tax_profiles.each do |tax| %>
-								<td><%= tax.name %></td>
-							<% end %>
-							<td><%= t("views.right_panel.detail.grand_total") %></td>
-							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>
-							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
-								<%= t("views.right_panel.detail.rnd_adj_sh") %>
-							</td>
-							<td>
-							</td>
-						</tr>
 					<%end%>
 					</tbody>
 				</table>
diff --git a/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb
index 56daeb30..44c48e6f 100755
--- a/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb
@@ -20,7 +20,7 @@
 		</div>
 
 		<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
-			<label class="font-14"><%= t("views.right_panel.detail.customer_name") %></label>
+			<label class="font-14"><%= t :customer_name %></label>
 			<input type="text" placeholder="Customer name" class="form-control m-t-3" name="customer" value="<%= params[:customer] %>" id="customer_filter" style="height: 32px;">
 		</div>
 
diff --git a/app/views/reports/receipt_no_detail/index.html.erb b/app/views/reports/receipt_no_detail/index.html.erb
index 7e7bb23c..0e99c4e9 100755
--- a/app/views/reports/receipt_no_detail/index.html.erb
+++ b/app/views/reports/receipt_no_detail/index.html.erb
@@ -30,7 +30,7 @@
 				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
 									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
 									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t :cashier %></b></th>
 									<th><b><%= t("views.right_panel.detail.table") %></b></th>
 					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
@@ -174,8 +174,8 @@
 											<td>&nbsp;</td>
 										</tr>
 									<% end %>
+									<tr><td colspan="6">&nbsp;</td></tr>
 								<% end %>
-
 						    <% end %>
 							<tr style="border-top:4px double #666;">
 								<td>&nbsp;</td>
@@ -185,7 +185,6 @@
 								<td><b>Total Nett</b> - <b><%= number_format(grand_total, precision: precision, delimiter: delimiter, strip_insignificant_zeros: strip_insignificant_zeros) %></b></td>
 								<td>&nbsp;</td>
 							</tr>
-
 						  </tbody>
 						</table>
 				</div>
diff --git a/app/views/reports/receipt_no_detail/index.xls.erb b/app/views/reports/receipt_no_detail/index.xls.erb
index 6d64ff9c..478a9285 100755
--- a/app/views/reports/receipt_no_detail/index.xls.erb
+++ b/app/views/reports/receipt_no_detail/index.xls.erb
@@ -28,7 +28,7 @@
 				        	<th><b><%= t("views.right_panel.detail.receipt_no") %></b></th>
 									<th><b><%= t("views.right_panel.detail.receipt_date") %></b></th>
 									<th><b><%= t("views.right_panel.detail.shift_name") %></b></th>
-									<th><b><%= t :cashier %> <%= t("views.right_panel.detail.name") %></b></th>
+									<th><b><%= t :cashier %></b></th>
 									<th><b><%= t("views.right_panel.detail.table") %></b></th>
 					        <th><b><%= t("views.right_panel.detail.revenue") %></b></th>
 								<th>&nbsp;</th>
@@ -75,7 +75,7 @@
 									</tr>
 								<% end %>
 
-								<tr><td colspan="5">&nbsp;</td></tr>
+								<tr><td colspan="6">&nbsp;</td></tr>
 
 								<%survey = Survey.find_by_receipt_no(result.receipt_no)%>
 								<% if !survey.nil?%>
@@ -173,8 +173,8 @@
 											<td>&nbsp;</td>
 										</tr>
 									<% end %>
+                  <tr><td colspan="6">&nbsp;</td></tr>
 								<% end %>
-
 						    <% end %>
 							<tr style="border-top:4px double #666;">
 								<td>&nbsp;</td>
@@ -184,10 +184,8 @@
 								<td><b>Total Nett</b> - <b><%= grand_total %></b></td>
 								<td>&nbsp;</td>
 							</tr>
-
 						  </tbody>
 						</table>
-
 				</div>
 			</div>
 		</div>
diff --git a/app/views/reports/saleitem/indexbackup.html.erb b/app/views/reports/saleitem/indexbackup.html.erb
deleted file mode 100644
index 54e10304..00000000
--- a/app/views/reports/saleitem/indexbackup.html.erb
+++ /dev/null
@@ -1,354 +0,0 @@
-<div class="page-header">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.sale_item_report") %></li>
-    <span class="float-right">
-      <%= link_to 'Back', dashboard_path %>
-    </span>
-  </ol>
-</div>
-<div class="row">
-	<div class="col-md-12">
-		<%= render :partial=>'shift_sale_report_filter',
-		:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
-
-		<hr />
-
-		<div class="text-right">
-			<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
-		</div>
-
-		<div class="margin-top-20">
-			<div class="card">
-				<div class="table-responsive">
-					<table class="table table-striped" id="items_table" border="0">
-						<thead>
-							<tr>
-								<th colspan="7"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
-							</tr>
-							<% if @shift_from %>
-							<tr>
-								<% if @shift_data.employee %>
-								<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-								<% end %>
-								<th colspan="7"> <%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
-							</tr>
-							<% end %>
-							<tr>
-								<th>&nbsp;</th>
-								<th><%= t("views.right_panel.header.menu_category") %></th>
-								<th><%= t("views.right_panel.detail.code") %></th>
-								<th><%= t("views.right_panel.detail.product") %></th>
-								<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></th>
-								<th><%= t("views.right_panel.detail.unit_price") %></th>
-								<th><%= t("views.right_panel.detail.revenue") %></th>
-							</tr>
-						</thead>
-						<tbody>
-							<% unless @sale_data.blank? %>
-							<% acc_arr = Array.new %>
-							<% cate_arr = Array.new %>
-
-							<% sub_qty = 0 %>
-							<% sub_total = 0 %>
-							<% other_sub_total = 0 %>
-							<% count = 0 %>
-							<% total_price = 0 %>
-							<% cate_count = 0 %>
-							<% acc_count = 0 %>
-							<% grand_total = 0 %>
-							<% total_qty = 0 %>
-							<% total_amount = 0 %>
-							<% discount = 0 %>
-							<% total_item_foc = 0 %>
-							<% total_item_dis = 0.0 %>
-							<% total_tax = 0 %>
-
-							<% @sale_data.each do |sale| %>
-							<!-- all total qty sum -->
-								<% if sale.status_type != "Discount" && sale.status_type != "foc"
-									total_qty += sale.total_item
-								end %>
-								<% if sale.status_type == "foc" && sale.price > 0
-									total_qty += sale.total_item
-								end %>
-							<!-- end all total qty -->
-								<% if sale.status_type == "foc" && sale.grand_total < 0
-									total_item_foc += sale.grand_total*(-1)
-								end %>
-
-								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
-									total_item_dis += sale.grand_total*(-1)
-								end %>
-
-								<% if !acc_arr.include?(sale.account_id) %>
-									<tr>
-										<td><b><%= sale.account_name %></b></td>
-										<td colspan="4">&nbsp;</td>
-										<td><%= t("views.right_panel.detail.total_price_by") %> <%= sale.account_name %></td>
-										<td>
-											<% @totalByAccount.each do |account, total| %>
-											<% if sale.account_id == account %>
-											<b><%= number_format(total, precision:precision.to_i,delimiter:delimiter) %></b>
-											<% grand_total += total %>
-											<% end %>
-											<% end %>
-										</td>
-									</tr>
-								   <% acc_arr.push(sale.account_id) %>
-								<% end %>
-								<tr>
-									<td>&nbsp;</td>
-									<% if !cate_arr.include?(sale.menu_category_id) %>
-									<td><%= sale.menu_category_name %></td>
-									<% cate_arr.push(sale.menu_category_id) %>
-									<% else %>
-									<td>&nbsp;</td>
-									<% end %>
-									<td><%= sale.item_code rescue '-' %></td>
-									<td><%= sale.product_name rescue '-' %></td>
-									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= number_format(sale.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td><%= number_format(sale.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								</tr>
-								<!-- sub total -->
-
-							<% @menu_cate_count.each do |key,value| %>
-								<% if sale.account_id == key %>
-								    <% count = count + 1 %>
-								    <% sub_total += sale.grand_total %>
-								    <% #sub_qty += sale.total_item %>
-								    <% if sale.status_type!="Discount" && (!sale.product_name.include? "FOC")
-										sub_qty += sale.total_item
-									end %>
-
-									<% if count == value %>
-										<tr>
-											<td colspan="3">&nbsp;</td>
-											<td><b>Total <%= sale.account_name %> Qty </b> </td>
-											<td><b><%= sub_qty %></b></td>
-											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%=  number_format(sub_total ,  precision:precision.to_i,delimiter:delimiter)%> </span></td>
-										</tr>
-										<% sub_total = 0.0%>
-										<% sub_qty = 0 %>
-										<% count = 0%>
-									<% end %>
-							    <% end %>
-							<% end %>
-							<!-- end sub total -->
-						<% end %>
-							<!--Other Charges -->
-							<% if @other_charges.present? %>
-							   <tr>
-									<td><b>Other Charges</b></td>
-									<td colspan="4">&nbsp;</td>
-									<td></td>
-								</tr>
-								<% @other_charges.each do |other| %>
-									<% if other.total_item > 0
-										total_qty += other.total_item
-									end %>
-									<% grand_total +=other.grand_total%>
-									<tr>
-									<td>&nbsp;</td>
-										<td>Other Charges</td>
-										<td><%= other.item_code rescue '-' %></td>
-										<td><%= other.product_name rescue '-' %></td>
-										<td><%= other.total_item rescue '-' %></td>
-										<td> <%= number_format(other.unit_price ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-										<td> <%= number_format(other.grand_total ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									</tr>
-									<!-- sub total -->
-
-									    <% other_sub_total += other.grand_total %>
-								    <!-- end sub total -->
-								<% end %>
-								<tr>
-									<td colspan="5">&nbsp;</td>
-									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%=  number_format(other_sub_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
-								</tr>
-						    <%end%>
-							<!-- End Other Charges -->
-							<tr style="border-top:2px solid grey;">
-								<td colspan="3">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
-								<td><span><%= total_qty%></span></td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_format(grand_total ,  precision:precision.to_i,delimiter:delimiter)%></span></td>
-							</tr>
-							<% end %>
-
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= number_format(total_item_foc ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= number_format(total_item_dis ,  precision:precision.to_i,delimiter:delimiter) %></span></td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td>
-									<span><%= number_format(@foc_data,  precision:precision.to_i, delimiter:delimiter) %></span>
-								</td>
-							</tr>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;">
-									<span>
-										<%= number_format(@discount_data ,  precision: precision.to_i,delimiter: delimiter) %>
-									</span>
-								</td>
-							</tr>
-
-								<% @sale_taxes.each do |tax| %>
-								<!-- <tr>
-								    <td colspan="5">&nbsp;</td>
-									<td><%= tax.tax_name %></td>
-									<td><%= tax.st_amount.round(2) %>
-										<%total_tax += tax.st_amount%>
-									</td>
-								</tr> -->
-							<% end %>
-							<tr>
-								<td colspan="5">&nbsp;</td>
-								<td style="border-top:2px solid grey;">Net Amount</td>
-								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= number_format(grand_total.to_f - @discount_data.to_f ,  precision:precision.to_i,delimiter:delimiter)%></td>
-							</tr>
-							<!-- <tr>
-								<td colspan="5">&nbsp;</td>
-								<td>Grand Total</td>
-
-								<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
-							</tr>	 -->
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-	$(function(){
-
-
-		var check_arr = [];
-
-		var search = '<%= params[:period_type] %>';
-
-		if(search){
-
-			if(parseInt(search) == 0){
-				search_by_period();
-			}
-			else{
-				search_by_date();
-			}
-		}else{
-			search_by_period();
-		}
-
-		$('#sel_period').change(function(){
-			search_by_period();
-		});
-
-		function search_by_period(){
-			var period = $('#sel_period').val();
-			var period_type = 0;
-			var from = "";
-			var to = "";
-
-			show_shift_name(period,period_type,from,to,'shift_item');
-		}
-
-		// OK button is clicked
-		$('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#from').val(from)
-			search_by_date();
-		});
-		$('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){
-			new_date = new Date(date) ;
-			month    = parseInt(new_date.getMonth()+1)
-			to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear();
-			$('#to').val(to)
-			search_by_date();
-		});
-
-		function search_by_date(){
-			from = $("#from").val();
-	  		to   = $("#to").val();
-			var period = 0;
-			var period_type = 1;
-
-			if(to != '' && from != ''){
-				shift_name = from + ',' + to;
-
-				check_arr.push(to);
-
-				console.log(check_arr.length)
-				if(check_arr.length == 1){
-					show_shift_name(period,period_type,from,to,'shift_item');
-				}
-				if(check_arr.length == 3){
-					check_arr = [];
-				}
-			}
-
-		}
-
-		function show_shift_name(period,period_type,from,to,shift_item){
-			var shift = $('#shift_name');
-			if (from == '' && to == '') {
-				from = $("#from").val();
-	  		    to   = $("#to").val();
-			}
-			shift.empty();
-			var selected = '';
-			var str = '';
-			var param_shift = '<%= params[:shift_name]%>';
-
-			url = '<%= reports_get_shift_by_date_path %>';
-			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
-				console.log(data)
-
-				str = '<option value="0">--- All Shift ---</option>';
-				$(data.message).each(function(index){
-
-					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
-					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
-					var shift_id = data.message[index].shift_id ;
-
-					if(param_shift != ''){
-						if(shift_id == param_shift){
-							selected = 'selected = "selected"';
-						}
-						else{
-							selected = '';
-						}
-					}
-					else{
-						selected = '';
-					}
-
-
-					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
-
-			   // console.log(sh_date)
-			})
-				shift.append(str);
-			});
-		}
-
-	});
-</script>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index e947ca1c..0a0162cd 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -41,7 +41,7 @@
 					<% end %>
 					<tr>
 						<th><%= t("views.right_panel.detail.cashier_station") %></th>
-						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+						<th><%= t :cashier %></th>
 						<th><%= t("views.right_panel.detail.shift_name") %></th>
 						<!-- <th>Void Amount</th> -->
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
diff --git a/app/views/reports/shiftsale/index.xls.erb b/app/views/reports/shiftsale/index.xls.erb
index 46fe502d..4d886560 100755
--- a/app/views/reports/shiftsale/index.xls.erb
+++ b/app/views/reports/shiftsale/index.xls.erb
@@ -32,7 +32,7 @@
 					<% end %>	  
 					<tr>
 						<th><%= t("views.right_panel.detail.cashier_station") %></th>
-						<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
+						<th><%= t :cashier %></th>
 						<th><%= t("views.right_panel.detail.shift_name") %></th>		
 						<!-- <th>Void Amount</th> -->
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
diff --git a/app/views/reports/void_sale/index.xls.erb b/app/views/reports/void_sale/index.xls.erb
index 587ca509..25806ff8 100755
--- a/app/views/reports/void_sale/index.xls.erb
+++ b/app/views/reports/void_sale/index.xls.erb
@@ -19,19 +19,19 @@
 						<% end %>
 						<% if @shift_from %>
 						<tr>
-							<% if @shift %>		
+							<% if @shift %>
 							<% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %>
-							<% end %>	
+							<% end %>
 							<th colspan="3"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
 						</tr>
-						<% end %>		  
+						<% end %>
 						<tr>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t("views.right_panel.detail.sale_date") %></th>
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
 							<th><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>			
+							<th><%= t("views.right_panel.detail.grand_total") %> + <br/><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
 							<!-- <th>Sale Status</th> -->
 						</tr>
 					</thead>
@@ -48,7 +48,7 @@
 							<td><%= item.total_amount.to_f  rescue '-'%> </td>
 							<td><%= item.grand_total.to_f  rescue '-'%> </td>
 							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>
 							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
 							<!-- <td><%= item.remarks rescue '-' %> </td> -->
 						</tr>
@@ -63,7 +63,7 @@
 							<td><%= total_amount rescue '-' %></td>
 							<td><%= grand_total rescue '-' %></td>
 							<td><%= rounding_adjustment  rescue '-'%></td>
-							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+							<td colspan="1"><%= grand_rounding_adjustment  rescue '-'%></td>
 						</tr>
 					</tbody>
 				</table>
@@ -71,4 +71,4 @@
 			</div>
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/transactions/bookings/indexback.html.erb b/app/views/transactions/bookings/indexback.html.erb
deleted file mode 100755
index fe8c820a..00000000
--- a/app/views/transactions/bookings/indexback.html.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>
diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb
index 1aed10b5..675d87e2 100755
--- a/app/views/transactions/credit_notes/index.html.erb
+++ b/app/views/transactions/credit_notes/index.html.erb
@@ -77,7 +77,7 @@
                   <th><%= t("views.right_panel.detail.receipt_no") %></th>
                   <th><%= t("views.right_panel.detail.credit_amount") %></th>
                   <th><%= t :cashier %></th>
-                  <th><%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
+                  <th><%= t :customer %></th>
                   <th><%= t("views.right_panel.detail.order_source") %></th>
                   <th><%= t("views.right_panel.detail.receipt_date") %></th>
                 </tr>
diff --git a/app/views/transactions/sales/indexback.html.erb b/app/views/transactions/sales/indexback.html.erb
deleted file mode 100755
index fe8c820a..00000000
--- a/app/views/transactions/sales/indexback.html.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>
diff --git a/app/views/transactions/shift_sales/indexback.html.erb b/app/views/transactions/shift_sales/indexback.html.erb
deleted file mode 100755
index fe8c820a..00000000
--- a/app/views/transactions/shift_sales/indexback.html.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1><%= t("views.right_panel.header.transactions_sales") %></h1>
-
-<table>
-  <thead>
-    <tr>
-      <th><%= t :cashier %></th>
-      <th><%= t :cashier %> <%= t("views.right_panel.detail.name_txt2") %></th>
-      <th><%= t("views.right_panel.detail.requested_by") %></th>
-      <th><%= t("views.right_panel.detail.requested_at") %></th>
-      <th><%= t("views.right_panel.detail.receipt_no") %></th>
-      <th><%= t("views.right_panel.detail.receipt_date") %></th>
-      <th><%= t :customer %></th>
-      <th><%= t("views.right_panel.detail.payment_status") %></th>
-      <th><%= t("views.right_panel.detail.sale_status") %></th>
-      <th><%= t("views.right_panel.detail.total_amount") %></th>
-      <th><%= t("views.right_panel.detail.total_discount") %></th>
-      <th><%= t("views.right_panel.detail.total_tax") %></th>
-      <th><%= t("views.right_panel.detail.tax_type") %></th>
-      <th><%= t("views.right_panel.detail.grand_total") %></th>
-      <th><%= t("views.right_panel.detail.rnd_adj") %></th>
-      <th><%= t("views.right_panel.detail.amt_received") %></th>
-      <th><%= t("views.right_panel.detail.amt_changed") %></th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @transactions_sales.each do |transactions_sale| %>
-      <tr>
-        <td><%= transactions_sale.cashier %></td>
-        <td><%= transactions_sale.cashier_name %></td>
-        <td><%= transactions_sale.requested_by %></td>
-        <td><%= transactions_sale.requested_at %></td>
-        <td><%= transactions_sale.receipt_no %></td>
-        <td><%= transactions_sale.receipt_date %></td>
-        <td><%= transactions_sale.customer %></td>
-        <td><%= transactions_sale.payment_status %></td>
-        <td><%= transactions_sale.sale_status %></td>
-        <td><%= transactions_sale.total_amount %></td>
-        <td><%= transactions_sale.total_discount %></td>
-        <td><%= transactions_sale.total_tax %></td>
-        <td><%= transactions_sale.tax_type %></td>
-        <td><%= transactions_sale.grand_total %></td>
-        <td><%= transactions_sale.rounding_adjustment %></td>
-        <td><%= transactions_sale.amount_received %></td>
-        <td><%= transactions_sale.amount_changed %></td>
-        <td><%= link_to t("views.btn.show"), transactions_sale %></td>
-        <td><%= link_to t("views.btn.edit"), edit_transactions_sale_path(transactions_sale) %></td>
-        <td><%= link_to t("views.btn.delete"), transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Transactions Sale', new_transactions_sale_path %>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 3de08ef0..f50f7189 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -96,7 +96,7 @@ class ActionController::API
   private
 
   def lookup_domain
-    if ENV["SERVER_CODE"] == "cloud" && request.subdomains.last && request.subdomains.last != "www"
+    if ENV["SERVER_MODE"] == "cloud" && request.subdomains.last && request.subdomains.last != "www"
       if license = cache_license # request.subdomain.downcase
         logger.info "Location - " + license.dbschema
         ActiveRecord::Base.establish_connection(website_connection(license))
diff --git a/config/routes.rb b/config/routes.rb
index 421fd099..ebb27df8 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,6 +88,8 @@ scope "(:locale)", locale: /en|mm/ do
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]
     resources :customers
+    # get customer by phone
+    get "get_customer_by_phone" => "customers#get_customer_by_phone"
     #get customer details by order items
     get "customers/get_order/:id" => "customers#get_customer_order"