Merge pull request #26 from Adyen/feature/AD-336b

AD-336: Google Express Payments, fix for java-lib update
Adyen · Nov 5, 2024 · 98b1670 · 98b1670
2 parents 23b917e + 54cf803
commit 98b1670
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/...-spartacus/src/checkout-adyen-payment-method/checkout-adyen-payment-method.component.scss b/...-spartacus/src/checkout-adyen-payment-method/checkout-adyen-payment-method.component.scss
@@ -1 +0,0 @@
-/*@import '@adyen/adyen-web/dist/adyen.css';*/

diff --git a/...en/adyen-spartacus/src/express/google-express-payment/google-express-payment.component.ts b/...en/adyen-spartacus/src/express/google-express-payment/google-express-payment.component.ts
@@ -57,7 +57,7 @@ export class GoogleExpressPaymentComponent implements OnInit, OnDestroy{
 
   ngOnDestroy(): void {
     this.subscriptions.unsubscribe();
-    this.googlePay.unmount();
+    if(this.googlePay) this.googlePay.unmount();
   }
 
   private initializeGooglePay() {

diff --git a/projects/adyen/adyen-spartacus/src/service/adyen-express-order.service.ts b/projects/adyen/adyen-spartacus/src/service/adyen-express-order.service.ts
@@ -88,10 +88,7 @@ export class AdyenExpressOrderService extends AdyenOrderService {
 
   prepareDataGoogle(paymentData: any, authorizedPaymentData: any, product: Product): GooglePayExpressCartRequest {
     const baseData = {
-      googlePayDetails: {
-        googlePayToken: paymentData.paymentMethod.googlePayToken,
-        googlePayCardNetwork: paymentData.paymentMethod.googlePayCardNetwork
-      },
+      googlePayDetails: paymentData.paymentMethod,
       addressData: {
         email: authorizedPaymentData.authorizedEvent.email,
         firstName: paymentData.deliveryAddress.firstName,
@@ -107,7 +104,7 @@ export class AdyenExpressOrderService extends AdyenOrderService {
         }
       }
     };
-
+    delete baseData.googlePayDetails.subtype;
     return product ? { productCode: product.code, ...baseData } : baseData;
   }
 }
diff --git a/projects/adyen/adyen-spartacus/src/service/checkout-adyen-configuration.service.spec.ts b/projects/adyen/adyen-spartacus/src/service/checkout-adyen-configuration.service.spec.ts
@@ -82,7 +82,8 @@ describe('CheckoutAdyenConfigurationService', () => {
       immediateCapture: false,
       countryCode: 'US',
       cardHolderNameRequired: true,
-      sepaDirectDebit: false
+      sepaDirectDebit: false,
+      amountDecimal: 1000
     };
 
     checkoutConfigurationConnector.getCheckoutConfiguration.and.returnValue(of(mockConfigData));