Merge pull request #191 from paynl/feature/PLUG-5164

Fixed instore issues

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -679,8 +679,8 @@ protected function startTransaction(WC_Order $order, $pickupLocation = null)
         $clean = preg_replace('/[^A-Za-z0-9]/u', '', $raw);
         $request->setReference($clean);
 
-        if ($this->getOptionId() == 1927) {
-            $request->setTerminal(PPMFWC_Helper_Data::getPostTextField('terminal_id'));
+        if ($this->getOptionId() == PayNL\Sdk\Model\Method::PIN) {
+            $request->setTerminal($this->getTerminal());
         }
 
         $extra1 = apply_filters('paynl-extra1', $order->get_order_number(), $order);
@@ -718,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
      */

includes/classes/PPMFWC/Gateways.php

@@ -903,13 +903,15 @@ public static function ppmfwc_onReturn()
     public static function getOrderReturnUrl(WC_Order $order, $newStatus, $orderStatusId)
     {
         $payStatus = new PayStatus();
+        $method = $order->get_payment_method() ?? '';
 
-        if ($payStatus->get($orderStatusId) === PayStatus::CANCEL)
-        {
+        if ($method == 'pay_gateway_instore' && (in_array($newStatus, [PPMFWC_Gateways::STATUS_CANCELED, PPMFWC_Gateways::STATUS_PENDING]))) {
             $url = add_query_arg('paynl_status', PPMFWC_Gateways::STATUS_CANCELED, wc_get_checkout_url());
-        } elseif ($payStatus->get($orderStatusId) === PayStatus::DENIED ||
-                  $newStatus == PPMFWC_Gateways::STATUS_DENIED)
-        {
+
+        } elseif ($payStatus->get($orderStatusId) === PayStatus::CANCEL) {
+            $url = add_query_arg('paynl_status', PPMFWC_Gateways::STATUS_CANCELED, wc_get_checkout_url());
+
+        } elseif ($payStatus->get($orderStatusId) === PayStatus::DENIED || $newStatus == PPMFWC_Gateways::STATUS_DENIED) {
             $methodName = $order->get_payment_method_title();
             if (!empty($methodName)) {
                 wc_add_notice(