Merge branch 'master' into feature/PLUG-5162

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -61,20 +61,19 @@ public function __construct()
      */
     public function getIcon()
     {
-        $brandid = $this->get_option('brand_id');
-
         if (!empty($this->get_option('external_logo')) && wc_is_valid_url($this->get_option('external_logo'))) {
             return $this->get_option('external_logo');
         }
-        if (!empty($brandid)) {
-            return PPMFWC_PLUGIN_URL . 'assets/logos/' . $this->get_option('brand_id') . '.png';
+        if (!empty($this->get_option('payment_image'))) {
+            return $this->get_option('payment_image');
         }
 
         if (!empty($this->getImagePathName())) {
             return PPMFWC_PLUGIN_URL . 'assets/logos/payment_method_groups/' . $this->getImagePathName();
         }
 
-        return '';
+        // if any of the above settings are not set use static.pay for checkout images
+        return 'https://static.pay.nl/payment_profiles/100x100/' . $this->getOptionId() . '.png';
     }
 
     /**
@@ -320,21 +319,37 @@ public function init_form_fields()
             }
 
             if (
-                (!$this->get_option('brand_id')) || (strlen($this->get_option('brand_id')) == 0) ||
+                (!$this->get_option('payment_image')) || (strlen($this->get_option('payment_image')) == 0) ||
                 (!$this->get_option('min_amount')) || (strlen($this->get_option('min_amount')) == 0) ||
                 (!$this->get_option('max_amount')) || (strlen($this->get_option('max_amount')) == 0) ||
                 $this->get_option('description') == 'pay_init'
             ) {
                 try {
                     $paymentOptions = PPMFWC_Helper_Data::getPaymentOptionsList();
-                    $payDefaults = (isset($paymentOptions[$optionId])) ? $paymentOptions[$optionId] : array();
+
+                    if (is_array($paymentOptions)) {
+                        foreach ($paymentOptions as $option) {
+                            if ($option->getId() == $optionId) {
+                                $payDefaults = $option;
+                                break;
+                            }
+                        }
+                    }
                 } catch (Exception $e) {
                     $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);
+                if ((isset($payDefaults))) {
+                    $minAmount = $payDefaults->getMinAmount();
+                    $maxAmount = $payDefaults->getMaxAmount();
+
+                    $im = str_replace(['/payment_methods/', '.svg'], ['', '.png'], $payDefaults->getImage());
+                    $image = PPMFWC_PLUGIN_URL . 'assets/logos/' . $im;
+                }
+
+                $this->set_option_default('payment_image', (isset($image)) ? $image : '', true);
+                $this->set_option_default('min_amount', (isset($minAmount)) ? floatval($minAmount / 100) : '', false);
+                $this->set_option_default('max_amount', (isset($maxAmount)) ? floatval($maxAmount / 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
                 $this->set_option_default('description', $pubDesc, true);

includes/classes/PPMFWC/Hooks/FastCheckout/Exchange.php

@@ -33,7 +33,7 @@ public static function addAddressToOrder(array $checkoutData, object $order)
             'company' => $customerData['company'] ?? '',
             'email' => $customerData['email'] ?? '',
             'phone' => $customerData['phone'] ?? '',
-            'address_1' => $billingAddressData['streetName'] . ' ' . $shippingAddressData['streetNumber'] . $shippingAddressData['streetNumberAddition'],
+            'address_1' => ($billingAddressData['streetName'] ?? '') . ' ' . ($billingAddressData['streetNumber'] ?? '') . ($billingAddressData['streetNumberAddition'] ?? ''),
             'address_2' => '',
             'city' => $billingAddressData['city'] ?? '',
             'state' => '',
@@ -47,7 +47,7 @@ public static function addAddressToOrder(array $checkoutData, object $order)
             'company' => $customerData['company'] ?? '',
             'email' => $customerData['email'] ?? '',
             'phone' => $customerData['phone'] ?? '',
-            'address_1' => $shippingAddressData['streetName'] . ' ' . $shippingAddressData['streetNumber'] . $shippingAddressData['streetNumberAddition'],
+            'address_1' => ($shippingAddressData['streetName'] ?? '') . ' ' . ($shippingAddressData['streetNumber'] ?? '') . ($shippingAddressData['streetNumberAddition'] ?? ''),
             'address_2' => '',
             'city' => $shippingAddressData['city'] ?? '',
             'state' => '',