git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sub menu category error

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-11-29 15:47:15 +06:30
parent e3501cd43c
commit 18cb9ba23c
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/dashboard_controller.rb
View File

@@ -6,7 +6,7 @@ class Origami::DashboardController < BaseOrigamiController
@sale_data = Array.new @sale_data = Array.new
@total_payment_methods = Sale.total_payment_methods(current_user) @total_payment_methods = Sale.total_payment_methods(current_user)
if !@total_payment_methods.nil? if !@total_payment_methods.nil?
@total_payment_methods.each do |payment| @total_payment_methods.each do |payment|
pay = Sale.payment_sale(payment.payment_method, current_user) pay = Sale.payment_sale(payment.payment_method, current_user)
@@ -99,7 +99,7 @@ class Origami::DashboardController < BaseOrigamiController
end end
def get_all_menu def get_all_menu
@menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).includes(:menu_categories => {:menu_items => {:item_sets => :menu_item_instances}}).active.all @menus = Menu.includes(:menu_categories => :children).includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).includes(:menu_categories => {:menu_items => {:item_sets => :menu_item_instances}}).active.all
@item_attributes = MenuItemAttribute.all.load @item_attributes = MenuItemAttribute.all.load
@item_options = MenuItemOption.all.load @item_options = MenuItemOption.all.load
end end

9
app/views/origami/dashboard/_menu.json.jbuilder
View File

@@ -15,15 +15,10 @@ if (menu.menu_categories)
categories = menu.menu_categories categories = menu.menu_categories
json.categories categories do |category| json.categories categories do |category|
if category.is_available if category.is_available
parent_category = category.parent json.sub_category category.children.present?
if !parent_category.nil?
json.sub_category "true"
else
json.sub_category "false"
end
valid_time = category.valid_time valid_time = category.valid_time
json.valid_time valid_time json.valid_time valid_time
json.id category.id json.id category.id
json.code category.code json.code category.code
json.order_by category.order_by json.order_by category.order_by