Fix config merge for clean install

XPRNetwork · Nov 20, 2024 · da87cad · da87cad
1 parent f321471
commit da87cad
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 30 deletions.
diff --git a/includes/controllers/Config.php b/includes/controllers/Config.php
@@ -7,8 +7,6 @@
   exit; // Exit if accessed directly.
 }
 
-
-
 /**
  * Configuration handler for XPRCheckout payment gateway.
  * 
@@ -73,8 +71,7 @@ public static function GetDashbordConfig()
   public static function GetBaseConfig()
   {
     $xprcheckoutGateway = WC()->payment_gateways->payment_gateways()['xprcheckout'];
-    $rawWallets = $xprcheckoutGateway->get_option('wallets');
-    $wallets = unserialize($rawWallets);
+    $wallets = self::GetWalletConfig();
     $activeNetwork = $xprcheckoutGateway->get_option('network');
     $store = $wallets[$activeNetwork]['store'];    
 
@@ -101,22 +98,7 @@ public static function GetAdminConfig()
   {
     $xprcheckoutGateway = WC()->payment_gateways->payment_gateways()['xprcheckout'];
     $rawWallets = $xprcheckoutGateway->get_option('wallets');
-    $wallets = [
-      'testnet'=>[
-          'store'=>'',
-          'verified'=>false
-      ],
-      'mainnet'=>[
-          'store'=>'',
-          'verified'=>false
-      ],
-    ];
-    if (!is_null($rawWallets)){
-      $unserializedWallet = unserialize($rawWallets);
-      if (!is_null($unserializedWallet)){
-        $wallets = $unserializedWallet;
-      }
-    }
+    $wallets = self::GetWalletConfig();
     return array(
       "wallets"=>$wallets,
       "adminNonce" => wp_create_nonce( 'wp_rest' )
@@ -158,14 +140,25 @@ public static function GetConfigWithOrderById($orderId)
 
   }
 
-  /**
-   * Retrieves configuration values for XPRCheckout payment gateway merged with cart details.
-   * 
-   * @return array Associative array containing base configuration from self::GetBaseConfig() merged with:
-   *      - "cartTotal"     => float, The total amount in the cart.
-   *      - "paymentKey"    => string, The payment key associated with the current cart.
-   * @access public
-   * @static
-   */
+  private static function GetWalletConfig (){
+
+    $xprcheckoutGateway = WC()->payment_gateways->payment_gateways()['xprcheckout'];
+    $rawWallets = $xprcheckoutGateway->get_option('wallets');
+    $defaultWallet = [
+      'testnet'=>[
+          'store'=>'',
+          'verified'=>false
+      ],
+      'mainnet'=>[
+          'store'=>'',
+          'verified'=>false
+      ],
+    ];
+    if (is_null($rawWallets)) return $defaultWallet;
+    $unserializedWallet = unserialize($rawWallets);
+    if (!is_null($unserializedWallet)) return $defaultWallet;
+    return $unserializedWallet;
+
+  }
 
 }
diff --git a/includes/controllers/Notices.php b/includes/controllers/Notices.php
@@ -65,7 +65,7 @@ function showWarningNotices()
     if ($isTestnet && $testnetActor == "") :
     ?>
       <div class="notice notice-error">
-        <p><b>XPRCheckout testnet misconfiguration</b> ! XPRCheckout configuration doesn't have registered store account for testnet. <a href="<?php admin_url('admin.php?page=wc-settings&tab=checkout&section=xprcheckout') ?>">Fix it »</a></p>
+        <p><b>XPRCheckout testnet misconfiguration</b> ! XPRCheckout configuration doesn't have registered store account for testnet. <a href="<?php admin_url('http://wp-admin/admin.php?page=wc-settings&tab=checkout&section=xprcheckout') ?>">Fix it »</a></p>
       </div>
     <?php
     endif;