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

add popper.js.map and remove .idea

Browse Source
This commit is contained in:
Yan
2017-11-21 16:30:56 +06:30
parent 861e554d63
commit ad66a6570b
19 changed files with 17 additions and 1479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/license.rb
View File

@@ -78,7 +78,7 @@ class License
has_license = true #verify_license()
if has_license
puts "VERIFIED"
# puts "VERIFIED"
end
# if cache_license.nil?

2
app/models/menu_item.rb
View File

@@ -39,7 +39,7 @@ class MenuItem < ApplicationRecord
menu_item_hash[:item_code] = menu_item.item_code
menu_item_hash[:item_instance_code] = mt_instance.item_instance_code
menu_item_hash[:name] = menu_item.name.to_s + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:alt_name] = menu_item.alt_name.to_s + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:alt_name] = menu_item.alt_name.to_s # + " - " + mt_instance.item_instance_name.to_s
menu_item_hash[:price] = mt_instance.price
menu_item_hash[:promotion_price] = mt_instance.promotion_price
menu_item_hash[:is_on_promotion] = mt_instance.is_on_promotion

2
app/models/printer/order_queue_printer.rb
View File

@@ -123,7 +123,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
left join dining_facilities AS df ON df.id = b.dining_facility_id
left join customers as cus ON cus.customer_id = orders.customer_id
left join menu_items as item ON item.item_code = order_items.item_code")
.where("order_items.item_code = '#{ id }' AND order_items.price != 0")
.where("order_items.item_instance_code = '#{ id }' AND order_items.price != 0")
.group("order_items.item_code")
elsif type == "order_summary"
OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")