[PW-7981] Change productUrl builder for line items (#355)

Adyen · Mar 3, 2023 · 48cd454 · 48cd454
1 parent e189d1a
commit 48cd454
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/Handlers/AbstractPaymentMethodHandler.php b/src/Handlers/AbstractPaymentMethodHandler.php
@@ -606,10 +606,13 @@ protected function preparePaymentsRequest(
                     $this->getProduct($orderLine->getProductId(), $salesChannelContext->getContext()) :
                     null;
 
-                if (isset($product) && !is_null($product->getSeoUrls())) {
-                    $hostname = $salesChannelContext->getSalesChannel()->getDomains()->first()->getUrl();
-                    $productPath = $product->getSeoUrls()->first()->getPathInfo();
-                    $productUrl = str_replace('//', '/', $hostname . $productPath);
+                // Add url for only real product and not for the custom cart items.
+                if (!is_null($product->getId())) {
+                    $productUrl = sprintf(
+                        "%s/detail/%s",
+                        $salesChannelContext->getSalesChannel()->getDomains()->first()->getUrl(),
+                        $product->getId()
+                    );
                 } else {
                     $productUrl = null;
                 }
@@ -741,7 +744,6 @@ private function getProduct(string $productId, Context $context): ProductEntity
     {
         $criteria = new Criteria([$productId]);
 
-        $criteria->addAssociation('seoUrls');
         $criteria->addAssociation('cover');
         $criteria->addAssociation('categories');
 

diff --git a/src/Service/PaymentRequestService.php b/src/Service/PaymentRequestService.php
@@ -375,11 +375,13 @@ public function getLineItems(
                 $item['imageUrl'] = $product->getCover()->getMedia()->getUrl();
             }
 
-            if (!is_null($product->getSeoUrls())) {
-                $hostname = $salesChannelContext->getSalesChannel()->getDomains()->first()->getUrl();
-                $productPath = $product->getSeoUrls()->first()->getPathInfo();
-
-                $item['productUrl'] = str_replace('//', '/', $hostname . $productPath);
+            // Add url for only real product and not for the custom cart items.
+            if (!is_null($product->getId())) {
+                $item['productUrl'] = sprintf(
+                    "%s/detail/%s",
+                    $salesChannelContext->getSalesChannel()->getDomains()->first()->getUrl(),
+                    $product->getId()
+                );
             }
 
             //Building open invoice line
@@ -448,7 +450,6 @@ public function getProduct(string $productId, Context $context): ProductEntity
     {
         $criteria = new Criteria([$productId]);
 
-        $criteria->addAssociation('seoUrls');
         $criteria->addAssociation('cover');
 
         /** @var ProductCollection $productCollection */