Browse Source

product track bugfix

jose miguel 8 years ago
parent
commit
ae1c079acb
1 changed files with 3 additions and 1 deletions
  1. 3 1
      app/controllers/products_controller.rb

+ 3 - 1
app/controllers/products_controller.rb

@@ -265,9 +265,11 @@ class ProductsController < ApplicationController
     # @sales = SalesDetail.new
     product_id = params[:product_id]
     pointsale_id = params[:pointsale_id]
+    start_date = DateTime.parse(params[:start_date])
+    end_date = DateTime.parse(params[:end_date])
     if product_id.present?
       respond_to do |format|
-        @sales = pointsale_id.present? ? @sales = Pointsale.find(pointsale_id).sales_details.includes(:sale).where(sales: { status: 1 }, sales_details: { product_id: product_id }).order("sales_details.id DESC") : SalesDetail.includes(:sale).where(sales: { status: 1 }, sales_details: { product_id: product_id }).order("sales_details.id DESC")
+        @sales = pointsale_id.present? ? Pointsale.find(pointsale_id).sales_details.includes(:sale).where(sales: { date_sale: start_date..end_date }).where('sales.status != 1 and sales_details.product_id = ?', product_id).order("sales_details.id DESC") : SalesDetail.includes(:sale).where(sales: { date_sale: start_date..end_date }).where('sales.status != 1 and sales_details.product_id = ?', product_id).order("sales_details.id DESC")
         format.js
       end
     end