|
|
@@ -265,8 +265,8 @@ 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])
|
|
|
+ start_date = DateTime.parse(params[:start_date]) if params[:start_date].present?
|
|
|
+ end_date = DateTime.parse(params[:end_date]) if params[:end_date].present?
|
|
|
if product_id.present?
|
|
|
respond_to do |format|
|
|
|
@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")
|