include latest built cartridges

Adyen · Dec 29, 2022 · 99d32a6 · 99d32a6
1 parent fb154dd
commit 99d32a6
Show file tree

Hide file tree

Showing 80 changed files with 1,246 additions and 485 deletions.
diff --git a/...rs_changes/app_storefront_controllers_changes/cartridge/controllers/PaymentInstruments.js b/...rs_changes/app_storefront_controllers_changes/cartridge/controllers/PaymentInstruments.js
@@ -9,7 +9,6 @@
 
 /* API includes */
 var PaymentInstrument = require('dw/order/PaymentInstrument');
-var Logger = require('dw/system/Logger');
 var PaymentMgr = require('dw/order/PaymentMgr');
 var PaymentStatusCodes = require('dw/order/PaymentStatusCodes');
 var Status = require('dw/system/Status');
@@ -25,6 +24,7 @@ var AdyenHelper = require('int_adyen_overlay/cartridge/scripts/util/adyenHelper'
 var AdyenConfigs = require('int_adyen_overlay/cartridge/scripts/util/adyenConfigs');
 var adyenSessions = require('int_adyen_overlay/cartridge/scripts/adyenSessions');
 var adyenSaveCreditCard = require("*/cartridge/scripts/adyenSaveCreditCard");
+var AdyenLogs = require("int_adyen_overlay/cartridge/scripts/adyenCustomLogs");
 // ### Custom Adyen cartridge end ###
 
 /**
@@ -164,7 +164,7 @@ function create() {
         });
       });
     } catch (e) {
-      Logger.error('{0}:  {1}', e, e.stack);
+      AdyenLogs.error_log(`${e}: ${e.stack}`);
       return false;
     }
     return true;

diff --git a/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js b/cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js
@@ -2,11 +2,11 @@
 
 var server = require('server');
 var Transaction = require('dw/system/Transaction');
-var Logger = require('dw/system/Logger');
 var csrfProtection = require('*/cartridge/scripts/middleware/csrf');
 var AdyenConfigs = require('*/cartridge/scripts/util/adyenConfigs');
 var AdyenHelper = require('*/cartridge/scripts/util/adyenHelper');
 var constants = require('*/cartridge/adyenConstants/constants');
+var AdyenLogs = require('*/cartridge/scripts/adyenCustomLogs');
 server.get('Start', csrfProtection.generateToken, function (_req, res, next) {
   res.render('adyenSettings/settings');
   return next();
@@ -23,7 +23,7 @@ server.post('Save', server.middleware.https, function (req, res, next) {
       success: true
     });
   } catch (error) {
-    Logger.getLogger('Adyen').error("Error while saving settings in BM configuration: ".concat(error));
+    AdyenLogs.error_log("Error while saving settings in BM configuration: ".concat(error));
     res.json({
       success: false
     });
@@ -60,7 +60,7 @@ server.post('TestConnection', server.middleware.https, function (req, res, next)
       error: false
     });
   } catch (error) {
-    Logger.getLogger('Adyen').error("Error while testing API credentials: ".concat(error));
+    AdyenLogs.error_log("Error while testing API credentials: ".concat(error));
     res.json({
       error: true,
       message: 'an unknown error has occurred',

diff --git a/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml b/cartridges/bm_adyen/cartridge/templates/default/adyenSettings/settingCards/cardSettings.isml
@@ -23,20 +23,6 @@
                </div>
             </div>
          </div>
-         <div class="form-group">
-            <label class="form-title mb-0" for="3dSecure">3D Secure 2 (3DS2)</label>
-            <small id="3dSecureHelp" class="form-text mb-1">With 3DS2, the card issuer can perform authentication inside your app or payment form.</small>
-            <div class="radio-buttons">
-               <div class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="Adyen3DS2Enabled" id="3dSecureYes" value=true ${AdyenConfigs.getAdyen3DS2Enabled() ? 'checked': ''}>
-                  <label class="form-check-label" for="3dSecureYes">Enable</label>
-               </div>
-               <div class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="Adyen3DS2Enabled" id="3dSecureNo" value=false ${!AdyenConfigs.getAdyen3DS2Enabled() ? 'checked': ''}>
-                  <label class="form-check-label" for="3dSecureNo">Disable</label>
-               </div>
-            </div>
-         </div>
          <div class="form-group">
             <label class="form-title mb-0" for="installments">Credit card installments <small class="text-secondary">(optional)</small></label>
             <small id="installmentsHelp" class="form-text mb-1">

diff --git a/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js b/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyenCheckout.js
@@ -32,7 +32,7 @@ if (window.cardholderNameBool !== 'null') {
   store.checkoutConfiguration.paymentMethodsConfiguration.card.holderNameRequired = true;
 }
 if (window.googleMerchantID !== 'null' && window.Configuration.environment === 'live') {
-  var id = 'merchantIdentifier';
+  var id = 'merchantId';
   store.checkoutConfiguration.paymentMethodsConfiguration.paywithgoogle.configuration[id] = window.googleMerchantID;
   store.checkoutConfiguration.paymentMethodsConfiguration.googlepay.configuration[id] = window.googleMerchantID;
 }

diff --git a/...A/cartridge/client/default/js/adyen_checkout/__tests__/__snapshots__/helpers.test.js.snap b/...A/cartridge/client/default/js/adyen_checkout/__tests__/__snapshots__/helpers.test.js.snap
@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Helpers   should make payment ajax call that fails 1`] = `
-Object {
-  "data": Object {},
+{
+  "data": {},
   "paymentMethod": "mocked_paymentMethod",
 }
 `;
diff --git a/...ent/default/js/adyen_checkout/__tests__/__snapshots__/renderGenericComponent.test.js.snap b/...ent/default/js/adyen_checkout/__tests__/__snapshots__/renderGenericComponent.test.js.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Render Generic Component should render 1`] = `
-Object {
+{
   "amount": "mocked_amount",
   "countryCode": "mocked_countrycode",
-  "paymentMethodsConfiguration": Object {
-    "amazonpay": Object {
-      "addressDetails": Object {
+  "paymentMethodsConfiguration": {
+    "amazonpay": {
+      "addressDetails": {
         "addressLine1": "test",
         "city": "test",
         "countryCode": "test",
@@ -18,8 +18,8 @@ Object {
       "configuration": undefined,
     },
   },
-  "session": Object {
-    "adyenDescriptions": Object {},
+  "session": {
+    "adyenDescriptions": {},
     "id": "mock_id",
     "imagePath": "example.com",
     "sessionData": "mock_session_data",

diff --git a/...nt/default/js/adyen_checkout/__tests__/__snapshots__/renderGiftcardComponent.test.js.snap b/...nt/default/js/adyen_checkout/__tests__/__snapshots__/renderGiftcardComponent.test.js.snap
@@ -0,0 +1,98 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render gift card should render a select form 1`] = `
+<select
+  id="giftCardSelect"
+>
+  <option
+    style="visibility: hidden;"
+    value="mocked_brand1"
+  />
+  <option
+    style="visibility: hidden;"
+    value="mocked_brand2"
+  />
+</select>
+`;
+
+exports[`Render gift card should render a select form 2`] = `
+<ul
+  id="giftCardUl"
+>
+  <li
+    data-brand="mocked_brand1"
+    data-name="undefined"
+    data-type="giftcard"
+  >
+    <span />
+    <img
+      height="26"
+      src="test_image_pathmocked_brand1.png"
+      width="40"
+    />
+  </li>
+  <li
+    data-brand="mocked_brand2"
+    data-name="undefined"
+    data-type="giftcard"
+  >
+    <span />
+    <img
+      height="26"
+      src="test_image_pathmocked_brand2.png"
+      width="40"
+    />
+  </li>
+</ul>
+`;
+
+exports[`Render gift card should render applied gift cards 1`] = `
+<ul
+  id="giftCardsList"
+>
+  <div
+    class="gift-card"
+  >
+    <div
+      class="wrapper"
+    >
+      <div
+        class="brand-container"
+      >
+        <img
+          class="gift-card-logo"
+          src="test_image_pathbrand.png"
+        />
+        <p />
+      </div>
+      <div
+        class="gift-card-action"
+      >
+        <a />
+      </div>
+    </div>
+    <div
+      class="wrapper"
+    >
+      <p />
+      <strong />
+    </div>
+  </div>
+</ul>
+`;
+
+exports[`Render gift card should show a warning message if more items are added to cart later 1`] = `
+<div
+  class="card-body order-total-summary"
+>
+  <div
+    class="alert alert-warning error-message gift-card-warning-msg"
+    id="giftCardWarningMessage"
+    role="alert"
+  >
+    <p
+      class="error-message-text"
+    />
+  </div>
+</div>
+`;
diff --git a/...client/default/js/adyen_checkout/__tests__/__snapshots__/renderPaymentMethod.test.js.snap b/...client/default/js/adyen_checkout/__tests__/__snapshots__/renderPaymentMethod.test.js.snap
@@ -44,29 +44,29 @@ exports[`Render Payment Method should render payment method with shopper informa
 `;
 
 exports[`Render Payment Method should render payment method with shopper information fields 2`] = `
-Object {
-  "mocked_id": Object {
-    "node": Object {
-      "mocked_node": Object {
+{
+  "mocked_id": {
+    "node": {
+      "mocked_node": {
         "foo": "bar",
       },
     },
   },
-  "scheme": Object {
+  "scheme": {
     "isValid": undefined,
-    "node": Object {
+    "node": {
       "mount": [MockFunction] {
-        "calls": Array [
-          Array [
+        "calls": [
+          [
             <div
               class="additionalFields"
               id="component_scheme"
               style="display:none"
             />,
           ],
         ],
-        "results": Array [
-          Object {
+        "results": [
+          {
             "type": "return",
             "value": undefined,
           },
@@ -121,29 +121,29 @@ exports[`Render Payment Method should render stored payment method with missing
 `;
 
 exports[`Render Payment Method should render stored payment method with missing shopper information fields 2`] = `
-Object {
-  "mocked_id": Object {
-    "node": Object {
-      "mocked_node": Object {
+{
+  "mocked_id": {
+    "node": {
+      "mocked_node": {
         "foo": "bar",
       },
     },
   },
-  "storedCardmocked_id": Object {
+  "storedCardmocked_id": {
     "isValid": undefined,
-    "node": Object {
+    "node": {
       "mount": [MockFunction] {
-        "calls": Array [
-          Array [
+        "calls": [
+          [
             <div
               class="additionalFields"
               id="component_storedCardmocked_id"
               style="display:none"
             />,
           ],
         ],
-        "results": Array [
-          Object {
+        "results": [
+          {
             "type": "return",
             "value": undefined,
           },

diff --git a/...n_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/checkoutConfiguration.test.js b/...n_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/checkoutConfiguration.test.js
@@ -1,5 +1,8 @@
 "use strict";
 
+/**
+ * @jest-environment jsdom
+ */
 var _require = require('../checkoutConfiguration'),
   getCardConfig = _require.getCardConfig,
   getPaypalConfig = _require.getPaypalConfig,