[0007917] Fix tracking carrier country not restored on page reload.

Author: mariolorenz

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [0007914](https://bugs.oxid-esales.com/view.php?id=7914): Fix Pay upon Invoice (PUI) broken after 2.8.1 security patch. The `_executePayment()` reject guard blocked PUI because it matched `isPayPalPayment()` but was not handled by any prior flow (not a button/proxy/UAPM/checkout payment). Added `gatewaypayment` flag to `PayPalDefinitions` and `isGatewayPayment()` method so PUI correctly falls through to OXID's core `PaymentGateway`.
 - [0007915](https://bugs.oxid-esales.com/view.php?id=7915): Fix fatal error "Call to a member function getId() on null" on product detail page when an out-of-stock variant is in the basket. `hasProductVariantInBasket()` delegated to `Basket::getArtStockInBasket()` which calls `getArticle(true)` (buyable-check). For out-of-stock variants this returns null. Replaced with direct basket iteration using `getArticle(false)` to skip the buyable check.
 - [0007916](https://bugs.oxid-esales.com/view.php?id=7916): Fix orphaned oscpaypal_order rows with OSCPAYPALSTATUS=COMPLETED and empty OXORDERID. When `sess_challenge` was cleared before `captureOrder()` completed (e.g. by a concurrent cancel request), the capture flow proceeded and created tracking records that could not be matched by webhook processing. Added defense-in-depth validation at four levels: `AjaxPaymentController::captureOrder()` now aborts if the shop order cannot be resolved, `PayPalOrderCompletedSubscriber` rejects events with empty shopOrderId, `Payment::trackPayPalOrder()` throws on empty shopOrderId, and `OrderRepository::paypalOrderByOrderIdAndPayPalId()` refuses to create new records with empty shopOrderId.
+- [0007917](https://bugs.oxid-esales.com/view.php?id=7917): Fix tracking carrier country not restored on page reload. When a carrier from the "global" country group was saved, the country dropdown was reset to the order's shipping/billing country instead. Added `getCountryCodeByCarrierKey()` to `PayPalTrackingCarrierList` and `getEffectiveTrackingCountryCode()` to `OrderMain` to resolve the saved carrier's country and pre-select it in the dropdown.
 
 ## [2.8.1] - 2026-03-19
 

metadata.php

@@ -69,7 +69,7 @@
         'en' => 'Use of the online payment service from PayPal. Documentation: <a href="https://docs.oxid-esales.com/modules/paypal-checkout/en/latest/" target="_blank">PayPal Checkout</a>'
     ],
     'thumbnail' => 'out/img/paypal.png',
-    'version' => '2.8.2-rc.1',
+    'version' => '2.8.2-rc.2',
     'author' => 'OXID eSales AG',
     'url' => 'https://www.oxid-esales.com',
     'email' => 'info@oxid-esales.com',

src/Controller/Admin/OrderMain.php

@@ -28,6 +28,9 @@ class OrderMain extends OrderMain_parent
     /** @var array|null  */
     protected $trackingCarrierCountries = null;
 
+    /** @var string|null */
+    protected $effectiveTrackingCountryCode = null;
+
     /**
      * @throws ApiException
      * @throws StandardException
@@ -90,7 +93,7 @@ public function getPayPalTrackingCarrierCountries(): array
                 $this->trackingCarrierCountries[$allowedCountry] = [
                     'id'       => $allowedCountry,
                     'title'    => $countryTitle,
-                    'selected' => ($this->getPayPalOrderCountryCode() === $allowedCountry)
+                    'selected' => ($this->getEffectiveTrackingCountryCode() === $allowedCountry)
                 ];
             }
         }
@@ -103,7 +106,7 @@ public function getPayPalTrackingCarrierProvider($countryCode = ''): array
         $order = $this->getOrder();
         $savedTrackingCarrierId = $order->getPayPalTrackingCarrier();
 
-        $countryCode = $countryCode ?: $this->getPayPalOrderCountryCode();
+        $countryCode = $countryCode ?: $this->getEffectiveTrackingCountryCode();
 
         if ($countryCode) {
             $trackingCarrierList = oxNew(PayPalTrackingCarrierList::class);
@@ -155,4 +158,30 @@ public function getPayPalOrderCountryCode(): string
 
         return $countryCode;
     }
+
+    /**
+     * Returns the country code that should be pre-selected in the tracking carrier country dropdown.
+     * If a carrier is already saved, returns the country the carrier belongs to.
+     * Otherwise falls back to the order's country.
+     *
+     * @throws StandardException
+     */
+    protected function getEffectiveTrackingCountryCode(): string
+    {
+        if (is_null($this->effectiveTrackingCountryCode)) {
+            $savedCarrierKey = $this->getOrder()->getPayPalTrackingCarrier();
+            $this->effectiveTrackingCountryCode = '';
+
+            if ($savedCarrierKey) {
+                $trackingCarrierList = oxNew(PayPalTrackingCarrierList::class);
+                $this->effectiveTrackingCountryCode = $trackingCarrierList->getCountryCodeByCarrierKey($savedCarrierKey);
+            }
+
+            if (!$this->effectiveTrackingCountryCode) {
+                $this->effectiveTrackingCountryCode = $this->getPayPalOrderCountryCode();
+            }
+        }
+
+        return $this->effectiveTrackingCountryCode;
+    }
 }

src/Model/PayPalTrackingCarrierList.php

@@ -47,6 +47,42 @@ public function loadTrackingCarriers(string $countryCode = '')
      * Load allowed Tracking-Carrier Country-Codes
      *
      */
+    /**
+     * Find the country code for a given carrier key
+     *
+     * @param string $carrierKey
+     * @return string empty string if not found
+     */
+    public function getCountryCodeByCarrierKey(string $carrierKey): string
+    {
+        if (!$carrierKey) {
+            return '';
+        }
+
+        $baseObject = $this->getBaseObject();
+        $viewName = $baseObject->getViewName();
+        $queryBuilderFactory = $this->getServiceFromContainer(QueryBuilderFactoryInterface::class);
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $queryBuilderFactory->create();
+
+        /** @var Result $resultDB */
+        $resultDB = $queryBuilder->select('oxcountrycode')
+            ->from($viewName)
+            ->where('oxkey = :oxkey')
+            ->setParameter(':oxkey', $carrierKey)
+            ->setMaxResults(1)
+            ->execute();
+
+        if (is_a($resultDB, Result::class)) {
+            $row = $resultDB->fetchAssociative();
+            if ($row) {
+                return (string) $row['oxcountrycode'];
+            }
+        }
+
+        return '';
+    }
+
     public function getAllowedTrackingCarrierCountryCodes(): array
     {
         $result = [];