Feature/ad 375

angular.json

@@ -123,5 +123,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

projects/adyen/adyen-spartacus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adyen/adyen-spartacus",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "schematics": "./schematics/collection.json",
   "peerDependencies": {
     "@angular/common": "^17.3.0",

projects/adyen/adyen-spartacus/src/core/connectors/adyen-order-connector.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
   ApplePayExpressRequest,
-  GooglePayExpressCartRequest,
+  GooglePayExpressRequest,
   PlaceOrderRequest,
   PlaceOrderResponse
 } from "../models/occ.order.models";
@@ -20,11 +20,11 @@ export class AdyenOrderConnector {
     return this.adapter.cancelPayment(userId, cartId, orderCode);
   }
 
-  placeGoogleExpressOrderCart(userId: string, cartId: string, request: GooglePayExpressCartRequest): Observable<PlaceOrderResponse> {
-    return this.adapter.placeGoogleExpressOrderCart(userId, cartId, request);
+  placeGoogleExpressOrderCart(userId: string, cartId: string, request: GooglePayExpressRequest, isPDP: boolean): Observable<PlaceOrderResponse> {
+    return this.adapter.placeGoogleExpressOrderCart(userId, cartId, request, isPDP);
   }
 
-  placeAppleExpressOrder(userId: string, cartId: string, request: ApplePayExpressRequest): Observable<PlaceOrderResponse> {
-    return this.adapter.placeAppleExpressOrder(userId, cartId, request);
+  placeAppleExpressOrder(userId: string, cartId: string, request: ApplePayExpressRequest, isPDP: boolean): Observable<PlaceOrderResponse> {
+    return this.adapter.placeAppleExpressOrder(userId, cartId, request, isPDP);
   }
 }

projects/adyen/adyen-spartacus/src/core/models/occ.order.models.ts

@@ -2,12 +2,13 @@ import { PaymentAction,PaymentResponseData } from "@adyen/adyen-web";
 import { Order } from '@spartacus/order/root';
 
 export interface ApplePayExpressRequest {
+  cartId?: string;
   applePayDetails: any;
   addressData: any;
   productCode?: string;
 }
 
-export interface GooglePayExpressCartRequest {
+export interface GooglePayExpressRequest {
   googlePayDetails: any;
   addressData: any;
   productCode?: string;

projects/adyen/adyen-spartacus/src/core/occ/adapters/occ-adyen-order.adapter.ts

@@ -4,7 +4,7 @@ import {OccEndpointsService} from '@spartacus/core';
 import {Observable} from 'rxjs';
 import {
   ApplePayExpressRequest,
-  GooglePayExpressCartRequest,
+  GooglePayExpressRequest,
   PlaceOrderRequest,
   PlaceOrderResponse
 } from "../../models/occ.order.models";
@@ -45,8 +45,8 @@ export class OccAdyenOrderAdapter {
     });
   }
 
-  public placeGoogleExpressOrderCart(userId: string, cartId: string, orderData: GooglePayExpressCartRequest): Observable<PlaceOrderResponse> {
-    return this.http.post<PlaceOrderResponse>(orderData.cartId  ? this.getPlaceGoogleExpressOrderEndpointProduct(userId, cartId) : this.getPlaceGoogleExpressOrderEndpointCart(userId, cartId), orderData);
+  public placeGoogleExpressOrderCart(userId: string, cartId: string, orderData: GooglePayExpressRequest, isPDP: boolean): Observable<PlaceOrderResponse> {
+    return this.http.post<PlaceOrderResponse>(isPDP  ? this.getPlaceGoogleExpressOrderEndpointProduct(userId, cartId) : this.getPlaceGoogleExpressOrderEndpointCart(userId, cartId), orderData);
   }
 
   protected getPlaceGoogleExpressOrderEndpointCart(userId: string, cartId: string): string {
@@ -67,8 +67,8 @@ export class OccAdyenOrderAdapter {
     });
   }
 
-  public placeAppleExpressOrder(userId: string, cartId: string, orderData: ApplePayExpressRequest): Observable<PlaceOrderResponse> {
-    return this.http.post<PlaceOrderResponse>(orderData.productCode  ? this.getPlaceAppleExpressOrderEndpointProduct(userId, cartId) : this.getPlaceAppleExpressOrderEndpointCart(userId, cartId), orderData);
+  public placeAppleExpressOrder(userId: string, cartId: string, orderData: ApplePayExpressRequest, isPDP: boolean): Observable<PlaceOrderResponse> {
+    return this.http.post<PlaceOrderResponse>(isPDP  ? this.getPlaceAppleExpressOrderEndpointProduct(userId, cartId) : this.getPlaceAppleExpressOrderEndpointCart(userId, cartId), orderData);
   }
 
   protected getPlaceAppleExpressOrderEndpointCart(userId: string, cartId: string): string {

projects/adyen/adyen-spartacus/src/events/checkout-adyen.events.ts

@@ -9,4 +9,10 @@ export class CheckoutAdyenConfigurationReloadEvent extends CheckoutAdyenConfigur
   }
 }
 
+export class ExpressCheckoutSuccessfulEvent extends CheckoutEvent {
+  readonly type = 'ExpressCheckoutSuccessfulEvent';
+  constructor() {
+    super();
+  }
+}
 

projects/adyen/adyen-spartacus/src/express/apple-express-payment/apple-express-payment.component.ts

@@ -4,10 +4,11 @@ import {ApplePay, SubmitData, UIElement} from "@adyen/adyen-web";
 import {AdyenCheckout, AdyenCheckoutError} from '@adyen/adyen-web/auto';
 import {AdyenExpressConfigData} from "../../core/models/occ.config.models";
 import {AdyenExpressOrderService} from "../../service/adyen-express-order.service";
-import {Product, RoutingService,} from '@spartacus/core';
-import {Subscription} from 'rxjs';
-import {ActiveCartFacade} from '@spartacus/cart/base/root';
+import {EventService, Product, RoutingService, UserIdService,} from '@spartacus/core';
+import {ActiveCartFacade, Cart, DeliveryMode, MultiCartFacade} from '@spartacus/cart/base/root';
 import {getAdyenExpressCheckoutConfig} from "../adyenCheckoutConfig.util";
+import {ExpressPaymentBase} from "../base/express-payment-base";
+import {AdyenCartService} from "../../service/adyen-cart-service";
 
 @Component({
   selector: 'cx-apple-express-payment',
@@ -16,9 +17,7 @@ import {getAdyenExpressCheckoutConfig} from "../adyenCheckoutConfig.util";
   templateUrl: './apple-express-payment.component.html',
   styleUrls: ['./apple-express-payment.component.css']
 })
-export class AppleExpressPaymentComponent implements OnInit, OnDestroy{
-
-  protected subscriptions = new Subscription();
+export class AppleExpressPaymentComponent extends ExpressPaymentBase implements OnInit, OnDestroy {
 
   @Input()
   product: Product;
@@ -34,16 +33,18 @@ export class AppleExpressPaymentComponent implements OnInit, OnDestroy{
     protected adyenOrderService: AdyenExpressOrderService,
     protected routingService: RoutingService,
     protected activeCartFacade: ActiveCartFacade,
-  ) {}
+    protected override multiCartService: MultiCartFacade,
+    protected override userIdService: UserIdService,
+    protected override adyenCartService: AdyenCartService,
+    protected override eventService: EventService
+  ) {
+    super(multiCartService, userIdService, activeCartFacade, adyenCartService, eventService)
+  }
 
   ngOnInit(): void {
     this.setupAdyenCheckout(this.configuration)
   }
 
-  ngOnDestroy(): void {
-    this.subscriptions.unsubscribe();
-    if(this.applePay) this.applePay.unmount();
-  }
 
   private async setupAdyenCheckout(config: AdyenExpressConfigData) {
     const adyenCheckout = await AdyenCheckout(getAdyenExpressCheckoutConfig(config));
@@ -57,6 +58,7 @@ export class AppleExpressPaymentComponent implements OnInit, OnDestroy{
         merchantId: config.applePayMerchantId,
         merchantName: config.applePayMerchantName
       },
+      isExpress: true,
       // Button config
       buttonType: "check-out",
       buttonColor: "black",
@@ -65,6 +67,39 @@ export class AppleExpressPaymentComponent implements OnInit, OnDestroy{
         "name",
         "email"
       ],
+      onShippingContactSelected: (resolve, reject, event) => {
+        const mappingFunction = (cart: Cart, deliveryModes: DeliveryMode[]): any => {
+          return {
+            newTotal: {
+              label: config.applePayMerchantName,
+              type: 'final',
+              amount: cart.totalPriceWithTax!.value!.toString()
+            },
+            newShippingMethods: deliveryModes.map((mode) => ({
+              identifier: mode.code!,
+              label: mode.name || "",
+              detail: mode.description || "",
+              amount: mode.deliveryCost!.value!.toString()
+            }))
+          }
+        }
+        if (event.shippingContact) {
+          const address = {postalCode: event.shippingContact.postalCode!, countryCode: event.shippingContact.countryCode!}
+          this.handleShippingContactSelected<any>(address, this.product, mappingFunction, resolve, reject)
+        }
+      },
+      onShippingMethodSelected: (resolve, reject, event) => {
+        const mappingFunction = (cart: Cart): any => {
+          return {
+            newTotal: {
+              label: config.applePayMerchantName,
+              type: 'final',
+              amount: cart.totalPriceWithTax!.value!.toString()
+            }
+          }
+        }
+        this.setDeliveryMode<any>(event.shippingMethod.identifier, this.product, mappingFunction, resolve, reject);
+      },
       onSubmit: (state, element: UIElement, actions) => this.handleOnSubmit(state, actions),
       onAuthorized: (paymentData, actions) => {
         this.authorizedPaymentData = paymentData;
@@ -78,29 +113,42 @@ export class AppleExpressPaymentComponent implements OnInit, OnDestroy{
   }
 
   private handleOnSubmit(state: SubmitData, actions: any) {
-    this.adyenOrderService.adyenPlaceAppleExpressOrder(state.data, this.authorizedPaymentData, this.product).subscribe(
-      result => {
-        if (result?.success) {
-          if (result.executeAction && result.paymentsAction !== undefined) {
-            this.applePay.handleAction(result.paymentsAction);
+    if(!!this.cartId){
+      this.adyenOrderService.adyenPlaceAppleExpressOrder(state.data, this.authorizedPaymentData, this.product, this.cartId).subscribe(
+        result => {
+          if (result?.success) {
+            if (result.executeAction && result.paymentsAction !== undefined) {
+              this.applePay.handleAction(result.paymentsAction);
+            } else {
+              this.onSuccess();
+            }
           } else {
-            this.onSuccess();
+            console.error(result?.error);
+            actions.reject();
           }
-        } else {
-          console.error(result?.error);
+          actions.resolve({resultCode: 'Authorised'});
+        },
+        error => {
+          console.error(error);
           actions.reject();
         }
-        actions.resolve({ resultCode: 'Authorised' });
-      },
-      error => {
-        console.error(error);
-        actions.reject();
-      }
-    );
+      );
+    } else {
+      console.error("Undefined cart id")
+    }
+
+  }
+
+  handleError(error: AdyenCheckoutError) {
   }
-  handleError(error: AdyenCheckoutError) {}
 
   onSuccess(): void {
-    this.routingService.go({ cxRoute: 'orderConfirmation' });
+    this.routingService.go({cxRoute: 'orderConfirmation'});
+  }
+
+  override ngOnDestroy(): void {
+    super.ngOnDestroy()
+    this.subscriptions.unsubscribe();
+    if (this.applePay) this.applePay.unmount();
   }
 }