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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2018-01-23 13:13:01 +06:30
parent 65292af9cb 05eb068e38
commit 8d2a928456
11 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,11 +68,14 @@ $(document).on('turbolinks:load', function() {
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>';
});
}
if(set_menu_items!=null){
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">'
@@ -146,10 +149,12 @@ $(document).on('turbolinks:load', function() {
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>';
});
if(set_menu_items!=null){
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 + set_instance_items + "</td>" +

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

@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
@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?
if !queue_item.set_menu_items.nil?
instance_item_sets = JSON.parse(queue_item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
@@ -88,13 +88,15 @@ class Oqs::HomeController < BaseOqsController
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)
if !item.set_menu_items.nil?
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
item.set_menu_items = arr_instance_item_sets
end
end
@@ -107,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
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)
if !item.set_menu_items.nil?
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
item.set_menu_items = arr_instance_item_sets
end
end
render :json => items.to_json

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

@@ -41,7 +41,7 @@ class Origami::HomeController < BaseOrigamiController
@date = order.created_at
@booking= booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|

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

@@ -35,7 +35,7 @@ class Origami::RoomsController < BaseOrigamiController
@date = order.created_at
@booking = booking
order.order_items.each do |item|
if !item.set_menu_items.empty?
if !item.set_menu_items.nil?
instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|

5
app/models/order.rb
View File

@@ -145,6 +145,9 @@ class Order < ApplicationRecord
set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
end
end
set_order_items = set_order_items.to_json
else
set_order_items = nil
end
# not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
# end
OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
self.employee_name, menu_item[:taxable])
#end

4
app/models/sale.rb
View File

@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
order.order_items.each do |item|
add_item(item)
if item.set_menu_items != "[]"
if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items)
end
end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
items.each do |item|
add_item(item)
if item.set_menu_items != "[]"
if !item.set_menu_items.nil?
add_sub_item(item.set_menu_items)
end

2
app/pdf/order_set_item_pdf.rb
View File

@@ -114,7 +114,7 @@ class OrderSetItemPdf < Prawn::Document
end
#add set menu items
if !order_set_item.set_menu_items.empty?
if !order_set_item.set_menu_items.nil?
set_menu_items = JSON.parse(order_set_item.set_menu_items)
if !set_menu_items.empty?
# json_item_instance_code = nil

2
app/pdf/order_summary_set_pdf.rb
View File

@@ -132,7 +132,7 @@ class OrderSummarySetPdf < Prawn::Document
end
#add set menu items
if !odi.set_menu_items.empty?
if !odi.set_menu_items.nil?
set_menu_items = JSON.parse(odi.set_menu_items)
if !set_menu_items.empty?
# json_item_instance_code = nil

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

@@ -83,7 +83,7 @@
<span class="order-qty">
<%= qid.qty %>
</span> ]
<% if !qid.set_menu_items.empty?
<% if !qid.set_menu_items.nil?
qid.set_menu_items.each do |item_instance|%>
<br><span class="font-12">
<%= item_instance %>

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

@@ -257,7 +257,7 @@
<td><%= count %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
<% 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
@@ -337,7 +337,7 @@
<td><%= count %>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
<% 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

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

@@ -246,7 +246,7 @@
<td><%= count %></td>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
<% 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
@@ -315,7 +315,7 @@
<td><%= count %>
<td class='item-name'>
<%= order_item.item_name %>
<% if !order_item.set_menu_items.empty?
<% 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