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

fix membershipsettings

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-01-31 17:24:03 +06:30
parent f251d4b4e5
commit fd50ca004c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/foodcourt/home_controller.rb
View File

@@ -30,11 +30,12 @@ class Foodcourt::HomeController < BaseFoodcourtController
@status_sale = "" @status_sale = ""
@sale_array = Array.new @sale_array = Array.new
@membership = MembershipSetting.all @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @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}'") #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'")
@order_items = Array.new @order_items = Array.new
@dining_booking.each do |booking| @dining_booking.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new @order_items = Array.new

4
app/controllers/origami/rooms_controller.rb
View File

@@ -30,10 +30,10 @@ class Origami::RoomsController < BaseOrigamiController
@status_order = "" @status_order = ""
@status_sale = "" @status_sale = ""
@sale_array = Array.new @sale_array = Array.new
@membership = MembershipSetting.all
@payment_methods = PaymentMethodSetting.all
@membership = MembershipSetting::MembershipSetting @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all @payment_methods = PaymentMethodSetting.all
@dining_room = @room.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_room = @room.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}' ")
@order_items = Array.new @order_items = Array.new
@dining_room.each do |booking| @dining_room.each do |booking|

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

@@ -90,7 +90,7 @@ class Transactions::SalesController < ApplicationController
# GET /transactions/sales/1 # GET /transactions/sales/1
# GET /transactions/sales/1.json # GET /transactions/sales/1.json
def show def show
@membership = MembershipSetting.all @membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.where("is_active='1'") @payment_methods = PaymentMethodSetting.where("is_active='1'")
@sale = Sale.find(params[:id]) @sale = Sale.find(params[:id])