Merge pull request #1074 from Adyen/release/24.2.0

Release/24.2.0

.eslintignore

@@ -6,18 +6,20 @@ bundle.js
 
 # Compiled web component bundle file
 src/cartridges/int_adyen_controllers/cartridge/js/pages/checkout/bundle.js
-src/cartridges/int_adyen_SFRA/cartridge/client/default/js/bundle.js
+src/cartridges/app_adyen_SFRA/cartridge/client/default/js/bundle.js
 
 # Extended SFRA core file
-src/cartridges/int_adyen_SFRA/cartridge/client/default/js/checkout/checkoutSFRA5.js
-src/cartridges/int_adyen_SFRA/cartridge/client/default/js/checkout/checkoutSFRA6.js
+src/cartridges/app_adyen_SFRA/cartridge/client/default/js/checkout/checkoutSFRA5.js
+src/cartridges/app_adyen_SFRA/cartridge/client/default/js/checkout/checkoutSFRA6.js
 src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/checkout_services/placeOrder.js
+src/cartridges/int_adyen_SFRA/cartridge/adyen/webhooks
+src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenHelper.js
+src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/adyenConfigs.js
+src/cartridges/int_adyen_SFRA/cartridge/adyen/utils/lineItemHelper.js
+src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenGetOpenInvoiceData.js
+src/cartridges/int_adyen_SFRA/cartridge/adyen/scripts/payments/adyenTerminalApi.js
 
 # Test files
 src/cartridges/int_adyen_SFRA/test
 *.test.js
 
-# remove lines below from ignore after refactor
-src/cartridges/int_adyen_overlay
-src/cartridges/int_adyen_controllers
-src/cartridges/adyen_controllers_changes

.eslintrc.js

@@ -89,7 +89,13 @@ module.exports = {
     "object-curly-newline": ["error", {
       "ImportDeclaration": { multiline: true, "minProperties": 4 }
     }],
+    "import/prefer-default-export": "off",
     "implicit-arrow-linebreak": "off",
-    "no-param-reassign": ["error", { "props": false }]
+    "no-param-reassign": ["error", { "props": false }],
+    "no-plusplus": "off",
+    "import/extensions": "off",
+    "camelcase": "off",
+    "no-bitwise": "off",
+	"no-underscore-dangle": "off"
   },
 };

.github/workflows/cartridges-commit.yml

@@ -65,10 +65,13 @@ jobs:
         if: success()
         run: | 
           cd adyen-salesforce-commerce-cloud/cartridges
-          version=$(grep "^\s*VERSION:" int_adyen_overlay/cartridge/adyenConstants/constants.js | awk -F"'" '{print $2}' | tr -d '\n')
+          version=$(grep "^\s*VERSION:" int_adyen_SFRA/cartridge/adyen/config/constants.js | awk -F"'" '{print $2}' | tr -d '\n')
           version="v${version}"
-            for name in "int_adyen_overlay" "int_adyen_SFRA" "bm_adyen"; do
-              echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+          export version
+          find . -mindepth 1 -maxdepth 1 -type d -exec sh -c '
+            for dir do
+              name=$(basename "$dir")
+              echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
               <projectDescription>
                 <name>${name}</name>
                 <comment>${version}</comment>
@@ -84,6 +87,7 @@ jobs:
                 </natures>
               </projectDescription>" > "${name}/.project"
             done
+            ' sh {} +
             git add .
             git config --local user.email "[email protected]"
             git config --local user.name "GitHub Actions"

README.md

@@ -3,8 +3,8 @@
 Adyen provides a LINK cartridge to integrate with [Salesforce Commerce Cloud (SFCC)](https://docs.adyen.com/plugins/salesforce-commerce-cloud). This cartridge enables an SFCC storefront to use the Adyen payment service.  
 
 ## Compatibility with SFCC architectures
-SFRA version 5.x.x & 6.x.x.: [Supported in all cartridge versions, see the latest](https://github.com/Adyen/adyen-salesforce-commerce-cloud/releases)    
-SiteGenesis JS-Controllers version 103.1.11 and higher: Supported up to cartridge [v22.2.2](https://github.com/Adyen/adyen-salesforce-commerce-cloud/releases/tag/22.2.2)
+- SFRA version 5.x.x & 6.x.x.: [Supported in all cartridge versions, see the latest](https://github.com/Adyen/adyen-salesforce-commerce-cloud/releases)    
+- SiteGenesis JS-Controllers version 103.1.11 and higher: Hosted in a separate repo - see cartridge [v22.2.3](https://github.com/Adyen/adyen-salesforce-commerce-cloud-site-genesis/releases/tag/22.2.3)
 
 ## Integration
 This cartridge allows you to integrate with Adyen without the need for any development work from your end. Online payments are processed on the back-end using the [Checkout API](https://docs.adyen.com/api-explorer/Checkout/latest/overview), and on the client side, Adyen’s [Web Components](https://docs.adyen.com/online-payments/components-web) are used to render payment methods. 

cartridges/app_adyen_SFRA/.project

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <projectDescription>
+      <name>app_adyen_SFRA</name>
+      <comment>v24.2.0</comment>
+      <projects></projects>
+      <buildSpec>
+        <buildCommand>
+          <name>com.demandware.studio.core.beehiveElementBuilder</name>
+          <arguments></arguments>
+        </buildCommand>
+      </buildSpec>
+      <natures>
+        <nature>com.demandware.studio.core.beehiveNature</nature>
+      </natures>
+    </projectDescription>

cartridges/app_adyen_SFRA/cartridge/app_adyen_SFRA.properties

@@ -0,0 +1,7 @@
+## cartridge.properties for cartridge LINK_adyen
+#Thu Apr 26 2018 13:00:35 GMT+0000 (UTC)
+demandware.cartridges.app_adyen_SFRA.multipleLanguageStorefront=true
+demandware.cartridges.app_adyen_SFRA.id=app_adyen_SFRA
+
+# defines what ID the storefront application cartridge has - default is app_tdc
+demandware.core.cartridge=app_storefront_core

cartridges/app_adyen_SFRA/cartridge/client/default/js/adyenAccount.js

@@ -0,0 +1,126 @@
+"use strict";
+
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _require = require('./commons'),
+  onFieldValid = _require.onFieldValid,
+  onBrand = _require.onBrand;
+var store = require('../../../store');
+var checkout;
+var card;
+
+// Store configuration
+store.checkoutConfiguration.amount = {
+  value: 0,
+  currency: 'EUR'
+};
+store.checkoutConfiguration.paymentMethodsConfiguration = {
+  card: {
+    enableStoreDetails: false,
+    hasHolderName: true,
+    holderNameRequired: true,
+    installments: [],
+    onBrand: onBrand,
+    onFieldValid: onFieldValid,
+    onChange: function onChange(state) {
+      store.isValid = state.isValid;
+      store.componentState = state;
+    }
+  }
+};
+
+// Handle Payment action
+function handleAction(action) {
+  checkout.createFromAction(action).mount('#action-container');
+  $('#action-modal').modal({
+    backdrop: 'static',
+    keyboard: false
+  });
+}
+
+// confirm onAdditionalDetails event and paymentsDetails response
+store.checkoutConfiguration.onAdditionalDetails = function (state) {
+  $.ajax({
+    type: 'POST',
+    url: 'Adyen-PaymentsDetails',
+    data: JSON.stringify({
+      data: state.data
+    }),
+    contentType: 'application/json; charset=utf-8',
+    async: false,
+    success: function success(data) {
+      if (data.isSuccessful) {
+        window.location.href = window.redirectUrl;
+      } else if (!data.isFinal && _typeof(data.action) === 'object') {
+        handleAction(data.action);
+      } else {
+        $('#action-modal').modal('hide');
+        document.getElementById('cardError').style.display = 'block';
+      }
+    }
+  });
+};
+function initializeCardComponent() {
+  return _initializeCardComponent.apply(this, arguments);
+}
+function _initializeCardComponent() {
+  _initializeCardComponent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var cardNode;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          cardNode = document.getElementById('card');
+          _context.next = 3;
+          return AdyenCheckout(store.checkoutConfiguration);
+        case 3:
+          checkout = _context.sent;
+          card = checkout.create('card').mount(cardNode);
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _initializeCardComponent.apply(this, arguments);
+}
+var formErrorsExist = false;
+function submitAddCard() {
+  var form = $(document.getElementById('payment-form'));
+  $.ajax({
+    type: 'POST',
+    url: form.attr('action'),
+    data: form.serialize(),
+    async: false,
+    success: function success(data) {
+      if (data.redirectAction) {
+        handleAction(data.redirectAction);
+      } else if (data.redirectUrl) {
+        window.location.href = data.redirectUrl;
+      } else if (data.error) {
+        formErrorsExist = true;
+      }
+    }
+  });
+}
+initializeCardComponent();
+
+// Add Payment Button event handler
+$('button[value="add-new-payment"]').on('click', function (event) {
+  if (store.isValid) {
+    document.querySelector('#adyenStateData').value = JSON.stringify(store.componentState.data);
+    submitAddCard();
+    if (formErrorsExist) {
+      return;
+    }
+    event.preventDefault();
+  } else {
+    var _card;
+    (_card = card) === null || _card === void 0 ? void 0 : _card.showValidation();
+  }
+});
+module.exports = {
+  initializeCardComponent: initializeCardComponent,
+  submitAddCard: submitAddCard
+};