From b61e82b39ee57865d3d706ff992cce3239947437 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 7 Jul 2023 10:23:59 +1000
Subject: [PATCH] Fix Upgrade Step as per feedback from Dave on RC PR

---
 CRM/Upgrade/Incremental/php/FiveSixtyThree.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FiveSixtyThree.php b/CRM/Upgrade/Incremental/php/FiveSixtyThree.php
index 3594a2fbad..e2b74f2a0c 100644
--- a/CRM/Upgrade/Incremental/php/FiveSixtyThree.php
+++ b/CRM/Upgrade/Incremental/php/FiveSixtyThree.php
@@ -68,10 +68,10 @@ class CRM_Upgrade_Incremental_php_FiveSixtyThree extends CRM_Upgrade_Incremental
    * Fix any double json encoding in Payment Processor accepted_credit_cards field
    */
   public static function fixDoubleEscapingPaymentProcessorCreditCards() {
-    $paymentProcessors = PaymentProcessor::get(FALSE)->execute();
+    $paymentProcessors = PaymentProcessor::get(FALSE)->addWhere('is_test', 'IS NOT NULL')->addWhere('domain_id', 'IS NOT NULL')->execute();
     foreach ($paymentProcessors as $paymentProcessor) {
-      if (is_numeric(array_keys($paymentProcessor['accepted_credit_cards'])[0])) {
-        PaymentProcessor::update(FALSE)->addValue('accepted_credit_cards', json_decode($paymentProcessor['accepted_credit_cards'], TRUE))->addWhere('id', '=', $paymentProcessor['id'])->execute();
+      if (is_array($paymentProcessor['accepted_credit_cards']) && is_numeric(array_keys($paymentProcessor['accepted_credit_cards'])[0])) {
+        PaymentProcessor::update(FALSE)->addValue('accepted_credit_cards', json_decode($paymentProcessor['accepted_credit_cards'][0], TRUE))->addWhere('id', '=', $paymentProcessor['id'])->execute();
       }
     }
     return TRUE;
-- 
2.25.1