diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index c9b1bc44..c71199e9 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -103,10 +103,15 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
      }
 
     # begin
+    if params[:order_source] == "quick_service"
+      customer_id = "CUS-000000000002" # for no customer id from mobile
+    else
+      customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    end
     @order = Order.new
     @order.source = params[:order_source]
     @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    @order.customer_id = customer_id
     @order.items = items_arr
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d544c908..4b70f0b6 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -204,15 +204,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       if count == 1
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf"
-        if printed_status != 'Paid'
+        # if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name)
-        end
+        # end
       else
         filename = "/receipts/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
         pdf.render_file directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf"
-        if printed_status != 'Paid'
+        # if printed_status != 'Paid'
           self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name)
-        end
+        # end
       end
 
       count -= 1
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d07da974..f3fe9e40 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -16,7 +16,11 @@
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
             <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
-                <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% if current_login_employee.role != "cashier" %>
+                    <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                <% else %>
+                    <a class="navbar-brand" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
+                <% end %>
             <% else %>
                 <a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
             <%end%>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c233a63c..eade87e1 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -462,11 +462,11 @@ var customer_id = "<%= @customer.id %>";
 var customer_name = "<%= @customer.name %>";
   $(document).ready(function(){
     //start customer modal popup
-    if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
-      if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
-        $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
-      }
-    }
+    // if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
+    //   if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){
+    //     $("#is_memberModal").modal({show : true, backdrop: false, keyboard : false});
+    //   }
+    // }
 
     /* start check first bill or not*/
         var member_id = $('#membership_id').text();
@@ -594,53 +594,53 @@ var customer_name = "<%= @customer.name %>";
                 $("#loading_wrapper" ).hide();
 
                 //PDF lightbox data
-                $("#sale_receipt_no").val(result.receipt_no);
-                $("#filename").val(result.filename);
-                $("#printer_name").val(result.printer_name);
-                $("#receipt_pdf").attr("src", result.filename);
-                $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
-                $("#pdfModalLabel").text("Payment Successful!");
-                $("#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 %>
-                }
-                //PDF lightbox data 
+                // $("#sale_receipt_no").val(result.receipt_no);
+                // $("#filename").val(result.filename);
+                // $("#printer_name").val(result.printer_name);
+                // $("#receipt_pdf").attr("src", result.filename);
+                // $("#pdfModal").modal({show : true, backdrop : false, keyboard : false});
+                // $("#pdfModalLabel").text("Payment Successful!");
+                // $("#changed_amount").text("");
                 // if($('#balance').text() < 0){
-                //   swal({
-                //     title: "Payment Successful!",
-                //     text: 'Changed amount  ' + $('#balance').text() * (-1),
-                //     html: true,
-                //     closeOnConfirm: false,
-                //     closeOnCancel: false,
-                //     allowOutsideClick: false
-                //   }, function () {
-                //     // if (cashier_type=="cashier") {
-                //     //   window.location.href = '/origami';
-                //     // }else{
-                //     //   window.location.href = '/origami/quick_service';
-                //     // }           
-                //   });
-                // }else{         
-                //   $('#pay').text("Pay");
-                //   swal({
-                //    title: "Payment Successful!",
-                //    text: 'Thank You !',
-                //    html: true,
-                //    closeOnConfirm: false, 
-                //    closeOnCancel: false,
-                //    allowOutsideClick: false
-                //  }, function () {
-                //   // if (cashier_type=="cashier") {
-                //   //   window.location.href = '/origami';
-                //   // }else{
-                //   //   window.location.href = '/origami/quick_service';
-                //   // }                
-                // });
+                //   <% 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 %>
                 // }
+                //PDF lightbox data 
+                if($('#balance').text() < 0){
+                  swal({
+                    title: "Payment Successful!",
+                    text: 'Changed amount  ' + $('#balance').text() * (-1),
+                    html: true,
+                    closeOnConfirm: false,
+                    closeOnCancel: false,
+                    allowOutsideClick: false
+                  }, function () {
+                    if (cashier_type=="cashier") {
+                      window.location.href = '/origami';
+                    }else{
+                      window.location.href = '/origami/quick_service';
+                    }           
+                  });
+                }else{         
+                  $('#pay').text("Pay");
+                  swal({
+                   title: "Payment Successful!",
+                   text: 'Thank You !',
+                   html: true,
+                   closeOnConfirm: false, 
+                   closeOnCancel: false,
+                   allowOutsideClick: false
+                 }, function () {
+                  if (cashier_type=="cashier") {
+                    window.location.href = '/origami';
+                  }else{
+                    window.location.href = '/origami/quick_service';
+                  }                
+                });
+                }
               }
             });
           }