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

add edit for rooms and check inventory link

Browse Source
This commit is contained in:
phyusin
2018-02-23 15:45:59 +06:30
parent f73f7cd965
commit 3bb6649d39
3 changed files with 113 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +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
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
@@ -78,6 +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)
if !assigned_order_items.nil?
@assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
end
end end
end end
end end

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

@@ -387,20 +387,39 @@
@order_items.each do |order_item| @order_items.each do |order_item|
count += 1 count += 1
%> %>
<% if !@assigned_order_items.nil? %>
<tr> <% @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

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

@@ -277,19 +277,39 @@
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 %>
<tr> <% if !@assigned_order_items.nil? %>
<td><%= count %></td> <% @assigned_order_items.each do |assigned_order_item| %>
<td class='item-name'> <% if assigned_order_item.include? (order_item.order_items_id) %>
<%= order_item.item_name %> <tr class="edit_order" data-id='<%= assigned_order_item[order_item.order_items_id] %>'>
<% if !order_item.set_menu_items.nil? <td><%= count %></td>
order_item.set_menu_items.each do |item_instance| %> <td class='item-name'>
<br><span class="font-13"><%= item_instance %></span> <%= order_item.item_name %>
<% end <% if !order_item.set_menu_items.nil?
end %> order_item.set_menu_items.each do |item_instance| %>
</td> <br><span class="font-13"><%= item_instance %></span>
<td class='item-attr'><%= order_item.qty %></td> <% end
<td class='item-attr'><%= order_item.qty*order_item.price %></td> end %>
</tr> </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 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
@@ -345,20 +365,39 @@
@order_items.each do |order_item | @order_items.each do |order_item |
count += 1 count += 1
%> %>
<% if !@assigned_order_items.nil? %>
<tr> <% @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
@@ -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;
}
});
</script> </script>