diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 2cb8547b8d..d4a4e6c9a1 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -627,9 +627,9 @@ def transfers @disbursements = @disbursements.not_card_grant_related @stats = { - deposited: @ach_transfers.deposited.sum(:amount) + @checks.deposited.sum(:amount) + @increase_checks.increase_deposited.or(@increase_checks.in_transit).sum(:amount) + @disbursements.fulfilled.pluck(:amount).sum + @paypal_transfers.deposited.sum(:amount_cents) + @wires.deposited.sum(&:usd_amount_cents), - in_transit: @ach_transfers.in_transit.sum(:amount) + @checks.in_transit_or_in_transit_and_processed.sum(:amount) + @increase_checks.in_transit.sum(:amount) + @disbursements.reviewing_or_processing.sum(:amount) + @paypal_transfers.approved.or(@paypal_transfers.pending).sum(:amount_cents) + @wires.approved.or(@wires.pending).sum(&:usd_amount_cents), - canceled: @ach_transfers.rejected.sum(:amount) + @checks.canceled.sum(:amount) + @increase_checks.canceled.sum(:amount) + @disbursements.rejected.sum(:amount) + @paypal_transfers.rejected.sum(:amount_cents) + @wires.rejected.sum(&:usd_amount_cents) + deposited: @ach_transfers.deposited.sum(:amount) + @checks.deposited.sum(:amount) + @increase_checks.increase_deposited.or(@increase_checks.in_transit).sum(:amount) + @disbursements.fulfilled.pluck(:amount).sum + @paypal_transfers.deposited.sum(:amount_cents) + @wires.deposited.sum(&:usd_amount_cents) + @wise_transfers.deposited, + in_transit: @ach_transfers.in_transit.sum(:amount) + @checks.in_transit_or_in_transit_and_processed.sum(:amount) + @increase_checks.in_transit.sum(:amount) + @disbursements.reviewing_or_processing.sum(:amount) + @paypal_transfers.approved.or(@paypal_transfers.pending).sum(:amount_cents) + @wires.approved.or(@wires.pending).sum(&:usd_amount_cents) + @wise_transfers.approved.or(@wise_transfers.pending).or(@wise_transfers.sent), + canceled: @ach_transfers.rejected.sum(:amount) + @checks.canceled.sum(:amount) + @increase_checks.canceled.sum(:amount) + @disbursements.rejected.sum(:amount) + @paypal_transfers.rejected.sum(:amount_cents) + @wires.rejected.sum(&:usd_amount_cents) + @wise_transfers.rejected.or(@wise_transfers.failed) } @ach_transfers = @ach_transfers.in_transit if params[:filter] == "in_transit" @@ -662,7 +662,7 @@ def transfers @wires = @wires.rejected if params[:filter] == "canceled" @wires = @wires.search_recipient(params[:q]) if params[:q].present? - @wise_transfers = @wise_transfers.approved.or(@wise_transfers.pending) if params[:filter] == "in_transit" + @wise_transfers = @wise_transfers.approved.or(@wise_transfers.pending).or(@wise_transfers.sent) if params[:filter] == "in_transit" @wise_transfers = @wise_transfers.deposited if params[:filter] == "deposited" @wise_transfers = @wise_transfers.rejected.or(@wise_transfers.failed) if params[:filter] == "canceled" @wise_transfers = @wise_transfers.search_recipient(params[:q]) if params[:q].present? diff --git a/app/models/increase_check.rb b/app/models/increase_check.rb index cec84e36d5..43ae714592 100644 --- a/app/models/increase_check.rb +++ b/app/models/increase_check.rb @@ -138,8 +138,9 @@ def payment_recipient_attributes end end - scope :in_transit, -> { where(increase_status: [:pending_submission, :submitting, :submitted, :pending_mailing, :mailed]) } - scope :canceled, -> { where(increase_status: [:rejected, :canceled, :stopped, :returned, :rejected]).or(where(aasm_state: :rejected)) } + # there might be more column statuses we want here? this is just to start with the ones that seemed obvious to me + scope :in_transit, -> { where(increase_status: [:pending_submission, :submitting, :submitted, :pending_mailing, :mailed]).or(where(column_status: [:initiated, :issued, :pending_deposit])) } + scope :canceled, -> { where(increase_status: [:rejected, :canceled, :stopped, :returned, :rejected]).or(where(aasm_state: :rejected)).or(where(column_status: [:pending_stop, :stopped, :returned])) } enum :increase_status, { pending_approval: "pending_approval",