Merge pull request #180 from paynl/feature/PLUG-4890

PLUG-4890 - Remove old SDK call

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -332,11 +332,11 @@ public function init_form_fields()
                     $payDefaults = array();
                 }
 
-                $this->set_option_default('brand_id', (isset($payDefaults['brand']['id'])) ? $payDefaults['brand']['id']  : '', true);
-                $this->set_option_default('min_amount', (isset($payDefaults['min_amount'])) ? floatval($payDefaults['min_amount'] / 100)  : '', false);
-                $this->set_option_default('max_amount', (isset($payDefaults['max_amount'])) ? floatval($payDefaults['max_amount'] / 100)  : '', false);
+                $this->set_option_default('brand_id', (isset($payDefaults->brand->id)) ? $payDefaults->brand->id : '', true);
+                $this->set_option_default('min_amount', (isset($payDefaults->min_amount)) ? floatval($payDefaults->min_amount / 100)  : '', false);
+                $this->set_option_default('max_amount', (isset($payDefaults->max_amount)) ? floatval($payDefaults->max_amount / 100)  : '', false);
 
-                $pubDesc = isset($payDefaults['brand']['public_description']) ? $payDefaults['brand']['public_description'] : sprintf(esc_html(__('Pay with %s', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), $this->getName()); // phpcs:ignore
+                $pubDesc = (isset($payDefaults->brand->public_description)) ? $payDefaults->brand->public_description : sprintf(esc_html(__('Pay with %s', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), $this->getName()); // phpcs:ignore
                 $this->set_option_default('description', $pubDesc, true);
             }
         } else {

includes/classes/PPMFWC/Setup.php

@@ -166,22 +166,4 @@ private static function checkRequirements()
             wp_die(esc_html($error), esc_html($title), array('back_link' => true));
         }
     }
-
-    /**
-     * @return void|boolean
-     */
-    public static function ppmfwc_testConnection()
-    {
-        # Only run this if the setting is not saved
-        if (get_option('paynl_verify_peer') === false) {
-            try {
-                # Test the connection using a dummy IP
-                \Paynl\Validate::isPayServerIp('10.20.30.40');
-                add_option('paynl_verify_peer', 'yes');
-            } catch (Exception $e) {
-                add_option('paynl_verify_peer', 'no');
-                return false;
-            }
-        }
-    }
 }

woocommerce-payment-paynl.php

@@ -48,9 +48,6 @@
     # Register PAY gateway in WooCommerce
     PPMFWC_Gateways::ppmfwc_register();
 
-    # Test if Pay. can be reached
-    PPMFWC_Setup::ppmfwc_testConnection();
-
     # Register checkoutFlash
     PPMFWC_Gateways::ppmfwc_registerCheckoutFlash();