diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..785112211 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @rkewlani @AlexandrosMor @martinsrenato @Aleffio @rikterbeek diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..17a0592cd --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at support@adyen.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..e3801847a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,20 @@ +# Contribution guidelines + +## How to contribute step-by-step + +1. Fork the `Adyen/adyen-hybris` repository. +2. Create a new branch from `develop` in your fork. This makes it easier for you to keep track of your changes. +3. Make the desired changes to the code. + * If you are adding new functionality or fixing a bug, we recommend you add unit tests that cover it. +4. Push the changes to your fork. +5. Create a pull request to the `Adyen/adyen-hybris` repository. +6. In your pull request, please describe in detail: + * What problem you’re solving + * Your approach to fixing the problem + * Any tests you wrote +7. Check Allow edits from maintainers. +8. Create the pull request. +9. Ensure that all checks have passed. + +After you create your pull request, one of the code owners will review your code. +We aim to review your request within 2-3 business days. diff --git a/README.md b/README.md index eafb8d280..22f727591 100644 --- a/README.md +++ b/README.md @@ -146,8 +146,15 @@ pos.totaltimeout = 130 https://docs.adyen.com/developers/plugins/hybris ## Support - You can create issues on our Magento Repository. In case of specific problems with your account, please contact - support@adyen.com. + You can create issues in this repository. In case of specific problems with your account, please contact support@adyen.com. + + ## Contributing + We strongly encourage you to join us in contributing to this repository so everyone can benefit from: + * New features and functionality + * Resolved bug fixes and issues + * Any general improvements + + Read our [**contribution guidelines**](CONTRIBUTING.md) to find out how. ## License MIT license. For more information, see the LICENSE file. diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag index 034a91760..ef1e0b1b6 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/securedFieldsMethod.tag @@ -19,7 +19,10 @@ ~ See the LICENSE file for more info. --%> <%@ attribute name="showRememberTheseDetails" required="true" type="java.lang.Boolean" %> +<%@ attribute name="showComboCard" required="false" type="java.lang.Boolean" %> + <%@ taglib prefix="adyen" tagdir="/WEB-INF/tags/addons/adyenv6b2ccheckoutaddon/responsive" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -34,6 +37,17 @@
+ +
+ + + +
+
diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp index 4be001050..ccdc0cfed 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp @@ -3,8 +3,8 @@ - - + + - + - +