Fix NoArticleException on product detail page when an out-of-stock variant

Author: mariolorenz

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### FIX
 
 - [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.
+- Fix NoArticleException on product detail page when an out-of-stock variant (configured as "offline when sold out") is still in the basket. The installment banner template called `Basket::getArtStockInBasket()` which internally uses `getArticle(true)` and throws for offline articles. Simplified the banner amount calculation to always add the current product price to the basket total, removing the unnecessary basket iteration. Removed now unused `hasProductVariantInBasket()` method.
 - [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.
 

src/Model/Basket.php

@@ -245,31 +245,6 @@ public function getPayPalCheckoutRoundDiff()
         return $result;
     }
 
-    /**
-     * Check if variants of the given product are already in the basket
-     * @param \OxidEsales\Eshop\Application\Model\Article $product
-     * @return bool
-     */
-    public function hasProductVariantInBasket(\OxidEsales\Eshop\Application\Model\Article $product)
-    {
-        $variantIds = $product->getVariantIds();
-        if (empty($variantIds)) {
-            return false;
-        }
-
-        $variantIdMap = array_flip($variantIds);
-        foreach ($this->getContents() as $basketItem) {
-            // Use getArticle(false) to skip the buyable check – out-of-stock
-            // variants that are still in the basket must not cause a fatal error.
-            $article = $basketItem->getArticle(false);
-            if ($article && isset($variantIdMap[$article->getId()])) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * add a ShippingPrice for PPExpress if it is not defined before to prevent overcharge.
      * @param float $defaultShippingPriceExpress

tests/Unit/Model/BasketTest.php

@@ -5,13 +5,11 @@
         [{assign var="bannerAmount" value=$oxcmp_basket->getNettoSum()}]
     [{/if}]
 
-    [{if ($oxcmp_basket->getArtStockInBasket($oDetailsProduct->getId()) === 0) && !$oxcmp_basket->hasProductVariantInBasket($oDetailsProduct)}]
-        [{assign var="oPrice" value=$oDetailsProduct->getPrice()}]
-        [{if $oDetailsProduct->isParentNotBuyable()}]
-            [{assign var="oPrice" value=$oDetailsProduct->getVarMinPrice()}]
-        [{/if}]
-        [{assign var="productPrice" value=$oPrice->getPrice()}]
-        [{assign var="bannerAmount" value=$bannerAmount+$productPrice}]
+    [{assign var="oPrice" value=$oDetailsProduct->getPrice()}]
+    [{if $oDetailsProduct->isParentNotBuyable()}]
+        [{assign var="oPrice" value=$oDetailsProduct->getVarMinPrice()}]
     [{/if}]
+    [{assign var="productPrice" value=$oPrice->getPrice()}]
+    [{assign var="bannerAmount" value=$bannerAmount+$productPrice}]
     [{include file="modules/osc/paypal/installment_banners.tpl" amount=$bannerAmount selector=$oViewConf->getPayPalCheckoutBannerProductDetailsPageSelector()}]
 [{/if}]