remove conflict

app/models/sale.rb

@@ -87,6 +87,16 @@ class Sale < ApplicationRecord
         table = DiningFacility.find(booking.dining_facility_id)
         cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
         shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first
+        #for multiple zone with terminal
+        if shift.nil?
+          multiple_zone = CashierTerminalByZone.where("zone_id = #{table.zone_id}")
+          multiple_zone.each do |zone|
+            shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{zone.cashier_terminal_id}").first
+            if !shift.nil? then
+              break
+            end
+          end
+        end
       else
         open_cashier = Employee.where("role = 'cashier' AND token_session <> ''")
         current_shift = ShiftSale.current_shift