diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 03e864fa..ac2092b6 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -58,6 +58,7 @@ class Origami::RoomsController < BaseOrigamiController
@room.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new
+ @assigned_order_items = Array.new
booking.booking_orders.each do |booking_order|
order = Order.find(booking_order.order_id)
@customer = order.customer
@@ -78,6 +79,10 @@ class Origami::RoomsController < BaseOrigamiController
item.set_menu_items = arr_instance_item_sets
end
@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)
+ if !assigned_order_items.nil?
+ @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+ end
end
end
end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e70730a..26e65d90 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -387,20 +387,39 @@
@order_items.each do |order_item|
count += 1
%>
-
-
- | <%= count %>
- |
- <%= order_item.item_name %>
- <% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
- <% end
- end %>
- |
- <%= order_item.qty %> |
- <%= order_item.qty*order_item.price %> |
-
+ <% if !@assigned_order_items.nil? %>
+ <% @assigned_order_items.each do |assigned_order_item| %>
+ <% if assigned_order_item.include? (order_item.order_items_id) %>
+
+ | <%= count %>
+ |
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
+ <% end %>
+ <% else %>
+
+ | <%= count %>
+ |
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
<%
end
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 1235f522..70c0e723 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -277,19 +277,39 @@
sub_total = sub_total + (order_item.price * order_item.qty)
# unless order_item.price == 0 %>
-
- | <%= count %> |
-
- <%= order_item.item_name %>
- <% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
- <% end
- end %>
- |
- <%= order_item.qty %> |
- <%= order_item.qty*order_item.price %> |
-
+ <% if !@assigned_order_items.nil? %>
+ <% @assigned_order_items.each do |assigned_order_item| %>
+ <% if assigned_order_item.include? (order_item.order_items_id) %>
+
+ | <%= count %> |
+
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
+ <% end %>
+ <% else %>
+
+ | <%= count %> |
+
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
<%
# end
@@ -345,20 +365,39 @@
@order_items.each do |order_item |
count += 1
%>
-
-
- | <%= count %>
- |
- <%= order_item.item_name %>
- <% if !order_item.set_menu_items.nil?
- order_item.set_menu_items.each do |item_instance| %>
-
<%= item_instance %>
- <% end
- end %>
- |
- <%= order_item.qty %> |
- <%= order_item.qty*order_item.price %> |
-
+ <% if !@assigned_order_items.nil? %>
+ <% @assigned_order_items.each do |assigned_order_item| %>
+ <% if assigned_order_item.include? (order_item.order_items_id) %>
+
+ | <%= count %>
+ |
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
+ <% end %>
+ <% else %>
+
+ | <%= count %>
+ |
+ <%= order_item.item_name %>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+
<%= item_instance %>
+ <% end
+ end %>
+ |
+ <%= order_item.qty %> |
+ <%= order_item.qty*order_item.price %> |
+
+ <% end %>
<%
end
@@ -906,4 +945,13 @@ $('#add_invoice').on('click',function(){
}
});
});
+
+ /*edit order in oqs*/
+ $('.edit_order').on('click',function(){
+ var assigned_order_item_id = $(this).attr('data-id');
+ var dining_id = "<%= @room.id %>";
+ if((assigned_order_item_id!=undefined) && (assigned_order_item_id!='')){
+ window.location.href = '/oqs/'+ assigned_order_item_id + "/edit/"+dining_id;
+ }
+ });