Skip to content

Commit

Permalink
Release merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimyhuang committed Jun 18, 2024
2 parents e7cc3c4 + c7cac71 commit 076363a
Show file tree
Hide file tree
Showing 53 changed files with 3,396 additions and 309 deletions.
4 changes: 4 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ steps:
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js
- name: notify
image: drillster/drone-email
settings:
Expand Down Expand Up @@ -143,6 +144,7 @@ steps:
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js
- cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js
- name: notify
image: drillster/drone-email
settings:
Expand Down Expand Up @@ -227,7 +229,9 @@ steps:
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/event_limit_approval_register.spec.js
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/event_unlimit_approval_register.spec.js
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/event_participant.spec.js
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js
- cd $DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js
- name: notify
image: drillster/drone-email
settings:
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_atm.spec.js"
- name: Payment Test - ALLPAY - Barcode - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_barcode.spec.js"
- name: Payment Test - SPGATEWAY - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js"
- name: Frontend - Contribution Editing - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/new_contribution.spec.js"
- name: Frontend - Advanced Search - Playwright
Expand All @@ -96,10 +98,10 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_participant.spec.js"
- name: Frontend - Mailing Editing - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js"
- name: Payment Test - SPGATEWAY - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js"
- name: Frontend - Contribution Booster - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js"
- name: Frontend - Report Page Checking - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js"

- uses: actions/upload-artifact@v3
if: always()
Expand Down Expand Up @@ -179,6 +181,8 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_atm.spec.js"
- name: Payment Test - ALLPAY - Barcode - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_barcode.spec.js"
- name: Payment Test - SPGATEWAY - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js"
- name: Frontend - Contribution Editing - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/new_contribution.spec.js"
- name: Frontend - Advanced Search - Playwright
Expand All @@ -203,10 +207,10 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_participant.spec.js"
- name: Frontend - Mailing Editing - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js"
- name: Payment Test - SPGATEWAY - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js"
- name: Frontend - Contribution Booster - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js"
- name: Frontend - Report Page Checking - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js"

- uses: actions/upload-artifact@v3
if: always()
Expand Down Expand Up @@ -248,6 +252,8 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/phpunit && phpunit --filter testLastReceiptId CRM/Contribute/BAO/ContributionTest.php"
- name: Payment Test - ALLPAY
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/ALLPAYTest.php"
- name: Payment Test - Neweb(new)
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/SPGATEWAYTest.php"
- name: Payment Test - LINE Pay
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/LinePayTest.php"
- name: Payment Test - TapPay
Expand Down Expand Up @@ -286,6 +292,8 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_atm.spec.js"
- name: Payment Test - ALLPAY - Barcode - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_barcode.spec.js"
- name: Payment Test - SPGATEWAY - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js"
- name: Frontend - Contribution Editing - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/new_contribution.spec.js"
- name: Frontend - Advanced Search - Playwright
Expand All @@ -312,6 +320,8 @@ jobs:
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js"
- name: Frontend - Contribution Booster - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js"
- name: Frontend - Report Page Checking - Playwright
run: docker exec neticrm-ci bash -c "cd \$DRUPAL_ROOT/modules/civicrm/tests/playwright/ && npx playwright test tests/report_check.spec.js"



Expand Down
6 changes: 3 additions & 3 deletions CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -2604,17 +2604,17 @@ static function makeNotifyUrl(&$params, $path, $return_query = FALSE){
$query[] = "contact_id={$params['contactID']}";
$query[] = "cid={$params['contributionID']}";

if($params['eventID']) {
if(!empty($params['eventID'])) {
$query[] = "module=event";
$query[] = "eid={$params['eventID']}";
$query[] = "pid={$params['participantID']}";
}
else {
$query[] = "module=contribute";
if ( $params['membershipID'] ) {
if (!empty($params['membershipID'])) {
$query[] = "mid=".$params['membershipID'];
}
if ($params['related_contact']) {
if (!empty($params['related_contact'])) {
$query[] = "rid=".$params['related_contact'];
if ($params['onbehalf_dupe_alert']) {
$query[] = "onbehalf_dupe_alert=".$params['onbehalf_dupe_alert'];
Expand Down
235 changes: 235 additions & 0 deletions CRM/Contribute/DAO/SPGATEWAY.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
<?php
/*
+--------------------------------------------------------------------+
| CiviCRM version 3.3 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2010 |
+--------------------------------------------------------------------+
| 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-2010
* $Id$
*
*/
require_once 'CRM/Core/DAO.php';
require_once 'CRM/Utils/Type.php';
class CRM_Contribute_DAO_SPGATEWAY extends CRM_Core_DAO
{
/**
* static instance to hold the table name
*
* @var string
* @static
*/
static $_tableName = 'civicrm_contribution_spgateway';
/**
* static instance to hold the field values
*
* @var array
* @static
*/
static $_fields = null;
/**
* static instance to hold the FK relationships
*
* @var string
* @static
*/
static $_links = null;
/**
* static instance to hold the values that can
* be imported / apu
*
* @var array
* @static
*/
static $_import = null;
/**
* static instance to hold the values that can
* be exported / apu
*
* @var array
* @static
*/
static $_export = null;
/**
* static value to see if we should log any modifications to
* this table in the civicrm_log table
*
* @var boolean
* @static
*/
static $_log = false;
/**
*
* @var int unsigned
*/
public $id;
/**
* FK to contribution table
*
* @var int unsigned
*/
public $cid;
/**
* Spgateway return data
*
* @var blob
*/
public $data;
/**
* class constructor
*
* @access public
* @return civicrm_contribution_spgateway
*/
function __construct()
{
parent::__construct();
}
/**
* return foreign links
*
* @access public
* @return array
*/
function &links()
{
if (!(self::$_links)) {
self::$_links = array(
'cid' => 'civicrm_contribution:id',
);
}
return self::$_links;
}
/**
* Returns foreign keys and entity references.
*
* @return array
* [CRM_Core_Reference_Interface]
*/
public static function getReferenceColumns()
{
if (!isset(Civi::$statics[__CLASS__]['links'])) {
Civi::$statics[__CLASS__]['links'] = static ::createReferenceColumns(__CLASS__);
Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName() , 'cid', 'civicrm_contribution', 'id');
}
return Civi::$statics[__CLASS__]['links'];
}
/**
* returns all the column names of this table
*
* @access public
* @return array
*/
static function &fields()
{
if (!(self::$_fields)) {
self::$_fields = array(
'id' => array(
'name' => 'id',
'type' => CRM_Utils_Type::T_INT,
'required' => true,
) ,
'spgateway_contribution_id' => array(
'name' => 'cid',
'type' => CRM_Utils_Type::T_INT,
'title' => ts('Spgateway Contribution ID') ,
'FKClassName' => 'CRM_Contribute_DAO_Contribution',
) ,
'data' => array(
'name' => 'data',
'type' => CRM_Utils_Type::T_BLOB,
'title' => ts('Data') ,
) ,
);
}
return self::$_fields;
}
/**
* returns the names of this table
*
* @access public
* @return string
*/
static function getTableName()
{
return self::$_tableName;
}
/**
* returns if this table needs to be logged
*
* @access public
* @return boolean
*/
function getLog()
{
return self::$_log;
}
/**
* returns the list of fields that can be imported
*
* @access public
* return array
*/
static function &import($prefix = false)
{
if (!(self::$_import)) {
self::$_import = array();
$fields = &self::fields();
foreach($fields as $name => $field) {
if (CRM_Utils_Array::value('import', $field)) {
if ($prefix) {
self::$_import['contribution_spgateway'] = &$fields[$name];
} else {
self::$_import[$name] = &$fields[$name];
}
}
}
}
return self::$_import;
}
/**
* returns the list of fields that can be exported
*
* @access public
* return array
*/
static function &export($prefix = false)
{
if (!(self::$_export)) {
self::$_export = array();
$fields = &self::fields();
foreach($fields as $name => $field) {
if (CRM_Utils_Array::value('export', $field)) {
if ($prefix) {
self::$_export['contribution_spgateway'] = &$fields[$name];
} else {
self::$_export[$name] = &$fields[$name];
}
}
}
}
return self::$_export;
}
}
2 changes: 1 addition & 1 deletion CRM/Contribute/Form/ContributionPage/Amount.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ private static function doShowHideFrequencyUnits(&$recurFrequencyUnits, $recurri
foreach ($recurringPaymentProcessor as $ppid) {
$paymentProcessor = CRM_Core_BAO_PaymentProcessor::getPayment($ppid, '');
$paymentClass = 'CRM_Core_'.$paymentProcessor['class_name'];
if (!empty($paymentClass::$_allowRecurUnit)) {
if (class_exists($paymentClass) && property_exists($paymentClass, '_allowRecurUnit')) {
$paymentUnitsCount[$unit] += in_array($unit, $paymentClass::$_allowRecurUnit) ? 1 : 0;
}
else {
Expand Down
6 changes: 3 additions & 3 deletions CRM/Contribute/Form/ContributionRecur.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ public function postProcess() {
);

// refs #17486. Date format should be YmdHis.
foreach ($params as $key => $value) {
if(preg_match('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/',$value)){
$params[$key] = preg_replace('/-| |:/', '', $value);
foreach (array('create_date', 'start_date', 'modified_date', 'cancel_date', 'end_date', 'next_sched_contribution', 'failure_retry_date', 'last_execute_date') as $idx) {
if(preg_match('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $params[$idx])){
$params[$idx] = preg_replace('/-| |:/', '', $params[$idx]);
}
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ function addDisplay($microformat = FALSE) {
// added this for CRM 1200
'address_id' => $this->id,
// CRM-4003
'address_name' => str_replace('', ' ', $this->name),
'address_name' => !empty($this->_name) ? str_replace('', ' ', $this->name) : '',
'street_address' => $this->street_address,
'supplemental_address_1' => $this->supplemental_address_1,
'supplemental_address_2' => $this->supplemental_address_2,
Expand Down
Loading

0 comments on commit 076363a

Please sign in to comment.