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

order item edit and print

Browse Source
This commit is contained in:
Yan
2017-11-28 11:38:08 +06:30
parent 8b6e909220
commit 494d90c111
6 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ class Oqs::EditController < BaseOqsController
def index
assigned_item_id = params[:id]
assigned_item = AssignedOrderItem.find(assigned_item_id)
@order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_code='#{ assigned_item.item_code }'");
@order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");
end
def update
@@ -17,7 +17,7 @@ class Oqs::EditController < BaseOqsController
order_item.save
# print
assigned_item = AssignedOrderItem.find_by_item_code(order_item.item_code)
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)
# order queue stations
oqs = assigned_item.order_queue_station
@@ -25,6 +25,6 @@ class Oqs::EditController < BaseOqsController
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(print_settings, oqs,assigned_item.order_id, assigned_item.item_code, print_status=" (Edited)" )
order_queue_printer.print_order_item(print_settings, oqs,assigned_item.order_id, assigned_item.instance_code, print_status=" (Edited)" )
end
end

4
app/controllers/settings/menu_item_instances_controller.rb
View File

@@ -67,11 +67,7 @@ class Settings::MenuItemInstancesController < ApplicationController
respond_to do |format|
if @settings_menu_item_instances.save
<<<<<<< HEAD
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split("")
=======
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
>>>>>>> 7a28dc1ddc100e61789fae7f1f3503e2f703711e
@settings_menu_item_instances.save
format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item_instances }