From bcd2b448d21c8c17265ce27e8e57912949750e2d Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Mon, 8 Apr 2024 12:18:57 +0200 Subject: [PATCH 1/9] fix udefined constant "error" --- CRM/TwingleCampaign/Upgrader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/TwingleCampaign/Upgrader.php b/CRM/TwingleCampaign/Upgrader.php index 09e7401..f103551 100644 --- a/CRM/TwingleCampaign/Upgrader.php +++ b/CRM/TwingleCampaign/Upgrader.php @@ -96,7 +96,7 @@ class CRM_TwingleCampaign_Upgrader extends CRM_TwingleCampaign_Upgrader_Base { [1 => $e->getMessage()] ), E::ts('Scheduled Job'), - error + 'error' ); } From db1ab691388b20372361cfa75de64406f0c96072 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Fri, 19 Apr 2024 10:15:55 +0200 Subject: [PATCH 2/9] APIWrapper: Make `mapDonation()` static becauts it's called static --- CRM/TwingleCampaign/Utils/APIWrapper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/TwingleCampaign/Utils/APIWrapper.php b/CRM/TwingleCampaign/Utils/APIWrapper.php index 5afe426..4397aa1 100644 --- a/CRM/TwingleCampaign/Utils/APIWrapper.php +++ b/CRM/TwingleCampaign/Utils/APIWrapper.php @@ -103,12 +103,12 @@ class CRM_TwingleCampaign_Utils_APIWrapper { * the de.systopia.twingle extension can include the campaign into the * contribution which it will create. * - * @param $apiRequest - * @param $callsame + * @param array $apiRequest + * @param callable $callsame * * @return mixed */ - public function mapDonation($apiRequest, $callsame) { + public static function mapDonation(array $apiRequest, callable $callsame) { if (array_key_exists( 'campaign_id', @@ -207,4 +207,4 @@ class CRM_TwingleCampaign_Utils_APIWrapper { } } -} \ No newline at end of file +} From 9118b622d04beada2fd126f9051ea9b609fecf98 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Fri, 19 Apr 2024 10:29:04 +0200 Subject: [PATCH 3/9] APIWrapper: Rethrow exception --- CRM/TwingleCampaign/Utils/APIWrapper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/TwingleCampaign/Utils/APIWrapper.php b/CRM/TwingleCampaign/Utils/APIWrapper.php index 5afe426..c9c5d68 100644 --- a/CRM/TwingleCampaign/Utils/APIWrapper.php +++ b/CRM/TwingleCampaign/Utils/APIWrapper.php @@ -204,7 +204,9 @@ class CRM_TwingleCampaign_Utils_APIWrapper { 'contribution_id' => $contribution['id'], ] ); + + throw $e; } } -} \ No newline at end of file +} From cbb148b22fe29d6ae9541cd3acf255c02090c549 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Mon, 22 Apr 2024 10:10:51 +0200 Subject: [PATCH 4/9] Avoid `array_key_exists()` on `NULL` --- CRM/TwingleCampaign/Utils/APIWrapper.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/TwingleCampaign/Utils/APIWrapper.php b/CRM/TwingleCampaign/Utils/APIWrapper.php index 5afe426..932a88d 100644 --- a/CRM/TwingleCampaign/Utils/APIWrapper.php +++ b/CRM/TwingleCampaign/Utils/APIWrapper.php @@ -129,11 +129,7 @@ class CRM_TwingleCampaign_Utils_APIWrapper { } } } - elseif (array_key_exists( - 'event', - $apiRequest['params']['custom_fields']) && - !empty($apiRequest['params']['custom_fields']['event']) - ) { + elseif (!empty($apiRequest['params']['custom_fields']['event'])) { try { $targetCampaign = civicrm_api3( 'TwingleEvent', From beb9d8f170d39a2b7947d1bbe6aeee9a0869ea10 Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Sat, 15 Jun 2024 11:36:12 +0200 Subject: [PATCH 5/9] take into account the latest changes to the Twingle API --- .../Exceptions/TwingleCampaignException.php | 4 ++-- CRM/TwingleCampaign/Utils/APIWrapper.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php b/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php index 0f99555..61baf6b 100644 --- a/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php +++ b/CRM/TwingleCampaign/Exceptions/TwingleCampaignException.php @@ -1,8 +1,8 @@ $contribution['campaign_id']] ); - $response['values']['soft_credit'] = + $response['soft_credit'] = self::createSoftCredit($contribution, $twingle_event)['values']; $event->setResponse($response); } catch (CiviCRM_API3_Exception $e) { @@ -58,8 +58,8 @@ class CRM_TwingleCampaign_Utils_APIWrapper { } } // Create soft credit for sepa mandate - elseif (array_key_exists('sepa_mandate', $response['values'])) { - $sepa_mandate = array_pop($response_copy['values']['sepa_mandate']); + elseif (array_key_exists('sepa_mandate', $response)) { + $sepa_mandate = array_pop($response_copy['sepa_mandate']); try { $contribution = civicrm_api3( @@ -84,7 +84,7 @@ class CRM_TwingleCampaign_Utils_APIWrapper { 'getsingle', ['id' => $contribution['contribution_campaign_id']] ); - $response['values']['soft_credit'] = + $response['soft_credit'] = self::createSoftCredit($contribution, $twingle_event)['values']; $event->setResponse($response); } catch (CiviCRM_API3_Exception $e) { From de9cd894b71319d7c611eb648af026f9166b58fb Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Sat, 15 Jun 2024 12:12:35 +0200 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=94=96=20bump=20version=20to=201.0.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- info.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/info.xml b/info.xml index af3474b..1b5cc69 100644 --- a/info.xml +++ b/info.xml @@ -14,13 +14,12 @@ https://lab.civicrm.org/Marc_Michalsky/de-forumzfd-twinglecampaign/-/issues http://www.gnu.org/licenses/agpl-3.0.html - 2023-02-28 - 1.0.5 + 2024-06-15 + 1.0.7 stable - 5.14.0 + 5.74 - de.systopia.xcm de.systopia.campaign From 91c70c645a267175c83f84e71eae68d0feebef45 Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Thu, 18 Jul 2024 15:35:31 +0200 Subject: [PATCH 7/9] Push only active campaigns to Twingle --- api/v3/TwingleProject/Sync.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v3/TwingleProject/Sync.php b/api/v3/TwingleProject/Sync.php index aed3d2a..ca72d0e 100644 --- a/api/v3/TwingleProject/Sync.php +++ b/api/v3/TwingleProject/Sync.php @@ -193,8 +193,8 @@ function civicrm_api3_twingle_project_Sync(array $params): array { foreach ($projects_from_civicrm['values'] as $project_from_civicrm) { if ( !in_array($project_from_civicrm['project_id'], - array_column($projects_from_twingle, 'id') - )) { + array_column($projects_from_twingle, 'id'), + ) && $project_from_civicrm['is_active'] == 1) { // store campaign id in $id $id = $project_from_civicrm['id']; unset($project_from_civicrm['id']); From 7415fac88d697df94e68470d9c225c8eadb6b577 Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Thu, 18 Jul 2024 15:37:30 +0200 Subject: [PATCH 8/9] Cover the case where an event creator passes only one name part --- CRM/TwingleCampaign/BAO/TwingleEvent.php | 6 ++++-- CRM/TwingleCampaign/Utils/StringOperations.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CRM/TwingleCampaign/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php index 4248c1d..faf609b 100644 --- a/CRM/TwingleCampaign/BAO/TwingleEvent.php +++ b/CRM/TwingleCampaign/BAO/TwingleEvent.php @@ -219,13 +219,15 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign { private static function matchContact(string $names, string $email): ?int { $names = StringOps::split_names($names); // Hopefully just a temporary solution - $firstnames = $names['firstnames']; - $lastname = $names['lastname']; + $firstnames = $names['firstnames'] ?? NULL; + $lastname = $names['lastname'] ?? NULL; + $display_name = $names['display_name'] ?? NULL; try { $contact = civicrm_api3('Contact', 'getorcreate', [ 'xcm_profile' => Civi::settings()->get('twinglecampaign_xcm_profile'), 'first_name' => $firstnames, 'last_name' => $lastname, + 'display_name' => $display_name, 'email' => $email, ]); return (int) $contact['id']; diff --git a/CRM/TwingleCampaign/Utils/StringOperations.php b/CRM/TwingleCampaign/Utils/StringOperations.php index 19c0fd3..98e6657 100644 --- a/CRM/TwingleCampaign/Utils/StringOperations.php +++ b/CRM/TwingleCampaign/Utils/StringOperations.php @@ -49,7 +49,7 @@ class CRM_TwingleCampaign_Utils_StringOperations { $firstnames = implode(" ", $names); return ['firstnames' => $firstnames, 'lastname' => $lastname]; } - return $string; + return ['display_name' => $string]; } /** @@ -71,4 +71,4 @@ class CRM_TwingleCampaign_Utils_StringOperations { public static function startsWith($haystack, $needle): bool { return substr_compare($haystack, $needle, 0, strlen($needle)) === 0; } -} \ No newline at end of file +} From 012f4901e4c1fa4ce9c42ff5ec0958018affd1be Mon Sep 17 00:00:00 2001 From: Marc Michalsky Date: Thu, 18 Jul 2024 15:38:42 +0200 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=94=96=20bump=20version=20to=201.0.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.xml b/info.xml index 1b5cc69..7971b85 100644 --- a/info.xml +++ b/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2024-06-15 - 1.0.7 + 1.0.8 stable 5.74