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

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

Browse Source
This commit is contained in:
Yan
2017-06-02 14:00:23 +06:30
parent 17206001c4 165317a536
commit 4313032875
8 changed files with 198 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/api/bookings_controller.rb
View File

@@ -1,6 +1,5 @@
class Api::BookingsController < Api::ApiController
skip_before_action :authenticate
#Show customer by ID
def index
@customer = Customer.find_by(params[:id])

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

@@ -7,7 +7,10 @@ class Api::OrdersController < Api::ApiController
order = Order.find(params[:order_id])
order.order_items
end
def get_order
order = Order.find(params[:order_id])
order.order_items
end
# Description
# This API allow new order creation

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

@@ -1,22 +1,22 @@
class Crm::HomeController < BaseCrmController
def index
# @booking = Booking.all
@booking = Booking.select("bookings.id as booking_id,
bookings.checkin_at,
bookings.checkin_by,
bookings.dining_facility_id,
od.customer_id as customer,
od.item_count as count,
odt.id as order_item_id,
odt.item_name as item_name")
.joins("join booking_orders as bko ON bko.booking_id = bookings.id")
.joins("right join orders as od ON od.id = bko.order_id")
.joins("right join order_items as odt ON odt.order_id=od.id")
.order("bookings.id DESC")
@booking = Booking.all
@customer = Customer.all
#@booking = Booking.select("bookings.id as booking_id,
# bookings.checkin_at,
# bookings.checkin_by,
# bookings.dining_facility_id,
# od.customer_id as customer,
# od.id as order_id,
# od.item_count as count,
# odt.id as order_item_id,
# odt.item_name as item_name")
# .joins("join booking_orders as bko ON bko.booking_id = bookings.id")
# .joins("right join orders as od ON od.id = bko.order_id")
# .joins("right join order_items as odt ON odt.order_id=od.id")
# .order("bookings.id DESC")
end
def show