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

change assigned item id to order item id

Browse Source
This commit is contained in:
phyusin
2018-02-26 10:01:35 +06:30
parent d287ab267d
commit 8b064a4428
3 changed files with 25 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,15 @@ class Oqs::EditController < BaseOqsController
assigned_item_id = params[:id] assigned_item_id = params[:id]
@link_type = params[:type] @link_type = params[:type]
@dining_type = nil @dining_type = nil
if params[:type] != 'oqs' if params[:type] == 'oqs'
assigned_item = AssignedOrderItem.find(assigned_item_id)
@order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")
else
assigned_item = OrderItem.find(assigned_item_id)
dining = DiningFacility.find_by_id(params[:type]) dining = DiningFacility.find_by_id(params[:type])
@dining_type = dining.type @dining_type = dining.type
@order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.item_instance_code }'")
end end
assigned_item = AssignedOrderItem.find(assigned_item_id)
@order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");
end end
def update def update

10
app/controllers/origami/home_controller.rb
View File

@@ -62,7 +62,7 @@ class Origami::HomeController < BaseOrigamiController
@dining.bookings.active.each do |booking| @dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new @order_items = Array.new
@assigned_order_items = Array.new # @assigned_order_items = Array.new
if booking.booking_orders.empty? if booking.booking_orders.empty?
@booking = booking @booking = booking
else else
@@ -85,10 +85,10 @@ class Origami::HomeController < BaseOrigamiController
item.set_menu_items = arr_instance_item_sets item.set_menu_items = arr_instance_item_sets
end end
@order_items.push(item) @order_items.push(item)
assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id) # assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
if !assigned_order_items.nil? # if !assigned_order_items.nil?
@assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id}) # @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
end # end
end end
accounts = @customer.tax_profiles accounts = @customer.tax_profiles
puts accounts.to_json puts accounts.to_json

69
app/views/origami/home/show.html.erb
View File

@@ -288,26 +288,7 @@
sub_total = sub_total + (order_item.price * order_item.qty) sub_total = sub_total + (order_item.price * order_item.qty)
# unless order_item.price == 0 %> # unless order_item.price == 0 %>
<% if !@assigned_order_items.nil? %> <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
<% @assigned_order_items.each do |assigned_order_item| %>
<% if assigned_order_item.include? (order_item.order_items_id) %>
<tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
<td><%= count %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span>
<% end
end %>
</td>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr>
<% end %>
<% end %>
<% else %>
<tr>
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
@@ -320,7 +301,6 @@
<td class='item-attr'><%= order_item.qty %></td> <td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td> <td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr> </tr>
<% end %>
<% <%
# end # end
@@ -387,40 +367,19 @@
@order_items.each do |order_item| @order_items.each do |order_item|
count += 1 count += 1
%> %>
<% if !@assigned_order_items.nil? %> <tr class="edit_order" data-id='<%= order_item.order_items_id %>'>
<% @assigned_order_items.each do |assigned_order_item| %> <td><%= count %>
<% if assigned_order_item.include? (order_item.order_items_id) %> <td class='item-name'>
<tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'> <%= order_item.item_name %>
<td><%= count %> <% if !order_item.set_menu_items.nil?
<td class='item-name'> order_item.set_menu_items.each do |item_instance| %>
<%= order_item.item_name %> <br><span class="font-13"><%= item_instance %></span>
<% if !order_item.set_menu_items.nil? <% end
order_item.set_menu_items.each do |item_instance| %> end %>
<br><span class="font-13"><%= item_instance %></span> </td>
<% end <td class='item-attr'><%= order_item.qty %></td>
end %> <td class='item-attr'><%= order_item.qty*order_item.price %></td>
</td> </tr>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr>
<% end %>
<% end %>
<% else %>
<tr>
<td><%= count %>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.nil?
order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span>
<% end
end %>
</td>
<td class='item-attr'><%= order_item.qty %></td>
<td class='item-attr'><%= order_item.qty*order_item.price %></td>
</tr>
<% end %>
<% <%
end end
%> %>