CRM-20569: Add priceset validation on a partial payment use-case and other improvements #11000
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
CRM/Price/BAO/PriceField.php
Outdated
| @@ -814,9 +814,16 @@ public static function priceSetValidation($priceSetId, $fields, &$error, $allowN | |||
| list($componentName) = explode(':', $fields['_qf_default']); | |||
| // now we have all selected amount in hand. | |||
| $totalAmount = array_sum($selectedAmounts); | |||
| $actualTotalAmount = CRM_Utils_Array::value('partial_payment_total', $fields, CRM_Utils_Array::value('total_amount', $fields)); | |||
There was a problem hiding this comment.
so $actualTotalAmount is actually
// The form offers a field to enter the amount paid. This may differ from the amount that is due to complete the purchase
$totalPaymentAmountEnteredOnForm = CRM_Utils_Array::value('partial_payment_total', $fields, CRM_Utils_Array::value('total_amount', $fields));
| @@ -814,9 +814,16 @@ public static function priceSetValidation($priceSetId, $fields, &$error, $allowN | |||
| list($componentName) = explode(':', $fields['_qf_default']); | |||
| // now we have all selected amount in hand. | |||
| $totalAmount = array_sum($selectedAmounts); | |||
There was a problem hiding this comment.
$totalAmount = $sumOfSelectedOptions really?
CRM/Price/BAO/PriceField.php
Outdated
| $actualTotalAmount >= $totalAmount && // if total amount is equal to all selected amount in hand | ||
| (CRM_Utils_Array::value('contribution_status_id', $fields) == CRM_Core_PseudoConstant::getKey('CRM_Contribute_DAO_Contribution', 'contribution_status_id', 'Partially paid')) | ||
| ) { | ||
| $error['total_amount'] = ts('For partially paid contribution, amount must be less then the sum of all selected amount in hand'); |
There was a problem hiding this comment.
ts('You have specified the status Partially Paid but have entered an amount that equals or exceeds the amount due. Please adjust the status of the payment or the amount');
|
I have made some wording comments. I can accept this fix on the basis that
So pending some readability improvements I'm OK with this. I note the partial_payment_amount being passes around is a bit tangental to the other fix & should really be a separate JIRA/PR. However, it seems like a minor addition of the param being passed & consistent with other code uses |
monishdeb
force-pushed
the
CRM-20569-1
branch
from
4a22a6c
to
aee297c
Compare
|
Thanks @eileenmcnaughton for your feedback. Made those changes, please have a look! |
sluc23
pushed a commit
to ixiam/civicrm-core
that referenced
this pull request
Jan 10, 2018
CRM-20569: Add priceset validation on a partial payment use-case and other improvements
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.
Technical Details
Contain two necessary changes:
partial_payment_totalother thentotal_amountinCRM_Price_BAO_PriceSet::processAmount(...)Comments
This PR extracts some of the improvements from #10352