Merge pull request #176 from Adyen/develop

Release 19.1.0

.gitignore

@@ -1,3 +1,3 @@
 .idea
-/.DS_Store
-/cartridges/int_adyen_SFRA/dw.json
+.DS_Store
+/cartridges/int_adyen_SFRA/dw.json

README.md

@@ -1,25 +1,24 @@
 # Salesforce Commerce Cloud Adyen Cartridge
 
-Adyen provides a LINK cartridge to integrate with a Salesforce Commerce Cloud (SCC). This cartridge enables a SCC store to use the Adyen payment service. This cartridge supports SFRA and JS-Controllers.
+Adyen provides a LINK cartridge to integrate with Salesforce Commerce Cloud (SFCC). This cartridge enables a SFCC storefront to use the Adyen payment service. This cartridge supports SFRA version 4.0.0 and SiteGenesis JS-Controllers.
 
 ## Integration
-The plugin integrates Classic integration for all card payments. Local/redirect payment methods are integrated with DirectoryLookup and HPP. For Point Of Sale (POS) payments we use Terminal API using Cloud-based communication. 
+The cartridge integrates Secured Fields for all card payments. Local/redirect payment methods are integrated with Checkout API. For Point Of Sale (POS) payments in SiteGenesis, we use Terminal API using Cloud-based communication.
 
 ## Requirements
-
-It is mandatory that the merchant has to open an account with Adyen and configure some items in Commerce Cloud Business Manager, as well as in the Adyen account to make the integration working properly.
-The integration is based on the Site Genesis demo store provided by Commerce Cloud.
-
+
+It is required to have an Adyen account to use the cartridge. You can do this [here](https://www.adyen.com/signup).
+
 ## Installation, Usage and Configuration
 
-Installation, Usage and Configuration is explained in our [manual](https://docs.adyen.com/developers/plug-ins-and-partners/salesforce-commerce-cloud).
+Installation, Usage and Configuration is explained in Adyen's [online documentation](https://docs.adyen.com/plugins/salesforce-commerce-cloud/).
 
-ApplePay configuration can be found [here](documentation/ApplePay.md)
+Apple Pay configuration can be found [here](https://docs.adyen.com/plugins/salesforce-commerce-cloud/set-up-payment-methods/#set-up-apple-pay-on-the-web).
 
 ## Support
 
-In case of problems with the integration or connection to Adyen, contact the [Adyen Support Team](mailto:[email protected]) or your Adyen account manager.
-Supply as much information as possible: your merchant account, skin code, time, order number, PSP reference, etc.
+For further questions regarding the integration to Adyen, contact the [Adyen Support Team](mailto:[email protected]) or your Adyen account manager.
+Supply as much information as possible: your merchant account, timestamp, order number, PSP reference, etc.
 
 ## Licence
 

cartridges/bm_adyen/cartridge/templates/default/order/PaymentInstrumentInfo_Adyen.isml

@@ -9,6 +9,7 @@
 		var paymentInstrument = paymentInstruments.next();
 		var paymentMethod = dw.order.PaymentMgr.getPaymentMethod(paymentInstrument.paymentMethod);
 		var amount = order.custom.Adyen_value/100;
+		var adyenAdditionalPaymentData = JSON.parse(paymentInstrument.custom.adyenAdditionalPaymentData);
 	}
 </isscript>
 <BR><BR>
@@ -22,18 +23,39 @@
 			<img border='0' src='https://ca-test.adyen.com/ca/css/csr/images/adyen-logo.condensed.hr.png?c4e4' width='111'></A></th>
 			<th>Payment info</th>
 		</tr>
-	</thead>			
-<tr><td colspan='2'><hr size='1'></hr></td></tr>
-<tbody>
-			<tr><td class='infobox_title'>PSP reference</td><td class='infobox_item'><A target='new' HREF='https://ca-test.adyen.com/ca/ca/payments/searchPayments.shtml?skipList=firstResult&query=${order.custom.Adyen_pspReference}'><isprint value="${order.custom.Adyen_pspReference}"> </A></td></tr>
-
-			<tr><td class='infobox_title'>Payment Method</td><td class='infobox_item'><isprint value="${order.custom.Adyen_paymentMethod}"></td></tr>
-			<tr><td class='infobox_title'>Eventcode</td><td class='infobox_item'><isprint value="${order.custom.Adyen_eventCode}"></td></tr>
-			<tr><td class='infobox_title'>Amount</td><td class='infobox_item'><isprint value="${amount}"></td></tr>
+	</thead>
+	<tbody>
+		<tr><td class='infobox_title'>PSP reference</td><td class='infobox_item'><A target='new' HREF='https://ca-test.adyen.com/ca/ca/payments/searchPayments.shtml?skipList=firstResult&query=${order.custom.Adyen_pspReference}'><isprint value="${order.custom.Adyen_pspReference}"> </A></td></tr>
+		<tr><td class='infobox_title'>Payment Method</td><td class='infobox_item'><isprint value="${order.custom.Adyen_paymentMethod}"></td></tr>
+		<tr><td class='infobox_title'>Eventcode</td><td class='infobox_item'><isprint value="${order.custom.Adyen_eventCode}"></td></tr>
+		<tr></tr>
+		<isif condition="${adyenAdditionalPaymentData != null}">
+			<isloop items="${adyenAdditionalPaymentData}" var="bankTransferItem" status="loopstate">
+				<isif condition="${bankTransferItem.key == 'bankTransfer.reference'}">
+					<tr>
+						<td><span class="infobox_title">Reference:</span></td>
+						<td><span class="summary-details">${bankTransferItem.value}</span></td>
+					</tr>
+				</isif>
+				<isif condition="${bankTransferItem.key == 'bankTransfer.owner'}">
+					<tr>
+						<td><span class="infobox_title">Beneficiary Name:</span></td>
+						<td><span class="summary-details">${bankTransferItem.value}</span></td>
+					</tr>
+				</isif>
+				<isif condition="${bankTransferItem.key == 'bankTransfer.iban'}">
+					<tr>
+						<td><span class="infobox_title">Bankaccount:</span></td>
+						<td><span class="summary-details">${bankTransferItem.value}</span></td>
+					</tr>
+				</isif>
+			</isloop>
+		</isif>
 	</tbody>
 </table>
-<BR>
 </div>
+<BR>
+
 <!-- END: Adyentable 
 
 

cartridges/int_adyen_SFRA/.eslintrc.json

@@ -2,27 +2,45 @@
   "root": true,
   "extends": "airbnb-base/legacy",
   "rules": {
-        "import/no-unresolved": "off",
-        "indent": ["error", 4, { "SwitchCase": 1, "VariableDeclarator": 1 }],
-        "func-names": "off",
-        "valid-jsdoc": ["error", { "preferType": { "Boolean": "boolean", "Number": "number", "object": "Object", "String": "string" }, "requireReturn": false}],
-        "vars-on-top": "off",
-        "global-require": "off",
-        "no-shadow":"off",
-        "max-len": "off",
-        "no-underscore-dangle": "off",
-        "linebreak-style": 0,
-        "no-undef":"off",
-        "no-use-before-define":"off",
-        "no-param-reassign":"off",
-        "no-unused-vars":"off",
-        "eqeqeq":"off",
-        "no-array-constructor":"off",
-        "no-tabs":"off",
-        "no-restricted-syntax":"off",
-        "no-restricted-globals":"off",
-        "consistent-return":"off",
-        "no-redeclare":"off",
-        "no-plusplus":"off"
-    }
+    "import/no-unresolved": "off",
+    "indent": [
+      "error",
+      4,
+      {
+        "SwitchCase": 1,
+        "VariableDeclarator": 1
+      }
+    ],
+    "func-names": "off",
+    "valid-jsdoc": [
+      "error",
+      {
+        "preferType": {
+          "Boolean": "boolean",
+          "Number": "number",
+          "object": "Object",
+          "String": "string"
+        },
+        "requireReturn": false
+      }
+    ],
+    "vars-on-top": "off",
+    "global-require": "off",
+    "no-shadow": "off",
+    "max-len": "off",
+    "no-underscore-dangle": "off",
+    "linebreak-style": 0,
+    "no-undef": "off",
+    "no-use-before-define": "off",
+    "no-param-reassign": "off",
+    "no-unused-vars": "off",
+    "eqeqeq": "off",
+    "no-array-constructor": "off",
+    "no-tabs": "off",
+    "no-restricted-syntax": "off",
+    "no-restricted-globals": "off",
+    "consistent-return": "off",
+    "no-redeclare": "off",
+    "no-plusplus": "off"
+  }
 }