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

Fix merge bug

Browse source
This commit is contained in:
Eric Schultz 2019-01-22 16:44:00 -06:00
parent 95d5bf734b
commit 43ff7fb192
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/query/query_donations.rb
View file

@ -14,9 +14,6 @@ module QueryDonations
].concat(QuerySupporters.supporter_export_selections) ].concat(QuerySupporters.supporter_export_selections)
.concat([ .concat([
"supporters.id AS \"Supporter ID\"", "supporters.id AS \"Supporter ID\"",
<<<<<<< HEAD
])
=======
]).concat([ ]).concat([
"coalesce(donations.designation, 'None') AS designation", "coalesce(donations.designation, 'None') AS designation",
"#{QueryPayments.get_dedication_or_empty('type')}::text AS \"Dedication Type\"", "#{QueryPayments.get_dedication_or_empty('type')}::text AS \"Dedication Type\"",
@ -29,7 +26,6 @@ module QueryDonations
"donations.campaign_id AS \"Campaign Id\"", "donations.campaign_id AS \"Campaign Id\"",
"users.email AS \"Campaign Creator Email\"" "users.email AS \"Campaign Creator Email\""
]) ])
>>>>>>> 5c0d16c0b... Add campaign_id to export
).from(:donations) ).from(:donations)
.join(:supporters, "supporters.id=donations.supporter_id") .join(:supporters, "supporters.id=donations.supporter_id")
.left_outer_join(:campaign_gifts, "campaign_gifts.donation_id=donations.id") .left_outer_join(:campaign_gifts, "campaign_gifts.donation_id=donations.id")