git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-06-19 14:34:43 +06:30
parent e331ebfcde c1a31faf05
commit 8571182d74
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
app/controllers/api/orders_controller.rb
View File

@@ -221,51 +221,54 @@ class Api::OrdersController < Api::ApiController
order_item = OrderItem.find(order_items_id) order_item = OrderItem.find(order_items_id)
before_updated_qty = order_item.qty before_updated_qty = order_item.qty
if qty_weight < order_item.qty.to_f
order_item.item_order_by = current_login_employee.name
order_item.qty = qty_weight
order_item.remark = remarks
order_item.save
order_item.item_order_by = current_login_employee.name if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
order_item.qty = qty_weight # print
order_item.remark = remarks assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)
order_item.save assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if !assigned_items.nil?
# print assigned_items.each do |assign_item|
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) # order queue stations
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") oqs = assign_item.order_queue_station
if !assigned_items.nil? printer = PrintSetting.all
assigned_items.each do |assign_item|
# order queue stations
oqs = assign_item.order_queue_station
printer = PrintSetting.all unique_code="OrderItemPdf"
if !printer.empty?
unique_code="OrderItemPdf" printer.each do |printer_setting|
if !printer.empty? if printer_setting.unique_code == 'OrderItemPdf'
printer.each do |printer_setting| unique_code="OrderItemPdf"
if printer_setting.unique_code == 'OrderItemPdf' elsif printer_setting.unique_code == 'OrderItemSlimPdf'
unique_code="OrderItemPdf" unique_code="OrderItemSlimPdf"
elsif printer_setting.unique_code == 'OrderItemSlimPdf' elsif printer_setting.unique_code == 'OrderSetItemPdf'
unique_code="OrderItemSlimPdf" unique_code="OrderSetItemPdf"
elsif printer_setting.unique_code == 'OrderSetItemPdf' elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderSetItemPdf" unique_code="OrderItemSlimCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf' elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemSlimCustomisePdf" unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemCustomisePdf' elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderItemCustomisePdf" unique_code="OrderSetItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' end
unique_code="OrderSetItemCustomisePdf"
end end
end end
end
print_settings=PrintSetting.find_by_unique_code(unique_code) print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty )
end
end end
end end
end
return return_json_status_with_code(200, "updated successfully!") return return_json_status_with_code(200, "updated successfully!")
else
return return_json_status_with_code(304, "Quantity is over!")
end
else else
return return_json_status_with_code(406, "Checkout time is over!") return return_json_status_with_code(406, "Checkout time is over!")
end end