Pull from master

2018-05-22 13:26:23 +06:30
parent 574f320dfd
commit f1733d9f06
71 changed files with 1151 additions and 726 deletions
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -9,7 +9,7 @@ class MenuCategory < ApplicationRecord
  validates_presence_of :code, :name, :menu, :order_by
  validates_uniqueness_of :code

-  default_scope { order('name asc') }
+  default_scope { order('order_by asc') }
  scope :active, -> {where("is_available = 1")}

  def self.destroyCategory(menu_category)