fix first bill amount less than actual sales

app/controllers/origami/request_bills_controller.rb

@@ -1,6 +1,6 @@
 class Origami::RequestBillsController < ApplicationController
   before_action :check_user
- 
+
   def check_user
     if current_user.nil?
       redirect_to root_path
@@ -8,43 +8,30 @@ class Origami::RequestBillsController < ApplicationController
   end
   # Print Request Bill and add to sale tables
   def print
-    @sale = Sale.new
-    sale_order=SaleOrder.new
-
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
-      bk_order = BookingOrder.find_by_order_id(order_id)
       order = Order.find(order_id)
-      check_booking = Booking.find_by_booking_id(bk_order.booking_id)
-      if check_booking.checkin_at.utc.strftime("%Y-%m-%d %H:%M") > Time.now.utc.strftime("%Y-%m-%d %H:%M") && check_booking.checkout_at.nil?
+      booking = order.booking
+      if booking.checkin_at.utc > Time.now.utc && booking.checkout_at.nil?
         @status = false
         @error_message = "Operation failed, Could not request bill!"
       else
-        if check_booking.dining_facility_id.to_i > 0
-          table = DiningFacility.find(check_booking.dining_facility_id)
-        else
-          table = nil
-        end
-        
-        if check_booking.sale_id.nil?
-          # Create Sale if it doesn't exist
-          @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source, params[:current_checkin_induties_count])
-          @sale_data = Sale.find_by_sale_id(@sale_id)
-          @sale_items = SaleItem.where("sale_id=?",@sale_id)
+        table = DiningFacility.find(booking.dining_facility_id)
 
+        if sale_data = booking.sale
+          @status = true
+        elsif sale_data = Sale.generate_invoice_from_booking(booking, current_login_employee, current_user, order.source, params[:current_checkin_induties_count])
+          @status = true
           # in-duty update
-          in_duties = InDuty.where("booking_id=?",bk_order.booking_id)
+          in_duties = InDuty.where("booking_id=?", booking.id)
           if !in_duties.empty?
             in_duties.each do |in_duty|
               induty = InDuty.find(in_duty.id)
-              induty.sale_id = @sale_id
-              induty.out_time =Time.now.utc
+              induty.sale_id = sale_data.sale_id
+              induty.out_time = Time.now.utc
               induty.save
             end
           end
-        else
-          @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
-          @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
         end
 
         # Bind shift sale id to sale
@@ -53,17 +40,17 @@ class Origami::RequestBillsController < ApplicationController
 
         action_by = current_user.name
         type = "REQUEST_BILL"
-        
-        remark = "Request bill Receipt No #{@sale_data.receipt_no}"
-        sale_audit = SaleAudit.record_audit_sale(@sale_data.sale_id,remark,action_by,type )
+
+        remark = "Request bill Receipt No #{sale_data.receipt_no}"
+        sale_audit = SaleAudit.record_audit_sale(sale_data.sale_id,remark,action_by,type )
 
         # Promotion Activation
-        Promotion.promo_activate(@sale)
+        Promotion.promo_activate(sale_data)
 
-        #bill channel      
+        #bill channel
         if ENV["SERVER_MODE"] == 'cloud'
           from = request.subdomain  + "." + request.domain
-        else 
+        else
           from = ""
         end
 
@@ -71,30 +58,30 @@ class Origami::RequestBillsController < ApplicationController
           ActionCable.server.broadcast "bill_channel",table: table, from: from
         end
         if order.source == "quick_service" || order.source == "food_court"
-          result = {:status=> @status, :data => @sale.sale_id }
+          result = {:status=> @status, :data => sale_data.sale_id }
           render :json => result.to_json
         else
           #check checkInOut pdf print
-          check_booking = Booking.find_by_sale_id(@sale_id)
           checkout_time = Lookup.collection_of('checkout_time')
-          if !check_booking.dining_facility_id.nil?
-            terminal = DiningFacility.find_by_id(check_booking.dining_facility_id)
+          if !booking.dining_facility_id.nil?
+            terminal = DiningFacility.find_by_id(booking.dining_facility_id)
             cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id)
 
             if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server
-              unique_code = "CheckInOutPdf"        
+              unique_code = "CheckInOutPdf"
               printer = PrintSetting.find_by_unique_code(unique_code)
 
-              # print when complete click 
+              # print when complete click
               order_queue_printer = Printer::OrderQueuePrinter.new(printer)
 
               if !printer.nil?
-                order_queue_printer.print_check_in_out(printer, cashier_terminal, check_booking, table)
+                order_queue_printer.print_check_in_out(printer, cashier_terminal, booking, table)
               end
-            end     
-          end     
+            end
+          end
         end
       end
+      @status = true
     else
       @status = false
       @error_message = "No Current Open Shift for This Employee"