Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant

2017-06-01 10:09:22 +06:30
parent 6b2a496830 03bf799708
commit 2d511cc63e
14 changed files with 92 additions and 62 deletions
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -1,8 +1,8 @@
 class Menu < ApplicationRecord
  has_many :menu_categories, dependent: :destroy

-  validates_presence_of :name, :is_active, :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, :on => :create
  #Default Scope to pull the active version only
  default_scope { where(is_active: true).order("created_at desc") }