fix membershipsettings

2020-01-31 17:24:03 +06:30
parent f251d4b4e5
commit fd50ca004c
3 changed files with 6 additions and 5 deletions
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -30,10 +30,10 @@ class Origami::RoomsController < BaseOrigamiController
    @status_order = ""
    @status_sale = ""
    @sale_array = Array.new
-    @membership = MembershipSetting.all
-    @payment_methods = PaymentMethodSetting.all
+
    @membership = MembershipSetting::MembershipSetting
    @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}' ")
    @order_items = Array.new
    @dining_room.each do |booking|