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

check order for booking status moved

Browse Source
This commit is contained in:
phyusin
2018-09-26 10:28:43 +06:30
parent 3cf4abe9ce
commit b7134726e1
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/home_controller.rb
View File

@@ -32,7 +32,7 @@ class Origami::HomeController < BaseOrigamiController
@shop = shop_detail
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
@dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
@dining_booking = @dining.bookings.active #.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")
#@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
@order_items = Array.new
@dining_booking.each do |booking|

2
app/controllers/transactions/bookings_controller.rb
View File

@@ -35,7 +35,7 @@ class Transactions::BookingsController < ApplicationController
def show
@booking = Booking.find(params[:id])
@order = []
@order = nil
@order_items = []
@booking.booking_orders.each do |booking_order|
@order = Order.find(booking_order.order_id)