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

add set_menu_item in origami and oqs

Browse Source
This commit is contained in:
phyusin
2018-01-19 16:06:58 +06:30
parent a9e3b9a849
commit 3a21d85a4b
7 changed files with 112 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/OQS.js
View File

@@ -66,7 +66,13 @@ $(document).on('turbolinks:load', function() {
var date = new Date(data[field]["created_at"]);
var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes();
var set_menu_items = data[field]["set_menu_items"];
var set_instance_items = "";
if(set_menu_items.length > 0){
$.each(set_menu_items, function(k,val){
set_instance_items += '<br><span class="font-12">'+val+'</span>';
});
}
row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
+'<div class="card-block">'
+'<div class="row">'
@@ -78,6 +84,7 @@ $(document).on('turbolinks:load', function() {
+'<p class="m-b--10">'
+'<span class="order-item font-15">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty"> [x'+ data[field]["qty"] +'] </span>'
+set_instance_items
+'</p>'
+'<br/><p class="card-text item-options">'+ options +'</p>'
@@ -137,9 +144,15 @@ $(document).on('turbolinks:load', function() {
for (i = 0; i < res.length; i++) {
var data = JSON.stringify(res[i]);
var parse_data = JSON.parse(data);
var set_menu_items = parse_data.set_menu_items;
var set_instance_items = "";
if(set_menu_items.length > 0){
$.each(set_menu_items, function(k,val){
set_instance_items += '<br><span class="font-12">'+val+'</span>';
});
}
var order_item_row = "<tr>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + "</td>" +
"<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
"<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
"</tr>";
$("#oqs-order-details-table").children("tbody").append(order_item_row);

40
app/controllers/oqs/home_controller.rb
View File

@@ -12,6 +12,20 @@ class Oqs::HomeController < BaseOqsController
@filter = params[:filter]
@queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item|
if !queue_item.set_menu_items.empty?
instance_item_sets = JSON.parse(queue_item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
queue_item.set_menu_items = arr_instance_item_sets
end
end
end
if !@filter.nil?
@count = queue_items_count_query(false,@filter)
@count.each do |count|
@@ -70,6 +84,17 @@ class Oqs::HomeController < BaseOqsController
OrderItem.where("order_id='#{ order_no }'").find_each do |oi|
items.push(oi)
if !items.empty?
items.each do |item|
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
end
end
render :json => items.to_json
@@ -79,6 +104,17 @@ class Oqs::HomeController < BaseOqsController
oqs_id = params[:id]
filter = params[:filter]
items = queue_items_query(false,oqs_id,filter)
if !items.empty?
items.each do |item|
instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
end
render :json => items.to_json
end
@@ -115,7 +151,7 @@ class Oqs::HomeController < BaseOqsController
oqs.is_active, oqpz.zone_id,
df.name as zone, df.type as table_type,
odt.order_id, odt.item_code, odt.item_name,
odt.price, odt.qty, odt.item_order_by, odt.options,
odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items,
cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
@@ -134,7 +170,7 @@ class Oqs::HomeController < BaseOqsController
# Completed Order
def completed_order(filter)
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, odt.set_menu_items, cus.name as customer_name, odt.created_at")
.joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
left join orders as od ON od.order_id = assigned_order_items.order_id

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

@@ -41,6 +41,15 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at
@booking= booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(item)
end
accounts = @customer.tax_profiles

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

@@ -35,6 +35,15 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at
@booking = booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(item)
end
end

9
app/views/oqs/home/index.html.erb
View File

@@ -82,7 +82,14 @@
</span> [x
<span class="order-qty">
<%= qid.qty %>
</span> ]
</span> ]
<% if !qid.set_menu_items.empty?
qid.set_menu_items.each do |item_instance|%>
<br><span class="font-12">
<%= item_instance %>
</span>
<% end
end %>
</p>
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>

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

@@ -251,7 +251,14 @@
# unless order_item.price == 0 %>
<tr>
<td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
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>
@@ -324,7 +331,14 @@
<tr>
<td><%= count %>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
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>

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

@@ -244,7 +244,14 @@
# unless order_item.price == 0 %>
<tr>
<td><%= count %></td>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
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>
@@ -306,7 +313,14 @@
<tr>
<td><%= count %>
<td class='item-name'><%= order_item.item_name %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
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>