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

cahnge empty json to NIL

Browse Source
This commit is contained in:
phyusin
2018-01-22 22:13:17 +06:30
parent 127d61fbae
commit 8b99c8bcc6
10 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
@queue_completed_item = completed_order(@filter) @queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty? if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item| @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) instance_item_sets = JSON.parse(queue_item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| instance_item_sets.each do |instance_item|
@@ -88,13 +88,15 @@ class Oqs::HomeController < BaseOqsController
if !items.empty? if !items.empty?
items.each do |item| items.each do |item|
instance_item_sets = JSON.parse(item.set_menu_items) if !item.set_menu_items.nil?
arr_instance_item_sets = Array.new instance_item_sets = JSON.parse(item.set_menu_items)
instance_item_sets.each do |instance_item| arr_instance_item_sets = Array.new
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name instance_item_sets.each do |instance_item|
arr_instance_item_sets.push(item_instance_name) 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
item.set_menu_items = arr_instance_item_sets
end end
end end
@@ -107,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
items = queue_items_query(false,oqs_id,filter) items = queue_items_query(false,oqs_id,filter)
if !items.empty? if !items.empty?
items.each do |item| items.each do |item|
instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items)) if !item.set_menu_items.nil?
arr_instance_item_sets = Array.new instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
instance_item_sets.each do |instance_item| arr_instance_item_sets = Array.new
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name instance_item_sets.each do |instance_item|
arr_instance_item_sets.push(item_instance_name) 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
item.set_menu_items = arr_instance_item_sets
end end
end end
render :json => items.to_json 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 @date = order.created_at
@booking= booking @booking= booking
order.order_items.each do |item| 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) instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| 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 @date = order.created_at
@booking = booking @booking = booking
order.order_items.each do |item| 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) instance_item_sets = JSON.parse(item.set_menu_items)
arr_instance_item_sets = Array.new arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item| 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]}) set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
end end
end end
set_order_items = set_order_items.to_json
else
set_order_items = nil
end end
# not insert with price 0 # not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
# end # end
OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id], 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]) self.employee_name, menu_item[:taxable])
#end #end

4
app/models/sale.rb
View File

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

2
app/pdf/order_set_item_pdf.rb
View File

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

2
app/pdf/order_summary_set_pdf.rb
View File

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

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

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

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

@@ -257,7 +257,7 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.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| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end
@@ -337,7 +337,7 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.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| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end

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

@@ -246,7 +246,7 @@
<td><%= count %></td> <td><%= count %></td>
<td class='item-name'> <td class='item-name'>
<%= order_item.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| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end
@@ -315,7 +315,7 @@
<td><%= count %> <td><%= count %>
<td class='item-name'> <td class='item-name'>
<%= order_item.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| %> order_item.set_menu_items.each do |item_instance| %>
<br><span class="font-13"><%= item_instance %></span> <br><span class="font-13"><%= item_instance %></span>
<% end <% end