Calculate correct tax for applePay express (#1079)

* fix: calculate correct tax for applePay express

* test: update unit tests

src/cartridges/app_adyen_SFRA/cartridge/client/default/js/applePayExpress.js

@@ -233,6 +233,7 @@ initializeCheckout()
  country: shippingContact.country,
  countryCode: shippingContact.countryCode,
  stateCode: shippingContact.administrativeArea,
+ postalCode: shippingContact.postalCode,
  })}`,
  );
  if (shippingMethods.ok) {

src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/__tests__/shippingMethods.test.js

@@ -1,11 +1,13 @@
 /* eslint-disable global-require */
+const BasketMgr = require('dw/order/BasketMgr');
 const AdyenHelper = require('*/cartridge/adyen/utils/adyenHelper');
 
 let res;
 let req;
 const next = jest.fn();
 
 const callGetShippingMethods = require('../shippingMethods');
+const Logger = require("../../../../../../../../jest/__mocks__/dw/system/Logger");
 
 beforeEach(() => {
  jest.clearAllMocks();
@@ -15,6 +17,7 @@ beforeEach(() => {
  city: 'Amsterdam',
  countryCode: 'NL',
  stateCode: 'AMS',
+ postalCode: '1001',
  shipmentUUID: 'mocked_uuid',
  },
  locale: { id: 'nl_NL' },
@@ -52,4 +55,28 @@ describe('Shipping methods', () => {
  callGetShippingMethods(req, res, next);
  expect(res.json).not.toHaveBeenCalled();
  });
+ it('Should update shipping address for the basket', () => {
+ const Logger = require('../../../../../../../../jest/__mocks__/dw/system/Logger');
+ const setCityMock = jest.fn()
+ const setPostalCodeMock = jest.fn()
+ const setStateCodeMock = jest.fn()
+ const setCountryCodeMock = jest.fn()
+ const currentBasketMock = {
+ getDefaultShipment: jest.fn(() =>({
+ createShippingAddress: jest.fn(() => ({
+ setCity: setCityMock,
+ setPostalCode: setPostalCodeMock,
+ setStateCode: setStateCodeMock,
+ setCountryCode: setCountryCodeMock
+ }))
+ })),
+ };
+ BasketMgr.getCurrentBasket.mockReturnValueOnce(currentBasketMock);
+ callGetShippingMethods(req, res, next);
+ expect(setCityMock).toHaveBeenCalledWith('Amsterdam');
+ expect(setPostalCodeMock).toHaveBeenCalledWith('1001');
+ expect(setStateCodeMock).toHaveBeenCalledWith('AMS');
+ expect(setCountryCodeMock).toHaveBeenCalledWith('NL');
+ expect(Logger.error.mock.calls.length).toBe(0);
+ });
 });

src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/expressPayments/shippingMethods.js

@@ -1,4 +1,5 @@
 const BasketMgr = require('dw/order/BasketMgr');
+const Transaction = require('dw/system/Transaction');
 const AdyenLogs = require('*/cartridge/adyen/logs/adyenCustomLogs');
 const AdyenHelper = require('*/cartridge/adyen/utils/adyenHelper');
 
@@ -13,14 +14,25 @@ function callGetShippingMethods(req, res, next) {
  city: req.querystring.city,
  countryCode: req.querystring.countryCode,
  stateCode: req.querystring.stateCode,
+ postalCode: req.querystring.postalCode,
  };
  }
  const currentBasket = BasketMgr.getCurrentBasket();
+ const shipment = currentBasket.getDefaultShipment();
+ Transaction.wrap(() => {
+ let { shippingAddress } = shipment;
+ if (!shippingAddress) {
+ shippingAddress = currentBasket
+ .getDefaultShipment()
+ .createShippingAddress();
+ }
+ shippingAddress.setCity(address.city);
+ shippingAddress.setPostalCode(address.postalCode);
+ shippingAddress.setStateCode(address.stateCode);
+ shippingAddress.setCountryCode(address.countryCode);
+ });
  const currentShippingMethodsModels =
- AdyenHelper.getApplicableShippingMethods(
- currentBasket.getDefaultShipment(),
- address,
- );
+ AdyenHelper.getApplicableShippingMethods(shipment, address);
  res.json({
  shippingMethods: currentShippingMethodsModels,
  });