diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index cefa64fb..b9b03c3e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -102,7 +102,7 @@ $(function() {
             instances = menu_items[field].instances ;
 
             if (!instances.length > 0) {
-              swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
+              swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
             }
             if (instances.length > 0) {
               qty = 1;
diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb
index 4b58e52d..c12eb596 100755
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -6,7 +6,8 @@ class Api::BillController < Api::ApiController
     @status = false
     @error_message = "Order ID or Booking ID is require to request for a bill."
 
-    if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    # if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id)
+    if !ShiftSale.current_shift.nil?
     #create Bill by Booking ID
       table = 0
       if (params[:booking_id])
@@ -41,8 +42,8 @@ class Api::BillController < Api::ApiController
       end
     
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift_by_terminal.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift_by_terminal.id
+      # @sale_data.save
 
       Promotion.promo_activate(@sale)
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e66d7700..9d947cc1 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -92,6 +92,11 @@ class ApplicationController < ActionController::Base
     @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
   end
 
+  #  Get current Cashier
+  def get_cashier
+    @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+  end
+
   def current_company
     begin
      return Company.first
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index e0f1d06c..39ef789a 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -5,16 +5,15 @@ class Origami::RequestBillsController < ApplicationController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    if shift = ShiftSale.current_open_shift(current_user.id)
+    # if shift = ShiftSale.current_open_shift(current_user.id)SSS
+    if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
       check_booking = Booking.find_by_booking_id(bk_order.booking_id)
       
       if check_booking.sale_id.nil?
         # Create Sale if it doesn't exist
-        # puts "current_login_employee"
-        # puts current_login_employee.name
-        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
+        @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user)
         @sale_data = Sale.find_by_sale_id(@sale_id)
         @sale_items = SaleItem.where("sale_id=?",@sale_id)
       else
@@ -23,8 +22,8 @@ class Origami::RequestBillsController < ApplicationController
       end
 
       # Bind shift sale id to sale
-      @sale_data.shift_sale_id = shift.id
-      @sale_data.save
+      # @sale_data.shift_sale_id = shift.id
+      # @sale_data.save
 
       # Promotion Activation
       Promotion.promo_activate(@sale)
@@ -55,4 +54,10 @@ class Origami::RequestBillsController < ApplicationController
 
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
+
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.first
+  end  
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 3e9bbdaa..a3b23948 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -78,12 +78,25 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier
-      if cashier != nil
+      open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
+      current_shift = ShiftSale.current_shift
+      shift = ShiftSale.current_open_shift(cashier.id)
+
+      # set cashier
+      if shift != nil
         self.cashier_id = cashier.id
         self.cashier_name = cashier.name
+        self.shift_sale_id = shift.id
       else
-        self.cashier_id = requested_by.id
-        self.cashier_name = requested_by.name
+        if open_cashier.nil?
+          self.cashier_id   = requested_by.id
+          self.cashier_name = requested_by.name
+          self.shift_sale_id = current_shift.id
+        else
+          self.cashier_id   = current_shift.employee_id
+          self.cashier_name = Employee.find(current_shift.employee_id).name
+          self.shift_sale_id = current_shift.id
+        end
       end
 
       # set waiter
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 96f69da9..1dbe960f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -396,7 +396,7 @@
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(2));
+          $('#cash').text(parseFloat(amt).toFixed(1));
           update_balance();
         break;
       }
@@ -485,7 +485,7 @@
                 $( "#loading_wrapper" ).hide();
                 if($('#balance').text() < 0){
                   swal({
-                    title: "Information!",
+                    title: "Payment Successful!",
                     text: 'Changed amount  ' + $('#balance').text() * (-1),
                     html: true,
                     closeOnConfirm: false,
@@ -497,7 +497,7 @@
                 }else{         
                   $('#pay').text("Pay");
                   swal({
-                   title: "Information!",
+                   title: "Payment Successful!",
                    text: 'Thank You !',
                    html: true,
                    closeOnConfirm: false,