Skip to content

Commit

Permalink
Merge pull request #517 from Adyen/develop_release2110
Browse files Browse the repository at this point in the history
Release 21.1.0
  • Loading branch information
wboereboom authored Aug 10, 2021
2 parents 3156500 + cf7461b commit 2e65280
Show file tree
Hide file tree
Showing 1,119 changed files with 30,378 additions and 24,555 deletions.
7 changes: 6 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@ bundle.js
/cartridges
src/cartridges/int_adyen_controllers/cartridge/js/pages/checkout/bundle.js
src/cartridges/int_adyen_SFRA/cartridge/client/default/js/bundle.js
src/cartridges/int_adyen_SFRA/test
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
85 changes: 50 additions & 35 deletions .eslintrc.json → .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"root": true,
module.exports = {
"env": {
"es6": true,
"browser": true,
"node": true,
"jest": true,
},
"extends": [
"eslint:recommended",
"prettier",
"airbnb-base"
"airbnb-base",
],
"globals": {
"$": "readonly",
Expand Down Expand Up @@ -40,41 +44,52 @@
"SitePreferences": "readonly",
"document": "readonly",
"window": "readonly",
"location": "readonly"
"location": "readonly",
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2018,
"ecmaVersion": 2020,
"sourceType": "module",
"ecmaFeatures": {
"modules": true
}
"modules": true,
},
},
"plugins": [
"prettier"
"prettier",
],
"ignorePatterns": [
"*.ds"
],
"rules": {
"import/no-unresolved": "off",
"no-param-reassign": "off",
"func-names": "off",
"require-jsdoc": "off",
"vars-on-top": "off",
"global-require": "off",
"max-len": "off",
"no-use-before-define": "off",
"no-shadow": "off",
"no-void": "off",
"block-scoped-var": "off",
"no-return-assign": "off",
"no-plusplus": "off",
"no-sequences": "off",
"no-unused-expressions": "off",
"consistent-return": "off",
"no-continue": "off",
"prefer-destructuring": "off",
"no-tabs": "off",
"no-restricted-syntax": "off",
"guard-for-in": "off",
"prefer-arrow-callback": "off",
"object-shorthand": "off",
"no-control-regex": "off"
}
}
"prettier/prettier": "error",
"no-var": "error",
"prefer-const": "warn",
"complexity": [
"error",
{
"max": 4,
},
],
"eqeqeq": "error",
"curly": "error",
"import/no-unresolved": [
2,
{
"ignore": [
"^dw",
"^base",
"^\\*",
"^mockData"
],
},
],
"import/extensions": ["error", { "js": "never" }],
"import/no-extraneous-dependencies": "off",
"operator-linebreak": "off",
"object-curly-newline": ["error", {
"ImportDeclaration": { multiline: true, "minProperties": 4 }
}],
"implicit-arrow-linebreak": "off",
"no-param-reassign": ["error", { "props": false }]
},
};
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @KadoBOT @msilvagarcia @cyattilakiss @maassenbas @rikterbeek @zaiddreakh
* @msilvagarcia @cyattilakiss @maassenbas @rikterbeek @zaiddreakh
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.idea
.DS_Store
cartridges
/cartridges/
node_modules
dw.json
dw.json
/.vscode/
/coverage/
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": all
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Adyen provides a LINK cartridge to integrate with [Salesforce Commerce Cloud (SF
Please note that the cartridge is not compatible with SFRA version 4.3.x and 4.4.x due to a [bug](https://github.com/SalesforceCommerceCloud/storefront-reference-architecture/pull/797) on Salesforce.

## Integration
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.
This cartridge allows you to integrate with Adyen without the need for any development work from your end. It allows you to process payments using the [checkout API](https://docs.adyen.com/api-explorer/#/CheckoutService/v67/overview), and for Point of Sale (POS) payments, it uses a cloud-based [Terminal API](https://docs.adyen.com/point-of-sale/terminal-api-fundamentals). As for the client side, Adyen’s [web components](https://docs.adyen.com/online-payments/components-web) are used to render payment methods.

## Requirements

Expand Down
16 changes: 7 additions & 9 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
module.exports = function (api) {
api.cache(true);
return {
presets: [
[
"@babel/preset-env",
{
targets: {
esmodules: true,
},
},
],
presets: [["@babel/preset-env"]],
plugins: [
["@babel/plugin-transform-runtime", { helpers: false }],
"@babel/plugin-proposal-optional-chaining",
["@babel/plugin-proposal-decorators", { legacy: true }],
"@babel/plugin-proposal-class-properties",
],
exclude: "node_modules/**",
};
};
4 changes: 4 additions & 0 deletions cartridges/bm_adyen/cartridge/bm_adyen.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## cartridge.properties for cartridge bm_adyen
#Wed Jun 05 17:06:42 CEST 2013
demandware.cartridges.bm_adyen.multipleLanguageStorefront=true
demandware.cartridges.bm_adyen.id=bm_adyen
Loading

0 comments on commit 2e65280

Please sign in to comment.