product sale query

app/controllers/reports/product_sale_controller.rb

@@ -2,79 +2,19 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-	    from, to  = get_date_range_from_params
-	    shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+		order_by = 'desc'
+		if !params[:order_by].nil?
+			order_by = params[:order_by]
+		end
 
-	    shift = ''
-	    if params[:shift_name].to_i != 0
-	      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
-
-	        shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
-	      end
-	    end
-	    @sale_data, @grand_total = Sale.get_by_items(shift_sale_range,shift, from, to)
-
-	    @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
+	    @sale_data = Sale.get_menu_item_query(order_by)
 
 	    # 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(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
-
 end