[WIP] Enhancements for Partial payment Payments #15696
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
2 times, most recently
from
1a4eb13
to
70790cb
Compare
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
from
70790cb
to
40143ea
Compare
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
5 times, most recently
from
bbf75a3
to
4aba5ec
Compare
magnolia61
changed the title
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
17 times, most recently
from
429db01
to
8cbe87f
Compare
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
from
8cbe87f
to
00af3cc
Compare
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
5 times, most recently
from
f5cace9
to
10d265f
Compare
pradpnayak
reviewed
Feb 17, 2020
| CRM_Core_Error::statusBounce(ts("This contribution is already fully paid.")); | ||
| } | ||
| $contribution = civicrm_api3('Contribution', 'getsingle', array('id' => $this->_ccid)); | ||
| if ($contribution['contribution_status'] == 'Pending' || $contribution['contribution_status'] == 'Partially paid') { |
There was a problem hiding this comment.
I think you can't use 'contribution_status' since its a label field(correct me if i am wrong) which can be changed from UI.
There was a problem hiding this comment.
If (in_array($contribution['contribution_status'], ['Pending', 'Partially Paid'])) {
pradpnayak
reviewed
Feb 17, 2020
| } | ||
| $contribution = civicrm_api3('Contribution', 'getsingle', array('id' => $this->_ccid)); | ||
| if ($contribution['contribution_status'] == 'Pending' || $contribution['contribution_status'] == 'Partially paid') { | ||
| $totalAmount = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $this->_ccid, 'total_amount'); |
There was a problem hiding this comment.
$this->assign('contribution_total', $contribution['total_amount']);
There was a problem hiding this comment.
pradpnayak
reviewed
Feb 17, 2020
| // This is required for tpl logic. We should move away from hard-code this to adding an array of actions to the row | ||
| // which the tpl can iterate through - this should allow us to cope with competing attempts to add new buttons | ||
| // and allow extensions to assign new ones through the pageRun hook | ||
| if ('Pending' === CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id'])) { | ||
| if ('Pending' === CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id']) || 'Partially paid' === CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id'])) { |
There was a problem hiding this comment.
can be simplified as
$statusName = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id']);
if (in_array($statusName , ['Pending', 'Partially Paid'])) {
1896183
to
1e65fc2
Compare
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
2 times, most recently
from
dcc4f31
to
bdcdbcf
Compare
…Partial_payment_Payments
magnolia61
force-pushed
the
Enhancements_for_Partial_payment_Payments
branch
from
bdcdbcf
to
bfc0576
Compare
…ithub.com/magnolia61/civicrm-core into Enhancements_for_Partial_payment_Payments
|
Closing as in WIP long-term. Please Re-open when reviewable |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Enable the "Pay now" button on the userdashboard for 'partially paid' payments .
Use case:
Before
Only for contributions with status "Pending" the "Pay Now" button was shown
After
For contributions with status "Pending" and "Partially paid" the 'Pay now' button is shown.
Using the Pay Now button the following contribution page shows the proper balance due (30 euro).
After payment of this the contribution is completed.
user dashboard:
payment screen:
Technical Details
All changes of the past period Eileen made to the payment.create api made it very easy to enable this because it is already supported.
Comments
This is a follow up of #12319
Remaining bugs:
bug 1: the paid remaining amount (30 euro) overrides the Contribution Total (this changed from 50 to 30)
bug 2: the contribution date gets overwritten by the date of the current payment
WIP:
a. Send the Additional Payment receipt instead of the 'Event Confirmation' mail
b. Show Partially paid details on the contribution invoice (the pdf ignores these atm)