From 99f1ef7ec2f71a05895a7c886581dac1538d40e6 Mon Sep 17 00:00:00 2001 From: mohit_019 Date: Sat, 7 Mar 2015 17:36:38 +0530 Subject: [PATCH] CRM-11369 - Changed to Pending (pay later) and Pending (incomplete transaction) --- templates/CRM/Event/Form/EventFees.tpl | 2 +- tests/phpunit/WebTest/Event/AddEventTest.php | 4 ++-- xml/templates/civicrm_data.tpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index c52a2c16dc..c6af042225 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -232,7 +232,7 @@ {literal} function confirmStatus( pStatusId, cStatusId ) { if ( (pStatusId == cj("#status_id").val() ) && (cStatusId == cj("#contribution_status_id").val()) ) { - var allow = confirm( '{/literal}{ts escape='js'}The Payment Status for this participant is Completed. The Participant Status is set to Pending from pay later. Click Cancel if you want to review or modify these values before saving this record{/ts}{literal}.' ); + var allow = confirm( '{/literal}{ts escape='js'}The Payment Status for this participant is Completed. The Participant Status is set to Pending (pay later). Click Cancel if you want to review or modify these values before saving this record{/ts}{literal}.' ); if ( !allow ) return false; } } diff --git a/tests/phpunit/WebTest/Event/AddEventTest.php b/tests/phpunit/WebTest/Event/AddEventTest.php index 8f67403bf3..8a2eaba0de 100644 --- a/tests/phpunit/WebTest/Event/AddEventTest.php +++ b/tests/phpunit/WebTest/Event/AddEventTest.php @@ -807,7 +807,7 @@ class WebTest_Event_AddEventTest extends CiviSeleniumTestCase { $this->openCiviPage("event/search?reset=1", "reset=1"); $this->select2("event_id", $eventTitle, FALSE); - $this->multiselect2('participant_status_id', array('Pending from pay later')); + $this->multiselect2('participant_status_id', array('Pending (pay later)')); $this->clickLink('_qf_Search_refresh'); $this->waitForElementPresent("xpath=//div[@id='participantSearch']/table/tbody//tr/td[11]/span/a[2][text()='Edit']"); @@ -835,7 +835,7 @@ class WebTest_Event_AddEventTest extends CiviSeleniumTestCase { $this->openCiviPage("event/search?reset=1", "reset=1"); $this->select2("event_id", $eventTitle, FALSE); - $this->multiselect2('participant_status_id', array('Pending from pay later')); + $this->multiselect2('participant_status_id', array('Pending (pay later)')); $this->clickLink('_qf_Search_refresh'); $this->waitForElementPresent("xpath=//div[@id='participantSearch']/table/tbody//tr/td[11]/span/a[text()='View']"); $uRL = $this->getAttribute("xpath=//div[@id='participantSearch']/table/tbody//tr/td[11]/span/a[text()='View']@href"); diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index c4267b2d8a..ee562d3008 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -1514,8 +1514,8 @@ INSERT INTO civicrm_participant_status_type (2, 'Attended', '{ts escape="sql"}Attended{/ts}', 'Positive', 0, 1, 1, 2, 2 ), (3, 'No-show', '{ts escape="sql"}No-show{/ts}', 'Negative', 0, 1, 0, 3, 2 ), (4, 'Cancelled', '{ts escape="sql"}Cancelled{/ts}', 'Negative', 1, 1, 0, 4, 2 ), - (5, 'Pending from pay later', '{ts escape="sql"}Pending from pay later{/ts}', 'Pending', 1, 1, 1, 5, 2 ), - (6, 'Pending from incomplete transaction', '{ts escape="sql"}Pending from incomplete transaction{/ts}', 'Pending', 1, 1, 0, 6, 2 ), + (5, 'Pending from pay later', '{ts escape="sql"}Pending (pay later){/ts}', 'Pending', 1, 1, 1, 5, 2 ), + (6, 'Pending from incomplete transaction', '{ts escape="sql"}Pending (incomplete transaction){/ts}', 'Pending', 1, 1, 0, 6, 2 ), (7, 'On waitlist', '{ts escape="sql"}On waitlist{/ts}', 'Waiting', 1, 0, 0, 7, 2 ), (8, 'Awaiting approval', '{ts escape="sql"}Awaiting approval{/ts}', 'Waiting', 1, 0, 1, 8, 2 ), (9, 'Pending from waitlist', '{ts escape="sql"}Pending from waitlist{/ts}', 'Pending', 1, 0, 1, 9, 2 ), -- 2.25.1