fixed conflict

app/controllers/home_controller.rb

@@ -113,6 +113,7 @@ class HomeController < ApplicationController
     @top_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"top").sum('i.qty')
     @bottom_products = Sale.top_bottom_products(today,current_user,@from,@to,@from_time,@to_time,"bottom").sum('i.qty')
     @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time).sum(:grand_total)
+
     employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time)
     @employee_sales = []
     if !employee_sales.nil?

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." }

app/controllers/reports/staff_meal_controller.rb

@@ -0,0 +1,133 @@
+class Reports::StaffMealController < BaseReportController
+		 authorize_resource :class => false
+  def index
+
+    @account = Account.all
+    from, to  = get_date_range_from_params
+
+    shift_sale_range = ''
+
+    shift = ''
+    if params[:shift_name].to_i != 0
+
+      shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
+      shift_sale = ShiftSale.find(params[:shift_name])
+      if to.blank?
+        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
+      else
+        if shift_sale.shift_closed_at.blank?
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at)
+        else
+          shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
+        end
+      end
+    end
+
+		staff = Customer.where(customer_type: 'staff')
+		customer_id = Array.new
+		staff.each { |s|
+			customer_id.push(s.customer_id)
+		}
+
+    account_type = params[:account_type]
+
+    @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_staff_meal_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,account_type,customer_id)
+
+    @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil)
+
+    @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
+    @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
+
+
+    @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
+    @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
+
+
+    @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+    @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
+    @from       = from
+    @to         = to
+
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
+
+    if shift.present?
+      shift.each do |sh|
+        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
+        @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
+        @shift_data = sh
+      end
+    end
+    respond_to do |format|
+	    format.html
+	    format.xls
+	  end
+  end
+
+  def show
+    from, to, report_type  = get_date_range_from_params
+      @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
+      date_arr = Array.new
+      @sale_data.each do |sale|
+        local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+        local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+        opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+        closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+        shift_id = sale.id.nil? ? '-' : sale.id
+        str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+        date_arr.push(str)
+      end
+
+      # @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
+      out = {:status => 'ok', :message => date_arr}
+
+      respond_to do |format|
+        format.json { render json: out }
+      end
+  end
+
+  def get_period_name(period)
+    period_name = '-'
+    unless period.nil? or period.blank?
+      case period.to_i
+        when PERIOD["today"]
+          period_name = "Today"
+
+        when PERIOD["yesterday"]
+          period_name = "Yesterday"
+
+        when PERIOD["this_week"]
+          period_name = "This Week"
+
+        when PERIOD["last_week"]
+          period_name = "Last Week"
+
+        when PERIOD["last_7"]
+          period_name = "Last 7 days"
+
+        when PERIOD["this_month"]
+          period_name = "This Month"
+
+        when PERIOD["last_month"]
+          period_name = "Last Month"
+
+        when PERIOD["last_30"]
+          period_name = "Last 30 Days"
+
+        when PERIOD["this_year"]
+          period_name = "This Year"
+
+        when PERIOD["last_year"]
+          period_name = "Last Year"
+
+      end
+    end
+    return period_name
+  end
+
+end