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-18515 - Allow Payment Processor with same name when using multi-domain #8316

Closed
wants to merge 44 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
588185f
Fix for CRM-18399: "My billing address is the same as above" option g…
darrick May 7, 2016
1002e47
Fix CRM-18418: Checked Payment Option is unset when selecting "Other"…
darrick May 7, 2016
4f36d2f
CRM-18515 - Allow Payment Processor with same name when using multi-d…
darrick May 7, 2016
bf92261
Revert "CRM-18515 - Allow Payment Processor with same name when using…
darrick May 7, 2016
3e9d4e1
Revert "Fix CRM-18418: Checked Payment Option is unset when selecting…
darrick May 7, 2016
9a440bb
Revert "Fix for CRM-18399: "My billing address is the same as above" …
darrick May 7, 2016
6bcc979
CRM-18515 - Allow Payment Processor with same name when using multi-d…
darrick May 7, 2016
b8ace24
CRM-18515 - Allow Payment Processor with same name when using multi-d…
darrick May 7, 2016
00f3504
Merge branch 'CRM-18515' of github.com:darrick/civicrm-core into CRM-…
darrick May 9, 2016
c276e3d
CRM-18151
rohankatkar May 4, 2016
b715aa0
CRM-18193 logging schema: fix mismatch between comment & code convention
eileenmcnaughton Apr 25, 2016
f9d8818
CRM-18469, CRM-17984 - getTree - No more pass by reference
totten Apr 26, 2016
df95dc2
CRM-18006 - Specify db engine for civicrm_install_canary table
colemanw Apr 23, 2016
0033724
CRM-18006 - civicrm_install_canary - Ensure ENGINE is InnoDB
totten Apr 25, 2016
31a8398
CRM-16846 - Fix missing upgrade steps
colemanw Apr 26, 2016
ecba2da
CRM-18469, CRM-17984 - getTree regression on multiple integers separa…
eileenmcnaughton Apr 27, 2016
a808dea
Further custom tree regression fix, where the label does not match th…
eileenmcnaughton Apr 27, 2016
e527e89
CRM-17984 - CustomGroupTest - Fix style errors
totten Apr 27, 2016
dc08df8
First WIP for AJAX cleanup.
mollux Apr 25, 2016
0e63a81
Extra ajax fixes.
mollux Apr 25, 2016
1888fc5
Made correct distinction between validate and escape.
mollux Apr 26, 2016
89262ef
Just discovered CRM_Utils_Type::escapeAll
mollux Apr 26, 2016
2fe5b4f
Added tests + validate and escape checks for mysql order by.
mollux Apr 26, 2016
2ac464d
Adapted CRM_Utils_Sort code to use the validation and escaping.
mollux Apr 26, 2016
1e6ec67
Typo fix in tests.
mollux Apr 26, 2016
5c829c3
Removed unnecessary parts of the Mysql regexes.
mollux Apr 27, 2016
7e3df0e
Fixed incorrect regexes for <table>.<column> names + added warning in…
mollux Apr 27, 2016
cd899be
Removed obsolete MysqlColumnNameLoose validate and escape check.
mollux Apr 29, 2016
5ada145
Added tests for <table>.<column> 64 character limit.
mollux Apr 29, 2016
695a376
Style fixes.
mollux Apr 29, 2016
a22b0f6
Added forgotten changes.
mollux Apr 29, 2016
1e504b3
Fixed incorrect parameter.
mollux Apr 29, 2016
c4beefd
Fixed forgotten rename.
mollux May 3, 2016
cf12857
Parially revert 19b8532d55bb35d3d471bbe859e5ca080e85324f to ensure qu…
mollux May 3, 2016
0ef3b8a
PHP warning fix.
mollux May 3, 2016
f49c1e9
Fixed issue with ajax calls on custom field table tab on contact.
mollux May 4, 2016
9337f53
CRM-18110-test added test.
KarinG Apr 25, 2016
9f88902
CRM-18154: Profile custom field option: 'Include in multi-record list…
May 4, 2016
bc94abb
CRM-18154: change checkbox to advcheckbox to ensure unsetting works fine
May 5, 2016
9894fae
added getUFLocale, setUFLocale methods to Backdrop class because lang…
herbdool Apr 10, 2016
22f38e1
CRM-18432: In CiviMail’s updateEmailResetDate(), exec the main query.
otetard Apr 18, 2016
e77ccb2
Simple spelling fix
laryn May 6, 2016
a579dd8
CRM-18515 - Allow Payment Processor with same name when using multi-d…
darrick May 7, 2016
6d479c2
Merge branch 'CRM-18515' of github.com:darrick/civicrm-core into CRM-…
darrick May 9, 2016
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
Prev Previous commit
Next Next commit
CRM-18110-test added test.
KarinG authored and darrick committed May 9, 2016
commit 9337f53209d9603ac3c6b614b7bdc2a876050db6
23 changes: 23 additions & 0 deletions tests/phpunit/CRM/Contribute/Form/ContributionTest.php
Original file line number Diff line number Diff line change
@@ -617,6 +617,29 @@ public function testSubmitWithNoteCreditCard() {
$this->assertEquals($note['note'], 'Super cool and interesting stuff');
}

/**
* Test that if a negative contribution is entered it does not get reset to $0
*/
public function testEnterNegativeContribution() {
$form = new CRM_Contribute_Form_Contribution();
$form->testSubmit(array(
'total_amount' => -5,
'financial_type_id' => 1,
'receive_date' => '04/24/2016',
'receive_date_time' => '11:27PM',
'contact_id' => $this->_individualId,
'payment_instrument_id' => array_search('Check', $this->paymentInstruments),
'contribution_status_id' => 1,
),
CRM_Core_Action::ADD);
$this->callAPISuccessGetCount('Contribution', array('contact_id' => $this->_individualId), 1);

$contribution = $this->callAPISuccessGetSingle('Contribution', array(
'contact_id' => $this->_individualId,
));
$this->assertEquals(-5, $contribution['total_amount']);
}

/**
* Test the submit function on the contribution page.
*/