|
@@ -412,10 +412,10 @@ class SalesController < ApplicationController
|
|
|
if params[:pointsale_id].present?
|
|
if params[:pointsale_id].present?
|
|
|
@pointsale = Pointsale.find(params[:pointsale_id])
|
|
@pointsale = Pointsale.find(params[:pointsale_id])
|
|
|
@incomes_in_period = @pointsale.cash_registers_moves.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
|
|
@incomes_in_period = @pointsale.cash_registers_moves.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
|
|
|
- @sales = @pointsale.sales.activas.where(created_at: start_date..end_date).includes(:sales_details).order("id DESC")
|
|
|
|
|
|
|
+ @sales = @pointsale.sales.activas.where(created_at: start_date..end_date).order("id DESC")
|
|
|
else
|
|
else
|
|
|
@incomes_in_period = CashRegistersMove.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
|
|
@incomes_in_period = CashRegistersMove.joins(:sale).where(move_type: '1', created_at: start_date..end_date)
|
|
|
- @sales = Sale.activas.where(created_at: start_date..end_date).includes(:sales_details).order("id DESC")
|
|
|
|
|
|
|
+ @sales = Sale.activas.where(created_at: start_date..end_date).order("id DESC")
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
@sales_quantity = @sales.size
|
|
@sales_quantity = @sales.size
|