update qurick raw

app/models/order.rb

@@ -203,8 +203,6 @@ class Order < ApplicationRecord
   def re_order_items(form_items) #reorder inputs items as parents and child
     parent_id = Array.new
     parents = Array.new
-    puts form_items
-    puts "hhhhh"
     parents_and_children_items = Array.new
 
     new_items_list = Array.new

app/models/sale.rb

@@ -137,6 +137,41 @@ class Sale < ApplicationRecord
 
   end
 
+  #fOR Quick Service pay and create
+  def self.request_bill(order,current_user,current_login_employee)
+    @sale = Sale.new
+        sale_order=SaleOrder.new
+
+        if shift = ShiftSale.current_open_shift(current_user.id)
+          order_id = order.order_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)
+            @sale_data = Sale.find_by_sale_id(@sale_id)
+            @sale_items = SaleItem.where("sale_id=?",@sale_id)
+          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
+          @sale_data.shift_sale_id = shift.id
+          @sale_data.save
+
+          # Promotion Activation
+          Promotion.promo_activate(@sale)
+          @status = true
+          return @status, @sale
+        else
+          @status = false
+          @message = "No Current Open Shift for This Employee"
+        end
+  end
   #This is when spilt bill is request - then we cannot link order to invoice
   #Cos there will be multiple orders - and items are spilt from there.
   #Unless order is spilt by then it is possible.

app/models/sale_payment.rb

@@ -335,7 +335,7 @@ class SalePayment < ApplicationRecord
         
          #record an payment in sale-audit
          remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} "
-         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
+         sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1)
 
         if !response.nil?
           if response["status"] == true