chore: merging develop into SFI-42 and adding required mocks (#1115)

Adyen · Jul 4, 2024 · 6df3c65 · 6df3c65
1 parent 9da92d8
commit 6df3c65
Show file tree

Hide file tree

Showing 39 changed files with 17,920 additions and 23,017 deletions.
diff --git a/documentation/Adyen SFCC Docs.md b/documentation/Adyen SFCC Docs.md
diff --git a/documentation/README.md b/documentation/README.md
@@ -0,0 +1,39 @@
+# Adyen Salesforce Commerce Cloud Integration
+
+Integrate Adyen with Salesforce Commerce Cloud using the Storefront Reference Architecture (SFRA). This method provides seamless access to Adyen's extensive payment features through the Adyen payments cartridge.
+&nbsp; 
+
+The documentation includes detailed diagrams to help you understand the integration process and enhance your e-commerce capabilities using Adyen's robust payment solutions.
+&nbsp;
+
+For more details, visit the [Adyen Salesforce Commerce Cloud documentation](https://docs.adyen.com/plugins/salesforce-commerce-cloud/).
+
+The below flow diagrams are applicable to this release.
+
+## Get Payment Methods
+![get-payment-methods.png](diagrams/get-payment-methods.png)
+## Payment Without Action
+Example payment methods, that are covered by this flow: Cards without 3DS, SEPA Direct Debit.
+![payment-without-action.png](diagrams/payment-without-action.png)
+## Payment With Action
+Example payment methods, that are covered by this flow: 3DS2 Cards, Bancontact.
+![payment-with-action.png](diagrams/payment-with-action.png)
+## Payment From Component
+Example payment methods, that are covered by this flow: PayPal, MBWay, Apple Pay, Amazon Pay etc.
+![payment-from-component.png](diagrams/payment-from-component.png)
+## Single Giftcard Flow
+![single-giftcard-flow.png](diagrams/single-giftcard-flow.png)
+## Multiple Giftcards Flow
+![multiple-giftcards-flow.png](diagrams/multiple-giftcards-flow.png)
+## Apple Pay Express
+Example payment methods, that are covered by this flow: Apple Pay Express from Cart/mini-cart.
+![apple-pay-express.png](diagrams/apple-pay-express.png)
+## PayPal Express
+Example payment methods, that are covered by this flow: PayPal Express from Cart/mini-cart.
+
+## Amazon Pay Express
+Example payment methods, that are covered by this flow: Amazon Pay Express from Cart/mini-cart.
+![amazon-pay-express.png](diagrams/amazon-pay-express.png)
+
+## Webhooks Flow
+![webhooks-flow.png](diagrams/webhooks-flow.png)
diff --git a/documentation/diagrams/amazon-pay-express.png b/documentation/diagrams/amazon-pay-express.png
diff --git a/documentation/diagrams/apple-pay-express.png b/documentation/diagrams/apple-pay-express.png
diff --git a/documentation/diagrams/get-payment-methods.png b/documentation/diagrams/get-payment-methods.png
diff --git a/documentation/diagrams/multiple-giftcards-flow.png b/documentation/diagrams/multiple-giftcards-flow.png
diff --git a/documentation/diagrams/payment-from-component.png b/documentation/diagrams/payment-from-component.png
diff --git a/documentation/diagrams/payment-with-action.png b/documentation/diagrams/payment-with-action.png
diff --git a/documentation/diagrams/payment-without-action.png b/documentation/diagrams/payment-without-action.png
diff --git a/documentation/diagrams/single-giftcard-flow.png b/documentation/diagrams/single-giftcard-flow.png
diff --git a/documentation/diagrams/webhooks-flow.png b/documentation/diagrams/webhooks-flow.png
diff --git a/jest/__mocks__/dw/crypto/Encoding.js b/jest/__mocks__/dw/crypto/Encoding.js
@@ -0,0 +1 @@
+export const Encoding = jest.fn();
diff --git a/jest/__mocks__/dw/crypto/MessageDigest.js b/jest/__mocks__/dw/crypto/MessageDigest.js
@@ -0,0 +1 @@
+export const MessageDigest = jest.fn();
diff --git a/jest/__mocks__/dw/order/ShippingLocation.js b/jest/__mocks__/dw/order/ShippingLocation.js
@@ -0,0 +1 @@
+export const ShippingLocation = jest.fn();
diff --git a/jest/__mocks__/dw/order/TaxMgr.js b/jest/__mocks__/dw/order/TaxMgr.js
@@ -0,0 +1,2 @@
+export const getTaxJurisdictionID = jest.fn();
+export const getTaxRate = jest.fn();
diff --git a/jest/__mocks__/dw/svc/LocalServiceRegistry.js b/jest/__mocks__/dw/svc/LocalServiceRegistry.js
@@ -0,0 +1 @@
+export const createService = jest.fn();
diff --git a/jest/__mocks__/dw/util/Bytes.js b/jest/__mocks__/dw/util/Bytes.js
@@ -0,0 +1 @@
+export const Bytes = jest.fn();
diff --git a/jest/__mocks__/dw/util/Currency.js b/jest/__mocks__/dw/util/Currency.js
@@ -0,0 +1 @@
+export const getCurrency = jest.fn();
diff --git a/jest/sfccCartridgeMocks.js b/jest/sfccCartridgeMocks.js
@@ -7,6 +7,8 @@ jest.mock('*/cartridge/models/cart', () => jest.fn(), { virtual: true });
 
 jest.mock('*/cartridge/models/account', () => jest.fn(), { virtual: true });
 
+jest.mock('*/cartridge/models/shipping/shippingMethod', () => jest.fn(), { virtual: true });
+
 jest.mock(
   '*/cartridge/scripts/checkout/shippingHelpers',
   () => ({

diff --git a/jest/sfccPathSetup.js b/jest/sfccPathSetup.js
@@ -70,6 +70,12 @@ jest.mock(
   { virtual: true },
 );
 
+jest.mock(
+	'*/cartridge/models/shipping/shippingMethod',
+	() => require('../cartridge/models/shipping/shippingMethod'),
+	{ virtual: true },
+  );
+
 jest.mock(
   '*/cartridge/adyen/scripts/partialPayments/partialPaymentsOrder',
   () =>