Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

app/models/sale.rb

@@ -140,7 +140,13 @@ class Sale < ApplicationRecord
       # shift with terminal zone
 
       # set cashier
-      if order_source.downcase == "emenu"
+      if !order_source.nil?
+        orderSoure = order_source.downcase
+      else
+        orderSoure = nil
+      end
+
+      if orderSoure == "emenu"
         if !booking.dining_facility_id.nil?
           table = DiningFacility.find(booking.dining_facility_id)
           cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)