From de5ccb9ce6fd3fd49363490394ba5e8cd165117c Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 24 Jan 2019 14:33:55 -0600 Subject: [PATCH 1/2] End of year report now displays date properly --- lib/query/query_supporters.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/query/query_supporters.rb b/lib/query/query_supporters.rb index c141ff12..a0f9f5b0 100644 --- a/lib/query/query_supporters.rb +++ b/lib/query/query_supporters.rb @@ -609,11 +609,11 @@ UNION DISTINCT aggregate_dons = %Q( array_to_string( array_agg( - payments.created_at::date || ' ' || + payments.date::date || ' ' || (payments.gross_amount / 100)::text::money || ' ' || coalesce(payments.kind, '') || ' ' || coalesce(payments.towards, '') - ORDER BY payments.created_at DESC + ORDER BY payments.date DESC ), '\n' ) AS "Payment History" From 8738849711ef6d3c7ee6e6d842ff03238c854b8b Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 24 Jan 2019 14:34:18 -0600 Subject: [PATCH 2/2] Rename a spec properly --- spec/lib/query/query_supporters_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/query/query_supporters_spec.rb b/spec/lib/query/query_supporters_spec.rb index b583a739..38dacd86 100644 --- a/spec/lib/query/query_supporters_spec.rb +++ b/spec/lib/query/query_supporters_spec.rb @@ -1,7 +1,7 @@ # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later require 'rails_helper' -describe QueryCampaignGifts do +describe QuerySupporters do GIFT_LEVEL_ONE_TIME = 1111 GIFT_LEVEL_RECURRING = 5585 GIFT_LEVEL_CHANGED_RECURRING = 5512