Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

This commit is contained in:
Aung Myo
2018-09-11 16:43:43 +06:30
8 changed files with 72 additions and 23 deletions

View File

@@ -36,7 +36,7 @@ class Oqs::EditController < BaseOqsController
order_item.remark = remarks
order_item.save
if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
if ENV["SERVER_MODE"] != "cloud" #&& order.source == 'cashier' #no print in cloud server
# print
assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)
assigned_items = nil