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

change assigned order item id to order item id in Origami/Room

Browse Source
This commit is contained in:
phyusin
2018-02-26 10:09:33 +06:30
parent da7dad05e4
commit a76d0ddbcd
2 changed files with 19 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ class Origami::RoomsController < BaseOrigamiController
@room.bookings.active.each do |booking| @room.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
booking.booking_orders.each do |booking_order| booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id) order = Order.find(booking_order.order_id)
@customer = order.customer @customer = order.customer
@@ -79,10 +79,10 @@ class Origami::RoomsController < 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
end end
end end

68
app/views/origami/rooms/show.html.erb
View File

@@ -277,39 +277,19 @@
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| %> <td><%= count %></td>
<% 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 %></td> <% 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>
<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
@@ -365,26 +345,7 @@
@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| %>
<% 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 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><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.item_name %> <%= order_item.item_name %>
@@ -397,7 +358,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