Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ workflows:
branches:
only:
- develop
- PM-4922
- PM-4949

# Production builds are exectuted only on tagged commits to the
# master branch.
Expand Down
6 changes: 4 additions & 2 deletions sql/reports/payment/member-payment-accrual.sql
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ SELECT
cl."name" AS customer_name,
ba."subcontractingEndCustomer" AS reporting_account_name,
cp.winner_id AS member_id,
to_char(c."createdAt", 'YYYY-MM-DD') AS challenge_created_date,
cp.gross_amount AS user_payment_gross_amount
CASE
WHEN cp.payment_type = 'Engagement Payment' THEN to_char(cp.payment_created_at, 'YYYY-MM-DD')
ELSE to_char(c."createdAt", 'YYYY-MM-DD')
END AS challenge_created_date, cp.gross_amount AS user_payment_gross_amount
FROM categorized_payments cp
LEFT JOIN challenges."Challenge" c
ON c."id" = cp.challenge_id
Expand Down
Loading