menu is_active chcked
This commit is contained in:
@@ -6,7 +6,7 @@ class Api::Restaurant::MenuController < Api::ApiController
|
||||
param_checksum = params[:checksum]
|
||||
# checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp
|
||||
|
||||
all_menu = Menu.all
|
||||
all_menu = Menu.active.all
|
||||
@request_url = ''
|
||||
if ENV["SERVER_MODE"] == "cloud"
|
||||
@request_url = request.base_url
|
||||
|
||||
@@ -104,7 +104,7 @@ class Origami::DashboardController < BaseOrigamiController
|
||||
end
|
||||
|
||||
def get_all_menu
|
||||
@menus = Menu.all
|
||||
@menus = Menu.active.all
|
||||
end
|
||||
|
||||
def get_credit_sales
|
||||
|
||||
@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
|
||||
# GET /settings/menus
|
||||
# GET /settings/menus.json
|
||||
def index
|
||||
@settings_menus = Menu.unscoped.all.page(params[:page]).per(10)
|
||||
@settings_menus = Menu.all.page(params[:page]).per(10)
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.xlsx
|
||||
|
||||
@@ -6,7 +6,8 @@ class Menu < ApplicationRecord
|
||||
validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
|
||||
# validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
|
||||
#Default Scope to pull the active version only
|
||||
default_scope { where(is_active: true).order("created_at asc") }
|
||||
default_scope { order("created_at asc") }
|
||||
scope :active, -> {where("is_active = true")}
|
||||
|
||||
def self.current_menu
|
||||
today = DateTime.now
|
||||
|
||||
Reference in New Issue
Block a user