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

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

@@ -221,7 +221,7 @@ 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.item_order_by = current_login_employee.name
order_item.qty = qty_weight order_item.qty = qty_weight
order_item.remark = remarks order_item.remark = remarks
@@ -266,6 +266,9 @@ class Api::OrdersController < Api::ApiController
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