update sale item report

app/controllers/reports/saleitem_controller.rb

@@ -9,17 +9,20 @@ class Reports::SaleitemController < BaseReportController
     shift = ''
     if params[:shift_name].to_i != 0
 
-      shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+      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?        
+      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 = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
+          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
+
     @type = params[:sale_type]
     @sale_data, @other_charges,@discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type)
 
@@ -59,8 +62,8 @@ class Reports::SaleitemController < BaseReportController
 
   def show
     from, to, report_type  = get_date_range_from_params
-
+puts "aaaaaaaaaaaaaaaaaaaaaaaaaa"
-      @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+      @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
       date_arr = Array.new
       @sale_data.each do |sale|
@@ -73,8 +76,8 @@ class Reports::SaleitemController < BaseReportController
         date_arr.push(str)
       end
 
-      @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      # @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
-      @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+      # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
 
       out = {:status => 'ok', :message => date_arr}
       

app/models/sale.rb

@@ -806,6 +806,15 @@ def self.get_by_shift_sale(from,to,status)
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
+def self.get_by_shift_sale_by_item(from,to,status)
+  query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
+                          shift_closed_at As closing_date," +
+                          " grand_total AS grand_total, cash_sales AS cash," +
+                          "total_taxes AS total_tax,total_discounts As total_discount")
+                          .order("shift_sales.id DESC")
+  return query = query.where("shift_sales.shift_started_at >= ?" , from)
+end
+
 def self.get_item_query(type)
 
   if type == "revenue" || type.nil?

app/views/reports/saleitem/index.html.erb

@@ -325,7 +325,8 @@
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
 			
-			url = '<%= reports_get_shift_by_date_path %>';
+			url = '<%= reports_get_shift_by_sale_item_path %>';
+			console.log(url)
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
 

config/routes.rb

@@ -407,8 +407,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
     resources :product_sale, :only => [:index, :show]
-
+    get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
+
   end
 
   # ----------- Inventory ---------------------------