NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #140 from houdiniproject/fix_bug_in_end_of_year_export

Browse source 
Fix bug in end of year export
This commit is contained in:
Eric Schultz 2019-01-24 16:31:16 -06:00 committed by GitHub
commit 17ffa8434e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/query/query_supporters.rb
View file

@ -609,11 +609,11 @@ UNION DISTINCT
aggregate_dons = %Q( aggregate_dons = %Q(
array_to_string( array_to_string(
array_agg( array_agg(
payments.created_at::date || ' ' || payments.date::date || ' ' ||
(payments.gross_amount / 100)::text::money || ' ' || (payments.gross_amount / 100)::text::money || ' ' ||
coalesce(payments.kind, '') || ' ' || coalesce(payments.kind, '') || ' ' ||
coalesce(payments.towards, '') coalesce(payments.towards, '')
ORDER BY payments.created_at DESC ORDER BY payments.date DESC
), ),
'\n' '\n'
) AS "Payment History" ) AS "Payment History"

2
spec/lib/query/query_supporters_spec.rb
View file

@ -1,7 +1,7 @@
# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
require 'rails_helper' require 'rails_helper'
describe QueryCampaignGifts do describe QuerySupporters do
GIFT_LEVEL_ONE_TIME = 1111 GIFT_LEVEL_ONE_TIME = 1111
GIFT_LEVEL_RECURRING = 5585 GIFT_LEVEL_RECURRING = 5585
GIFT_LEVEL_CHANGED_RECURRING = 5512 GIFT_LEVEL_CHANGED_RECURRING = 5512