Fixed instore issues

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -680,22 +680,7 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         $request->setReference($clean);
 
         if ($this->getOptionId() == PayNL\Sdk\Model\Method::PIN) {
-            $terminalThCode = PPMFWC_Helper_Data::getPostTextField('terminal_id');
-            $terminal_setting = $this->get_option('paynl_instore_terminal');
-
-            if ($terminal_setting == 'checkout') {
-                # do nothing, just use terminalThCode
-            }
-            if ($terminal_setting == 'checkout_save') {
-                # Only save the tg-code in the cookie. This will then later be integrated in the checkout-view(hidden).
-                setcookie('paynl_instore_terminal_id', $terminalThCode, time() + (60 * 60 * 24 * 365));
-
-            } elseif (str_starts_with(strtoupper($terminal_setting), 'TH')) {
-                # A designated TH-code is selected as preferred terminal, so always use this one.
-                $terminalThCode = $terminal_setting;
-            }
-
-            $request->setTerminal($terminalThCode);
+            $request->setTerminal($this->getTerminal());
         }
 
         $extra1 = apply_filters('paynl-extra1', $order->get_order_number(), $order);
@@ -733,6 +718,30 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         return $payOrder;
     }
 
+    /**
+     * @return false|string
+     */
+    private function getTerminal()
+    {
+        $terminalThCode = PPMFWC_Helper_Data::getPostTextField('terminal_id');
+        $terminal_setting = $this->get_option('paynl_instore_terminal');
+
+        if ($terminal_setting == 'checkout') {
+            # do nothing, just use terminalThCode
+        }
+        if ($terminal_setting == 'checkout_save') {
+            # Only save the tg-code in the cookie. This will then later be integrated in the checkout-view(hidden).
+            setcookie('paynl_instore_terminal_id', $terminalThCode, time() + (60 * 60 * 24 * 365));
+
+        } elseif (str_starts_with(strtoupper($terminal_setting), 'TH')) {
+            # A designated TH-code is selected as preferred terminal, so always use this one.
+            $terminalThCode = $terminal_setting;
+        }
+
+
+        return $terminalThCode ?? '';
+    }
+
     /**
      * @return boolean
      */