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

Edit Order item unmatch

Browse Source
This commit is contained in:
San Wai Lwin
2018-07-04 15:22:39 +06:30
parent 4750f03ea8
commit d076e50cdb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,8 +229,11 @@ class Api::OrdersController < Api::ApiController
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
# print # print
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") assigned_items = nil
if !assigned_item.nil?
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
end
if !assigned_items.nil? if !assigned_items.nil?
assigned_items.each do |assign_item| assigned_items.each do |assign_item|

2
app/controllers/oqs/edit_controller.rb
View File

@@ -38,7 +38,7 @@ class Oqs::EditController < BaseOqsController
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 # print
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id)
assigned_items = nil assigned_items = nil
if !assigned_item.nil? if !assigned_item.nil?
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")