-
-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13145 from civicrm/5.8
5.8 to master
- Loading branch information
Showing
13 changed files
with
338 additions
and
40 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| <?php | ||
| /* | ||
| +--------------------------------------------------------------------+ | ||
| | CiviCRM version 5 | | ||
| +--------------------------------------------------------------------+ | ||
| | Copyright CiviCRM LLC (c) 2004-2018 | | ||
| +--------------------------------------------------------------------+ | ||
| | This file is a part of CiviCRM. | | ||
| | | | ||
| | CiviCRM is free software; you can copy, modify, and distribute it | | ||
| | under the terms of the GNU Affero General Public License | | ||
| | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | | ||
| | | | ||
| | CiviCRM is distributed in the hope that it will be useful, but | | ||
| | WITHOUT ANY WARRANTY; without even the implied warranty of | | ||
| | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | | ||
| | See the GNU Affero General Public License for more details. | | ||
| | | | ||
| | You should have received a copy of the GNU Affero General Public | | ||
| | License and the CiviCRM Licensing Exception along | | ||
| | with this program; if not, contact CiviCRM LLC | | ||
| | at info[AT]civicrm[DOT]org. If you have questions about the | | ||
| | GNU Affero General Public License or the licensing of CiviCRM, | | ||
| | see the CiviCRM license FAQ at http://civicrm.org/licensing | | ||
| +--------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| /** | ||
| * | ||
| * @package CRM | ||
| * @copyright CiviCRM LLC (c) 2004-2018 | ||
| */ | ||
| class CRM_Invoicing_Utils { | ||
|
|
||
| /** | ||
| * Function to call when invoicing is toggled on or off. | ||
| * | ||
| * We add or remove invoicing from the user dashboard here. | ||
| * | ||
| * @param bool $oldValue | ||
| * @param bool $newValue | ||
| * @param array $metadata | ||
| */ | ||
| public static function onToggle($oldValue, $newValue, $metadata) { | ||
| if ($oldValue == $newValue) { | ||
| return; | ||
| } | ||
| $existingUserViewOptions = civicrm_api3('Setting', 'get', ['return' => 'user_dashboard_options'])['values'][CRM_Core_Config::domainID()]['user_dashboard_options']; | ||
| $optionValues = civicrm_api3('Setting', 'getoptions', ['field' => 'user_dashboard_options'])['values']; | ||
| $invoiceKey = array_search('Invoices / Credit Notes', $optionValues); | ||
| $existingIndex = in_array($invoiceKey, $existingUserViewOptions); | ||
|
|
||
| if ($newValue && $existingIndex === FALSE) { | ||
| $existingUserViewOptions[] = $invoiceKey; | ||
| } | ||
| elseif (!$newValue && $existingIndex !== FALSE) { | ||
| unset($existingUserViewOptions[$existingIndex]); | ||
| } | ||
| civicrm_api3('Setting', 'create', ['user_dashboard_options' => $existingUserViewOptions]); | ||
| } | ||
|
|
||
| /** | ||
| * Function to call to determine if invoicing is enabled. | ||
| * | ||
| * Historically the invoicing was declared as a setting but actually | ||
| * set within contribution_invoice_settings (which stores multiple settings | ||
| * as an array in a non-standard way). | ||
| * | ||
| * We check both here. But will deprecate the latter in time. | ||
| */ | ||
| public static function isInvoicingEnabled() { | ||
| if (Civi::settings()->get('invoicing')) { | ||
| return TRUE; | ||
| } | ||
| $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); | ||
| return CRM_Utils_Array::value('invoicing', $invoiceSettings); | ||
| } | ||
|
|
||
| /** | ||
| * Function to call to determine default invoice page. | ||
| * | ||
| * Historically the invoicing was declared as a setting but actually | ||
| * set within contribution_invoice_settings (which stores multiple settings | ||
| * as an array in a non-standard way). | ||
| * | ||
| * We check both here. But will deprecate the latter in time. | ||
| */ | ||
| public static function getDefaultPaymentPage() { | ||
| $value = Civi::settings()->get('default_invoice_page'); | ||
| if (is_numeric($value)) { | ||
| return $value; | ||
| } | ||
| $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); | ||
| return CRM_Utils_Array::value('default_invoice_page', $invoiceSettings); | ||
| } | ||
|
|
||
| } |
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
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
120 changes: 120 additions & 0 deletions
120
tests/phpunit/CRM/Contact/Page/View/UserDashBoardTest.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| <?php | ||
| /* | ||
| +--------------------------------------------------------------------+ | ||
| | CiviCRM version 5 | | ||
| +--------------------------------------------------------------------+ | ||
| | Copyright CiviCRM LLC (c) 2004-2018 | | ||
| +--------------------------------------------------------------------+ | ||
| | This file is a part of CiviCRM. | | ||
| | | | ||
| | CiviCRM is free software; you can copy, modify, and distribute it | | ||
| | under the terms of the GNU Affero General Public License | | ||
| | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | | ||
| | | | ||
| | CiviCRM is distributed in the hope that it will be useful, but | | ||
| | WITHOUT ANY WARRANTY; without even the implied warranty of | | ||
| | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | | ||
| | See the GNU Affero General Public License for more details. | | ||
| | | | ||
| | You should have received a copy of the GNU Affero General Public | | ||
| | License and the CiviCRM Licensing Exception along | | ||
| | with this program; if not, contact CiviCRM LLC | | ||
| | at info[AT]civicrm[DOT]org. If you have questions about the | | ||
| | GNU Affero General Public License or the licensing of CiviCRM, | | ||
| | see the CiviCRM license FAQ at http://civicrm.org/licensing | | ||
| +--------------------------------------------------------------------+ | ||
| */ | ||
|
|
||
| /** | ||
| * Test class for CRM_Contact_Page_View_UserDashBoard | ||
| * | ||
| * @package CiviCRM | ||
| * @group headless | ||
| */ | ||
| class CRM_Contact_Page_View_UserDashBoardTest extends CiviUnitTestCase { | ||
|
|
||
| use CRMTraits_Page_PageTestTrait; | ||
|
|
||
| /** | ||
| * Contact ID of logged in user. | ||
| * | ||
| * @var int | ||
| */ | ||
| protected $contactID; | ||
|
|
||
| /** | ||
| * Prepare for test | ||
| */ | ||
| public function setUp() { | ||
| parent::setUp(); | ||
| $this->contactID = $this->createLoggedInUser(); | ||
| $this->listenForPageContent(); | ||
| } | ||
|
|
||
| /** | ||
| * Clean up after each test. | ||
| */ | ||
| public function tearDown() { | ||
| $this->quickCleanUpFinancialEntities(); | ||
| $this->quickCleanup(['civicrm_uf_match']); | ||
| CRM_Utils_Hook::singleton()->reset(); | ||
| } | ||
|
|
||
| /** | ||
| * Test the content of the dashboard. | ||
| */ | ||
| public function testDashboardContentEmptyContact() { | ||
| $this->runUserDashboard(); | ||
| $expectedStrings = [ | ||
| 'You are not currently subscribed to any Groups', | ||
| 'There are no contributions on record for you.', | ||
| 'There are no Pledges for your record.', | ||
| 'You are not registered for any current or upcoming Events.', | ||
| 'There are no memberships on record for you.', | ||
| 'You do not have any active Personal Campaign pages.', | ||
| ]; | ||
| $this->assertPageContains($expectedStrings); | ||
| } | ||
|
|
||
| /** | ||
| * Test the content of the dashboard. | ||
| */ | ||
| public function testDashboardContentContributions() { | ||
| $this->contributionCreate(['contact_id' => $this->contactID]); | ||
| $this->runUserDashboard(); | ||
| $expectedStrings = [ | ||
| 'Your Contribution(s)', | ||
| '<table class="selector"><tr class="columnheader"><th>Total Amount</th><th>Financial Type</th><th>Received date</th><th>Receipt Sent</th><th>Status</th>', | ||
| '</tr><tr id=\'rowid1\'class="odd-row"><td>$ 100.00 </td><td>Donation</td>', | ||
| '</td><td></td><td>Completed</td></tr></table>', | ||
| ]; | ||
| $this->assertPageContains($expectedStrings); | ||
| $this->assertSmartyVariables(['invoicing' => NULL]); | ||
| } | ||
|
|
||
| /** | ||
| * Test the content of the dashboard. | ||
| */ | ||
| public function testDashboardContentContributionsWithInvoicingEnabled() { | ||
| $this->markTestIncomplete('some issue on jenkins but not locally - disabling to investigage on master as this is an rc patch'); | ||
| $this->contributionCreate(['contact_id' => $this->contactID]); | ||
| $this->callAPISuccess('Setting', 'create', ['invoicing' => 1]); | ||
| $this->runUserDashboard(); | ||
| $expectedStrings = [ | ||
| 'Your Contribution(s)', | ||
| '<table class="selector"><tr class="columnheader"><th>Total Amount</th><th>Financial Type</th><th>Received date</th><th>Receipt Sent</th><th>Status</th><th></th>', | ||
| '<td>Completed</td><td><a class="button no-popup nowrap"href="/index.php?q=civicrm/contribute/invoice&reset=1&id=1&cid=' . $this->contactID . '"><i class="crm-i fa-print"></i><span>Print Invoice</span></a></td></tr></table>', | ||
| ]; | ||
| $this->assertPageContains($expectedStrings); | ||
| $this->assertSmartyVariables(['invoicing' => TRUE]); | ||
| } | ||
|
|
||
| /** | ||
| * Run the user dashboard. | ||
| */ | ||
| protected function runUserDashboard() { | ||
| $dashboard = new CRM_Contact_Page_View_UserDashBoard(); | ||
| $dashboard->run(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.