From 50c51d0b55712929331fdadd90b1c09acab893c7 Mon Sep 17 00:00:00 2001 From: NyanLinHtut Date: Fri, 21 Jun 2019 15:19:52 +0630 Subject: [PATCH] fixed conflit --- app/models/sale.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index a00361aa..d20b5da0 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -135,7 +135,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)