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

menu is_active chcked

Browse Source
This commit is contained in:
phyusin
2018-11-16 14:51:40 +06:30
parent 26d44c0a7d
commit 574b3468be
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/restaurant/menu_controller.rb
View File

@@ -6,7 +6,7 @@ class Api::Restaurant::MenuController < Api::ApiController
param_checksum = params[:checksum] param_checksum = params[:checksum]
# checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp # checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp
all_menu = Menu.all all_menu = Menu.active.all
@request_url = '' @request_url = ''
if ENV["SERVER_MODE"] == "cloud" if ENV["SERVER_MODE"] == "cloud"
@request_url = request.base_url @request_url = request.base_url

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

@@ -104,7 +104,7 @@ class Origami::DashboardController < BaseOrigamiController
end end
def get_all_menu def get_all_menu
@menus = Menu.all @menus = Menu.active.all
end end
def get_credit_sales def get_credit_sales

2
app/controllers/settings/menus_controller.rb
View File

@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
# GET /settings/menus # GET /settings/menus
# GET /settings/menus.json # GET /settings/menus.json
def index 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| respond_to do |format|
format.html format.html
format.xlsx format.xlsx

3
app/models/menu.rb
View File

@@ -6,7 +6,8 @@ class Menu < ApplicationRecord
validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to 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 # 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 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 def self.current_menu
today = DateTime.now today = DateTime.now