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
2017-06-03 13:27:11 +06:30
parent aa36c679ab 4dbf52d5a4
commit 622ca05c9e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -43,5 +43,5 @@ config/deploy/config/*
.byebug_history .byebug_history
# Gem files # Gem files
Gemfile #Gemfile
Gemfile.lock #Gemfile.lock

2
Gemfile
View File

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0'
gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL #Use PosgreSQL
#gem 'pg' gem 'pg'
# redis server for cable # redis server for cable
# gem 'redis', '~> 3.0' # gem 'redis', '~> 3.0'

4
app/controllers/api/orders_controller.rb
View File

@@ -39,8 +39,8 @@ class Api::OrdersController < Api::ApiController
#Create Table Booking or Room Booking #Create Table Booking or Room Booking
if !params["booking_id"].nil? && params[:booking_id].to_i > 0 if !params["booking_id"].nil? && params[:booking_id].to_i > 0
@order.new_booking = false #@order.new_booking = false
# @order.new_booking = true @order.new_booking = true
@order.booking_id = params[:booking_id] @order.booking_id = params[:booking_id]
end end

4
app/models/order.rb
View File

@@ -201,7 +201,7 @@ class Order < ApplicationRecord
#Process order items and send to order queue #Process order items and send to order queue
def process_order_queue def process_order_queue
#Send to background job for processing #Send to background job for processing
OrderQueueProcessorJob.perform_later(self.id) OrderQueueProcessorJob.perform_later(self.id)
end end
@@ -221,7 +221,7 @@ class Order < ApplicationRecord
left join dining_facilities on dining_facilities.id = bookings.dining_facility_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
left join order_items on order_items.order_id = orders.id") left join order_items on order_items.order_id = orders.id")
.where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true) .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
.group("orders.id") .group("orders.id")
end end
#Origami: Cashier : to view order type Room #Origami: Cashier : to view order type Room
def self.get_order_rooms def self.get_order_rooms