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

2018-05-08 17:28:19 +06:30
parent 1716d14df3 04f05d366f
commit 313f1b2909
12 changed files with 638 additions and 251 deletions
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -81,7 +81,7 @@ class MenuCategory < ApplicationRecord

  def get_sub_category
    menu_category = MenuCategory.find_by_menu_category_id(self.id)
-    if menu_category
+    if !menu_category.nil?
      return true
    end
    return false