SQA feedback

app/models/order.rb

@@ -71,9 +71,9 @@ class Order < ApplicationRecord
       BookingOrder.create({:booking_id => booking.booking_id, :order => self})
 
       #Send order to queue one it done!
-      if self.source != "quick_service"
+      # if self.source != "quick_service"
         process_order_queue
-      end      
+      # end      
 
       #send order to broadcast job
       send_order_broadcast(booking)
@@ -297,7 +297,7 @@ class Order < ApplicationRecord
       else
         if order
           oqs = OrderQueueStation.new
-          oqs.process_order(order, self.table_id)
+          oqs.process_order(order, self.table_id, self.source)
         end
         assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
         ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
@@ -313,7 +313,7 @@ class Order < ApplicationRecord
         else
           if order
             oqs = OrderQueueStation.new
-            oqs.process_order(order, self.table_id)
+            oqs.process_order(order, self.table_id, self.source)
           end
           assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
           ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
@@ -326,7 +326,7 @@ class Order < ApplicationRecord
           else
             if order
               oqs = OrderQueueStation.new
-              oqs.process_order(order, self.table_id)
+              oqs.process_order(order, self.table_id, self.source)
             end
             assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
             ActionCable.server.broadcast "order_queue_station_channel",order: assign_order

app/models/order_queue_station.rb

@@ -101,6 +101,80 @@ class OrderQueueStation < ApplicationRecord
     end #end else  
   end
 
+  def pay_process_order_queue (order_id, table_id)    
+
+    oqs_stations = OrderQueueStation.active
+    
+    order = Order.find(order_id)
+    order_items = order.order_items
+
+    if table_id.to_i > 0
+      # get dining    
+      dining = DiningFacility.find(table_id)    
+      oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}")
+      booking = Booking.find_by_dining_facility_id(dining.id)    
+             
+      # ToDo per item per printer
+
+      oqs_by_zones.each do |oqpbz|
+        oqs = OrderQueueStation.find(oqpbz.order_queue_station_id)
+        is_auto_printed = false  
+        oqs_order_items = []
+
+        if oqs.is_active
+          #Get List of items -
+          pq_items = JSON.parse(oqs.processing_items)
+          #Loop through the processing items
+          pq_items.each do |pq_item|
+            #Processing through the looping items
+            order_items.each  do |order_item|
+              if (pq_item == order_item.item_code)
+               if (order_item.qty > 0)
+                oqs_order_items.push(order_item)
+               end                                      
+              end
+            end
+          end
+          
+          if oqs.auto_print
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+      end
+    else
+      oqs_stations.each do |oqs|
+        is_auto_printed = false  
+        oqs_order_items = []
+
+        if oqs.is_active
+          #Get List of items -
+          pq_items = JSON.parse(oqs.processing_items)
+          #Loop through the processing items
+          pq_items.each do |pq_item|
+            #Processing through the looping items
+            order_items.each  do |order_item|
+              if (pq_item == order_item.item_code)      
+                if (order_item.qty > 0)
+                  oqs_order_items.push(order_item)
+                end                                      
+              end
+            end
+          end
+          
+          if oqs.auto_print
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+      end
+    end #end else  
+  end
+
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)

app/models/sale_payment.rb

@@ -325,6 +325,7 @@ class SalePayment < ApplicationRecord
     sObj = Sale.find(self.sale_id)
     is_credit = 0
     is_foc    = 0
+    is_cash   = false
     sObj.sale_payments.each do |spay|
         all_received_amount += spay.payment_amount.to_f
         if spay.payment_method == "creditnote"
@@ -333,8 +334,12 @@ class SalePayment < ApplicationRecord
         if spay.payment_method == "foc"
           is_foc = 1
         end
+        if spay.payment_method.to_s == "cash"
+          is_cash = true
+        end
     end
-    if (self.sale.grand_total <= all_received_amount)
+
+    if (self.sale.grand_total <= all_received_amount) && is_cash
       if is_credit == 0
         self.sale.payment_status = "paid"
       else
@@ -374,11 +379,15 @@ class SalePayment < ApplicationRecord
       end
 
       self.sale.save!
-      table_update_status(sObj)
       
       if check_foc
+        table_update_status(sObj)
         update_shift
       elsif paid_amount.to_f > 0 #|| paid_amount != "0.0"
+        table_update_status(sObj)
+        update_shift
+      elsif is_cash && paid_amount.to_f == 0
+        table_update_status(sObj)
         update_shift
       end
     end