Requested change

Author: annevelden

includes/classes/PPMFWC/Gateways.php

@@ -615,14 +615,6 @@ public static function ppmfwc_addGlobalSettings()
                 'id' => 'paynl_payment_method_display',
                 'default' => 1,
             );
-            $addedSettings[] = array(
-                'name' => esc_html(__('Check for alternate house number field', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)),
-                'type' => 'select',
-                'options' => array(0 => esc_html(__('No', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), 1 => esc_html(__('Yes', PPMFWC_WOOCOMMERCE_TEXTDOMAIN))),
-                'desc' => esc_html(__('Default set to No. Enable if you use a custom checkout that causes the house number to be incorrect.', PPMFWC_WOOCOMMERCE_TEXTDOMAIN)), // phpcs:ignore
-                'id' => 'paynl_payment_method_housenumber',
-                'default' => 0,
-            );
 
             $addedSettings[] = array(
               'css' => 'padding-bottom:40px;display:block;color:#f0f0f1',

includes/classes/PPMFWC/Helper/Config.php

@@ -82,9 +82,7 @@ public static function getInvoiceAddress($order)
         $aBillingAddress = paynl_split_address($billingAddress);
 
         $_billing_house_number = $order->get_meta('_billing_house_number');
-        if ((empty($aBillingAddress[1]) && !empty($_billing_house_number))
-            || (empty($aBillingAddress['number']) && !empty($_billing_house_number) && get_option('paynl_payment_method_housenumber') == 1)
-        ) {
+        if (empty($aBillingAddress['number']) && !empty($_billing_house_number)) {
             $billingAddress = $order->get_billing_address_1() . ' ' . $_billing_house_number . $order->get_billing_address_2();
             $aBillingAddress = paynl_split_address($billingAddress);
         }
@@ -108,9 +106,7 @@ public static function getDeliveryAddress($order): \PayNL\Sdk\Model\Address
         $aShippingAddress = paynl_split_address($shippingAddress);
 
         $_shipping_house_number = $order->get_meta('_shipping_house_number');
-        if ((empty($aShippingAddress[1]) && !empty($_shipping_house_number))
-            || (empty($aShippingAddress['number']) && !empty($_shipping_house_number) && get_option('paynl_payment_method_housenumber') == 1)
-        ) {
+        if (empty($aShippingAddress['number']) && !empty($_shipping_house_number)) {
             $shippingAddress = $order->get_shipping_address_1() . ' ' . $_shipping_house_number . $order->get_shipping_address_2();
             $aShippingAddress = paynl_split_address($shippingAddress);
         }