Merge remote-tracking branch 'origin/feature/shopware-5-5' into featu…

…re/shopware-5-5
Adyen · Jun 25, 2024 · 6e7bea4 · 6e7bea4
2 parents 77ddb87 + 839b824
commit 6e7bea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
@@ -2,7 +2,7 @@
 on:
   push:
     branches:
-      - master
+      - feature/shopware-5-5
 jobs:
   build:
     permissions:

diff --git a/Components/Integration/PaymentProcessors/ShopperReferenceProcessor.php b/Components/Integration/PaymentProcessors/ShopperReferenceProcessor.php
@@ -54,7 +54,7 @@ public function processPaymentLink(PaymentLinkRequestBuilder $builder, PaymentLi
 
         $builder->setShopperReference(
             ShopperReference::parse(
-                $shop->getHost() . '_' . Shop::getShopId() . '_' . $order->getCustomer()->getId()
+                $shop->getHost() . '_' . $order->getShop()->getId() . '_' . $order->getCustomer()->getId()
             )
         );
     }