fixed conflict

app/controllers/origami/dashboard_controller.rb

@@ -3,7 +3,7 @@ class Origami::DashboardController < BaseOrigamiController
   def index
     @shop = Shop.first
     today = DateTime.now.strftime('%Y-%m-%d')
-    
+
     @display_type = Lookup.find_by_lookup_type("display_type")
 
     @sale_data = Array.new
@@ -13,7 +13,7 @@ class Origami::DashboardController < BaseOrigamiController
           if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" || payment.payment_method == "unionpay" || payment.payment_method == "alipay"
             pay = Sale.payment_sale('card', today, current_user)
             @sale_data.push({'card' => pay.payment_amount})
-          else 
+          else
             pay = Sale.payment_sale(payment.payment_method, today, current_user)
             @sale_data.push({payment.payment_method => pay.payment_amount})
           end
@@ -37,10 +37,10 @@ class Origami::DashboardController < BaseOrigamiController
         end
     else
         @account_data = nil
-    end   
+    end
 
     @top_items         = Sale.top_items(today,current_user)
-    @total_foc_items   = Sale.total_foc_items(today,current_user) 
+    @total_foc_items   = Sale.total_foc_items(today,current_user)
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
@@ -103,12 +103,14 @@ class Origami::DashboardController < BaseOrigamiController
   end
 
 def get_all_menu
-    @menus = Menu.active.all   
+    @menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).active.all
+    @item_attributes = MenuItemAttribute.all.load
+    @item_options = MenuItemOption.all.load
 end
 
 def get_credit_sales
   credit_sales = SalePayment.get_credit_sales(params)
-  if !credit_sales.nil?  
+  if !credit_sales.nil?
     result = {:status=> true, :data=> credit_sales }
   else
     result = {:status=> false, :message=>"There is no record." }