Merge branch 'main-4' into feature-4/CR-SET-45

Author: dokmanovicsofija

.github/workflows/e2e/adyen-integration-tools-tests/projects/common/redirect/KlarnaPaymentPage.js

@@ -9,14 +9,36 @@ export default class KlarnaPaymentPage {
     this.closeButton = page.getByLabel('Close');
     this.confirmAndPayButton = page.getByTestId('confirm-and-pay');
 
-    this.chooseHowToPayDialog = page.getByRole('dialog', {
-      name: /choose how to pay/i,
-    });
-    this.cardRadioOption = page.getByRole('radio', { name: /^card/i });
-    this.continueButton = page.getByRole('button', { name: /^continue$/i });
+    this.offersSelectorDialog = page.locator('#offers-selector-dialog');
+    this.payInFullRadioOption = this.offersSelectorDialog
+      .getByRole('radio', { name: /^pay in full/i })
+      .first();
+    this.offersSelectorContinueButton = page.getByTestId(
+      'offers-selector-continue-button'
+    );
+
+    this.payNowSelectorDialog = page.locator(
+      '#offers-selector-pay-now-selector-dialog'
+    );
+    this.cardRadioOption = this.payNowSelectorDialog
+      .getByRole('radio', { name: /^card/i })
+      .first();
+    this.payNowSelectorContinueButton = page.getByTestId(
+      'offers-selector-pay-now-selector-continue-button'
+    );
+
+    this.threeDsSubmitButton = page
+      .getByRole('dialog')
+      .filter({ has: page.locator('iframe') })
+      .frameLocator('iframe')
+      .getByRole('button', { name: /^submit$/i });
   }
 
-  async makeKlarnaPayment(phoneNumber, paynow = false) {
+  async makeKlarnaPayment(
+    phoneNumber,
+    paynow = false,
+    threeDsChallenge = paynow
+  ) {
     await this.waitForKlarnaLoad();
     await this.phoneNumberVerificationDialog.waitFor({ state: 'attached' });
     await this.genericInputField.click();
@@ -27,13 +49,20 @@ export default class KlarnaPaymentPage {
     await this.genericInputField.fill('111111');
 
     if (paynow) {
-      await this.chooseHowToPayDialog.waitFor({ state: 'visible' });
+      await this.offersSelectorDialog.waitFor({ state: 'visible' });
+      await this.payInFullRadioOption.click();
+      await this.offersSelectorContinueButton.click();
+      await this.payNowSelectorDialog.waitFor({ state: 'visible' });
       await this.cardRadioOption.click();
-      await this.continueButton.click();
+      await this.payNowSelectorContinueButton.click();
     }
 
     await this.confirmAndPayButton.waitFor({ state: 'visible' });
     await this.confirmAndPayButton.click();
+
+    if (threeDsChallenge) {
+      await this.threeDsSubmitButton.click();
+    }
   }
 
   async cancelKlarnaPayment() {

.github/workflows/e2e/adyen-integration-tools-tests/projects/data/PaymentResources.js

@@ -189,7 +189,7 @@ export default class PaymentResources {
           countryCode: "NL",
           countryName: "Netherlands",
           stateCode: "NH",
-          phoneNumber: "0612345678",
+          phoneNumber: "+31689124321",
           dateOfBirth: "10071970",
           gender: "M",
         },

.github/workflows/e2e/adyen-integration-tools-tests/projects/shopware/pageObjects/plugin/Result.page.js

@@ -13,10 +13,9 @@ export class ResultPage extends SPRBasePage {
         return (await this.pageHeader.innerText());
     }
 
-    async waitForRedirection() {
-        await this.page.waitForNavigation({
-            url: / *\/checkout\/finish/,
-            timeout: 20000,
+    async waitForRedirection({ timeout = 20000 } = {}) {
+        await this.page.waitForURL(/\/checkout\/finish/, {
+            timeout,
         });
     }
 }

.github/workflows/e2e/adyen-integration-tools-tests/projects/shopware/tests/KlarnaPayment.spec.js

@@ -49,7 +49,7 @@ test.describe.parallel("Payment via Klarna", () => {
 
     test("Pay Klarna Pay Over Time should succeed", async ({ page }) => {
         const klarnaPaymentPage = await proceedToKlarnaPayOverTime(page);
-        await klarnaPaymentPage.makeKlarnaPayment(user.phoneNumber, false);
+        await klarnaPaymentPage.makeKlarnaPayment(user.phoneNumber, false, true);
         await verifySuccessfulPayment(page);
     });
 

.github/workflows/templates/docker-compose.playwright.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.62.1-noble
+    image: mcr.microsoft.com/playwright:v1.63.0-noble
     networks:
       - localnetwork
     shm_size: 1gb

composer.json

@@ -6,7 +6,7 @@
         }
     ],
     "description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
-    "version": "4.6.6",
+    "version": "4.6.7",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "require": {

src/Handlers/AbstractPaymentMethodHandler.php

@@ -299,8 +299,13 @@ public function pay(
         }
         $countStoredStateData = $this->paymentStateDataService->countStoredStateData($salesChannelContext);
         $countStateData += $countStoredStateData;
-        //If condition to check more than 1 PM
-        if ($countStateData > 1 || ($countStateData === 1 && static::getPaymentMethodCode() !== 'giftcard')) {
+        /*
+         * An Adyen order is only required when the payment is split into multiple /payments calls,
+         * which can only happen if at least one giftcard has been redeemed.
+         */
+        if ($countStoredStateData > 0 &&
+            ($countStateData > 1 || static::getPaymentMethodCode() !== 'giftcard')
+        ) {
             $adyenOrderResponse = $this->createAdyenOrder($salesChannelContext, $transaction);
             $this->handleAdyenOrderPayment($transaction, $adyenOrderResponse, $salesChannelContext);
         }

src/Service/NotificationService.php

@@ -75,8 +75,8 @@ public function isDuplicateNotification(array $notification): bool
         if (!empty($notification['pspReference'])) {
             $filters[] = new EqualsFilter('pspreference', $notification['pspReference']);
         }
-        if (!empty($notification['success'])) {
-            $filters[] = new EqualsFilter('success', $notification['success']);
+        if (isset($notification['success'])) {
+            $filters[] = new EqualsFilter('success', $this->isSuccessful($notification['success']));
         }
         if (!empty($notification['eventCode'])) {
             $filters[] = new EqualsFilter('eventCode', $notification['eventCode']);
@@ -113,7 +113,7 @@ public function insertNotification(array $notification): void
             $fields['eventCode'] = $notification['eventCode'];
         }
         if (isset($notification['success'])) {
-            $fields['success'] = "true" === $notification['success'];
+            $fields['success'] = $this->isSuccessful($notification['success']);
         }
         if (isset($notification['paymentMethod'])) {
             $fields['paymentMethod'] = $notification['paymentMethod'];
@@ -372,4 +372,16 @@ public function canBeRescheduled(NotificationEntity $notification): bool
 
         return false;
     }
+
+    /**
+     * Normalises the success flag of a notification.
+     *
+     * @param mixed $success
+     *
+     * @return bool
+     */
+    private function isSuccessful(mixed $success): bool
+    {
+        return true === $success || 'true' === $success;
+    }
 }