Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-17281: Fix pledge miscalculation when total amount covers multiple installments #8540

Closed
wants to merge 2,132 commits into from

Conversation

mlutfy
Copy link
Member

@mlutfy mlutfy commented Jun 8, 2016

I also cleaned up the style, to replace, for example:
$statues[1] = array_search('Overdue', $contributionStatus);

with:
$statues[1] = $contributionStatuses['Overdue'];


@mlutfy mlutfy added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Jun 8, 2016
@mlutfy mlutfy removed the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Jun 9, 2016
@mlutfy
Copy link
Member Author

mlutfy commented Jun 9, 2016

The test is perhaps a bit weird (it's my second test ever), but the Pledge API does not do the same as the Pledge form, which calls BAO stuff from outside the BAO "create", i.e. the form calls CRM_Contribute_BAO_Contribution::updateRelatedPledge() directly, and the API does not.

The pledge BAO code is a bit funky, so I don't want to investigate much further for now.

@mlutfy
Copy link
Member Author

mlutfy commented Jun 10, 2016

jenkins, test this please

@JoeMurray
Copy link
Contributor

Heh Mathieu as Release Manager this month, I'm trying to recruit people to help pare down the backlog of almost 100 PRs, some going back to last summer. I'm wondering if you would be able to help QA another PR or two if I got someone to QA this PR and your other one #8516 ?

@JoeMurray
Copy link
Contributor

@jmcclelland would you be interested in QAing this PR?

@mlutfy
Copy link
Member Author

mlutfy commented Aug 19, 2016

jenkins, test this please

@monishdeb
Copy link
Member

Jenkin test this please

@monishdeb
Copy link
Member

@mlutfy there is a related test failure https://test.civicrm.org/job/CiviCRM-Core-PR/12156/ Can you fix it ? Marking it with WIP for now

@monishdeb monishdeb added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Oct 13, 2016
@mlutfy
Copy link
Member Author

mlutfy commented Nov 15, 2016

jenkins, test this please

@mlutfy
Copy link
Member Author

mlutfy commented Nov 16, 2016

Noting the jenkins error, for posterity:

CRM_Pledge_BAO_PledgePaymentTest::testCreatePledgePaymentForMultipleInstallments
Exception: A fatal error was triggered

/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/CRM/Core/Error.php:337
/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/CRM/Core/DAO.php:1067
/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/CRM/Pledge/BAO/PledgePayment.php:402
/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/CRM/Contribute/BAO/Contribution.php:4343
/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php:403
/home/jenkins/buildkit/build/core-8540-12hgm/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:184
/home/jenkins/buildkit/bin/phpunit4:545

JKingsnorth and others added 26 commits December 20, 2016 10:48
CRM-19777: Edit contribution : wrong decimal separator on total_amount
OptionValue Api cleanup - remove unnecessary lookup
During development of FlexMailer, I flirted with using a special token (e.g.
`{actions.trackOpen}`) but ultimately found that was positioned well in
the order of operations.
* Update joomla.css

* Update joomla.css

* Update joomla.css
CRM-19690 - CRM_Mailing_Tokens - Add TokenProcessor support
…ntribution is updated

Added test

----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
CRM-19761 support docx, etc export
…articipant registration

----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
  https://issues.civicrm.org/jira/browse/CRM-19288
----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
  https://issues.civicrm.org/jira/browse/CRM-19288

CRM-19288, removed white space

----------------------------------------
* CRM-19288: VAT not included for additional participant fee when registering for events
  https://issues.civicrm.org/jira/browse/CRM-19288
CRM-19690 - CiviMail - Add MailingSystemTest. Small code cleanups.
[ready-for-core-team-review]CRM-16189, Code to add 'Record Payment' link on Contribution View and Contribution tab
[ready-for-core-team-review]CRM-19288, fixed civicrm_contribution.tax_amount value for multiple p…
CRM-19690 - crmMailingBlockRecipients - Provide selector for more downstream styling
[ready-for-core-team-review]CRM-19585, created function to calculate financial item amount when co…
CRM-19244 Custom fields with option group not importing
…ger and a payment is received covers multiple installments.
@mlutfy
Copy link
Member Author

mlutfy commented Dec 28, 2016

I messed up this PR while attempting to rebase. Opened a new PR in #9585.

@mlutfy mlutfy closed this Dec 28, 2016
@monishdeb
Copy link
Member

you must have missed --rebase option i.e. git pull --rebase upstream master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state
Projects
None yet