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

2017-06-01 17:14:35 +06:30
parent 0a000761fb 89c6228c31
commit e200dcd438
23 changed files with 143 additions and 76 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
  #Default Scope to pull the active version only
  default_scope { where(is_active: true).order("created_at desc") }