|
|
@@ -92,9 +92,9 @@ class CashRegistersMove < ActiveRecord::Base
|
|
|
Pointsale.activos.each do |pointsale|
|
|
|
obj = {}
|
|
|
obj[:pointsale] = pointsale.name.tr(" ", "\n")
|
|
|
- # obj[:total] = pointsale.cash_registers_moves.where(created_at: beg_period..end_period, move_type: '1', status: '1').sum(:quantity)
|
|
|
- sales = pointsale.sales.activas.where(date_sale: beg_period..end_period)
|
|
|
- obj[:total] = CashRegistersMove.activos.where("sale_id IN (?)", sales.pluck(:id)).where(created_at: beg_period..end_period).sum(:quantity)
|
|
|
+ obj[:total] = pointsale.cash_registers_moves.where(created_at: beg_period..end_period, move_type: '1', status: '1').sum(:quantity)
|
|
|
+ # sales = pointsale.sales.activas.where(date_sale: beg_period..end_period)
|
|
|
+ # obj[:total] = CashRegistersMove.activos.where("sale_id IN (?)", sales.pluck(:id)).where(created_at: beg_period..end_period).sum(:quantity)
|
|
|
all_incomings << obj
|
|
|
end
|
|
|
all_incomings.to_json
|