PSPAYPAL-707 [Oxid 6] Add items to basket if 'amountToBasket' is changed

Author: Daniil Tkachev

src/Controller/ProxyController.php

@@ -324,14 +324,15 @@ public function cancelPayPalPayment()
         exit;
     }
 
-    protected function addToBasket($qty = 1): void
+    protected function addToBasket(): void
     {
         $basket = Registry::getSession()->getBasket();
         $utilsView = Registry::getUtilsView();
         $aSel = Registry::getRequest()->getRequestParameter('sel');
+        $qty = (double)Registry::getRequest()->getRequestParameter('amountToBasket') ?? 0;
         if ($aid = (string)Registry::getRequest()->getRequestEscapedParameter('aid')) {
             try {
-                if (!$this->itemExists($basket, $aid)) {
+                if (!$this->itemExists($basket, $aid, $qty)) {
                     $basket->addToBasket($aid, $qty, $aSel);
                     $basket->isNewItemAdded();
                 }
@@ -605,15 +606,15 @@ public function createApplepayOrder()
         $this->outputJson($response);
     }
 
-    private function itemExists(?Basket $basket, ?string $articleOxid): bool
+    private function itemExists(?Basket $basket, ?string $articleOxid, ?int $amountToBasket): bool
     {
         if ($basket === null) {
             return false;
         }
 
         $basketContents = $basket->getContents();
         foreach ($basketContents as $basketItem) {
-            if ($basketItem->getProductId() === $articleOxid) {
+            if ($basketItem->getProductId() === $articleOxid && $basketItem->getAmount() === $amountToBasket) {
                 return true;
             }
         }

src/Core/ViewConfig.php

@@ -86,8 +86,7 @@ public function isPayPalSandbox(): bool
      */
     public function isPayPalExpressSessionActive(): bool
     {
-        $f = PayPalSession::isPayPalExpressOrderActive();
-        return $f;
+        return PayPalSession::isPayPalExpressOrderActive();
     }
 
     /**

views/tpl/shared/paymentbuttons.tpl

@@ -98,6 +98,9 @@
                                 }
                             });
                         }
+                        let amountElement = document.getElementById("amountToBasket");
+                        let amount = amountElement ? amountElement.value : 0;
+                        params.append('amountToBasket', amount);
                         let baseUrl = '[{$sSelfLink|cat:"cl=oscpaypalproxy&fnc=createOrder&context=continue&aid="|cat:$aid|cat:"&stoken="|cat:$sToken}]';
                         let url = baseUrl + (params.toString() ? '&' + params.toString() : '');
                         return fetch(url , {