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_item.rb
+++ b/app/models/menu_item.rb
@@ -16,7 +16,7 @@ class MenuItem < ApplicationRecord
  validates_presence_of :item_code, :name, :type, :min_qty,:account_id
  validates_uniqueness_of :item_code
  
-  default_scope { order('name asc') }
+  default_scope { order('item_code asc') }

  scope :simple_menu_item, -> { where(type: 'SimpleMenuItem') }
  scope :set_menu_item, -> { where(type: 'SetMenuItem') }