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:
Yan
2018-05-18 14:38:48 +06:30
parent 0d2f609b07 e120a32307
commit b1449d8d35
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/addorder.js
View File

@@ -58,8 +58,8 @@ $(function() {
row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">' row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">' +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+'<div class="col-md-9">'+ product[field].name +'</div>' +'<div class="col-md-10">'+ product[field].name +'</div>'
+"<div class='col-md-3 menu_item_box' data-item-code='" +"<div class='col-md-2 menu_item_box' data-item-code='"
+ product[field].item_code +"' data-instance = '" + product[field].item_code +"' data-instance = '"
+JSON.stringify(item_attributes)+"' data-id = '" +JSON.stringify(item_attributes)+"' data-id = '"
+JSON.stringify(item_attributes)+"' data-item = '" +JSON.stringify(item_attributes)+"' data-item = '"
@@ -67,7 +67,7 @@ $(function() {
+JSON.stringify(product[field].options)+"'data-opt = '" +JSON.stringify(product[field].options)+"'data-opt = '"
+JSON.stringify(product[field].options)+"' data-item-sets = '" +JSON.stringify(product[field].options)+"' data-item-sets = '"
+JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>" +JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
+"<i class='fa fa-bars material-icons'>" +"<i class='fa fa-bars material-icons m-l--10'>"
+'view_list</i>' +'view_list</i>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -1430,8 +1430,8 @@ $(function() {
row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">' row = '<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(../../'+image_path+');background-repeat: no-repeat;">'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">' +'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;" style="">'
+'<div class="col-md-9">'+ menu_items[field].name +'</div>' +'<div class="col-md-10 " style="padding-left:10px !important;">'+ menu_items[field].name +'</div>'
+"<div class='col-md-3 "+menu_item_box+"' data-item-code='" +"<div class='col-md-2 "+menu_item_box+"' data-item-code='"
+ menu_items[field].code +"' data-instance = '" + menu_items[field].code +"' data-instance = '"
+JSON.stringify(menu_items[field].instances)+"' data-id = '" +JSON.stringify(menu_items[field].instances)+"' data-id = '"
+JSON.stringify(menu_items[field].attributes)+"' data-item = '" +JSON.stringify(menu_items[field].attributes)+"' data-item = '"
@@ -1439,7 +1439,7 @@ $(function() {
+JSON.stringify(menu_items[field].options)+"'data-opt = '" +JSON.stringify(menu_items[field].options)+"'data-opt = '"
+JSON.stringify(menu_items[field].options)+"' data-item-sets = '" +JSON.stringify(menu_items[field].options)+"' data-item-sets = '"
+JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >" +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' >"
+"<i class='fa "+fa_plus+" '>" +"<i class='m-l--10 fa "+fa_plus+" '>"
+add+ '</i>' +add+ '</i>'
+'</div>' +'</div>'
+'</div>' +'</div>'

2
app/models/menu_category.rb
View File

@@ -9,7 +9,7 @@ class MenuCategory < ApplicationRecord
validates_presence_of :code, :name, :menu, :order_by validates_presence_of :code, :name, :menu, :order_by
validates_uniqueness_of :code validates_uniqueness_of :code
default_scope { order('order_by asc') } default_scope { order('name asc') }
scope :active, -> {where("is_available = 1")} scope :active, -> {where("is_available = 1")}
def self.destroyCategory(menu_category) def self.destroyCategory(menu_category)

2
app/models/menu_item.rb
View File

@@ -16,7 +16,7 @@ class MenuItem < ApplicationRecord
validates_presence_of :item_code, :name, :type, :min_qty,:account_id validates_presence_of :item_code, :name, :type, :min_qty,:account_id
validates_uniqueness_of :item_code validates_uniqueness_of :item_code
default_scope { order('item_code asc') } default_scope { order('name asc') }
scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') } scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') }
scope :set_menu_item, -> { where(type: 'SetMenuItem') } scope :set_menu_item, -> { where(type: 'SetMenuItem') }

4
app/models/order.rb
View File

@@ -71,9 +71,9 @@ class Order < ApplicationRecord
BookingOrder.create({:booking_id => booking.booking_id, :order => self}) BookingOrder.create({:booking_id => booking.booking_id, :order => self})
#Send order to queue one it done! #Send order to queue one it done!
# if self.source != "quick_service" if self.source != "quick_service"
process_order_queue process_order_queue
# end end
#send order to broadcast job #send order to broadcast job
send_order_broadcast(booking) send_order_broadcast(booking)

1
app/models/order_queue_station.rb
View File

@@ -116,6 +116,7 @@ class OrderQueueStation < ApplicationRecord
order = Order.find(order_id) order = Order.find(order_id)
order_items = order.order_items order_items = order.order_items
Order.pay_process_order_queue(order_id,table_id)
if table_id.to_i > 0 if table_id.to_i > 0
# get dining # get dining
dining = DiningFacility.find(table_id) dining = DiningFacility.find(table_id)