Merge pull request #165 from Adyen/develop

Release 6.3.0

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @rkewlani @AlexandrosMor @martinsrenato @Aleffio @rikterbeek

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 [email protected]. 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

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.

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
- [email protected].
+ You can create issues in this repository. In case of specific problems with your account, please contact [email protected].
+
+ ## 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.

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" %>
 
 <div class="chckt-pm chckt-pm-card js-chckt-pm js-chckt-pm__pm-holder" data-additional-required="" data-pm="card">
     <input type="hidden" name="txvariant" value="card">
@@ -34,6 +37,17 @@
 
     <div class="chckt-pm__details js-chckt-pm__details payment_method_details" id="dd_method_adyen_cc">
         <div class="chckt-form chckt-form--max-width">
+            <c:if test="${showComboCard}">
+                <div class="adyen-checkout__dropdown adyen-checkout__field adyen-checkout__input--large">
+                    <label class="adyen-checkout__label__text">Select Credit or Debit Card</label>
+                    <select class="adyen-checkout__dropdown__button chckt-select-box js-chckt-terminal-select-box" id="adyen_combo_card_type"
+                            name="${adyen_combo_card_type}">
+                        <option value="credit" label="Credit"/>
+                        <option value="debit" label="Debit"/>
+                    </select>
+                    <span class="clearfix"></span>
+                </div>
+            </c:if>
             <div id="card-div"></div>
         </div>
     </div>

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp

@@ -3,8 +3,8 @@
 <html>
 <head>
 
-    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
+    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.js"></script>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.css"/>
 
     <script type="text/javascript">
 

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/checkoutSummaryPage.jsp

@@ -32,7 +32,7 @@
                     </div>
                 </div>
                 <div class="place-order-form hidden-xs">
-                    <form:form action="${placeOrderUrl}" id="placeOrderForm1" commandName="placeOrderForm">
+                    <form:form action="${placeOrderUrl}" id="placeOrderForm1" modelAttribute="placeOrderForm">
                         <div class="checkbox">
                             <label> <form:checkbox id="Terms1" path="termsCheck" />
                                 <spring:theme code="checkout.summary.placeOrder.readTermsAndConditions" arguments="${getTermsAndConditionsUrl}" text="Terms and Conditions"/>

adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp

@@ -17,9 +17,9 @@
 <template:page pageTitle="${pageTitle}" hideHeaderLinks="true">
     <jsp:attribute name="pageScripts">
         <script type="text/javascript" src="${dfUrl}"></script>
-        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
+        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.js"></script>
         <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.4.0/adyen.css"/>
 
         <script type="text/javascript">
             AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "${environmentMode}", "${originKey}" );
@@ -40,7 +40,6 @@
                     return false;
                 }
                 AdyenCheckoutHybris.setCustomPaymentMethodValues();
-                AdyenCheckoutHybris.setBrowserData();
 
                 $( "#adyen-encrypted-form" ).submit();
             } );
@@ -60,22 +59,31 @@
             AdyenCheckoutHybris.createDfValue();
 
 
-            <c:if test="${not empty iDealissuerList}">
-            AdyenCheckoutHybris.initiateIdeal(${iDealissuerList});
+            <c:if test="${not empty issuerLists['ideal']}">
+            AdyenCheckoutHybris.initiateIdeal(${issuerLists['ideal']});
+            </c:if>
+
+            <c:if test="${not empty issuerLists['eps']}">
+            AdyenCheckoutHybris.initiateEps(${issuerLists['eps']});
             </c:if>
 
             <c:forEach items="${storedCards}" var="storedCard">
 
-            //convert java stored card object to javascript object
-            var storedCardJS= {
-                    type: "${storedCard.variant}",
-                    reference: "${storedCard.recurringDetailReference}",
-                    number: "${storedCard.card.number}",
-                    expiryMonth: "${storedCard.card.expiryMonth}",
-                    expiryYear: "${storedCard.card.expiryYear}"
+            var storedCardJS=
+                {
+                    storedPaymentMethodId: "${storedCard.id}",
+                    name: "${storedCard.name}",
+                    type: "${storedCard.type}",
+                    brand: "${storedCard.brand}",
+                    lastFour: "${storedCard.lastFour}",
+                    expiryMonth: "${storedCard.expiryMonth}",
+                    expiryYear: "${storedCard.expiryYear}",
+                    holderName: "${storedCard.holderName}",
+                    supportedShopperInteractions: "${storedCard.supportedShopperInteractions}",
+                    shopperEmail: "${storedCard.shopperEmail}"
                 };
-
             AdyenCheckoutHybris.initiateOneClickCard(storedCardJS);
+
             </c:forEach>
 
 
@@ -91,7 +99,7 @@
                 </div>
                 <multiCheckout:checkoutSteps checkoutSteps="${checkoutSteps}" progressBarId="${progressBarId}">
                     <jsp:body>
-                        <form:form method="post" commandName="adyenPaymentForm"
+                        <form:form method="post" modelAttribute="adyenPaymentForm"
                                    class="create_update_payment_form"
                                    id="adyen-encrypted-form" action="${selectPaymentMethod}">
 
@@ -103,6 +111,7 @@
                             <form:hidden path="dfValue"/>
                             <form:hidden path="cardHolder"/>
                             <form:hidden path="cardBrand"/>
+                            <form:hidden path="cardType"/>
 
                             <form:hidden path="encryptedCardNumber"/>
                             <form:hidden path="encryptedExpiryMonth"/>
@@ -116,14 +125,16 @@
                             <div class="chckt-pm-list js-chckt-pm-list">
                                 <c:forEach items="${storedCards}" var="storedCard">
                                     <adyen:storedCardMethod
-                                            variant="${storedCard.variant}"
-                                            cardReference="${storedCard.recurringDetailReference}"
-                                            cardNumber="${storedCard.card.number}"
+                                            variant="${storedCard.brand}"
+                                            cardReference="${storedCard.id}"
+                                            cardNumber="${storedCard.lastFour}"
                                     />
                                 </c:forEach>
 
                                 <c:if test="${not empty allowedCards}">
-                                    <adyen:securedFieldsMethod showRememberTheseDetails="${showRememberTheseDetails}"/>
+                                    <adyen:securedFieldsMethod
+                                            showRememberTheseDetails="${showRememberTheseDetails}"
+                                            showComboCard="${showComboCard}"/>
                                 </c:if>
 
                                     <%--to-do populate issuers and rest of items via checkout components--%>
@@ -136,13 +147,20 @@
                                     />
                                 </c:forEach>
 
-                                <c:if test="${not empty iDealissuerList}">
+                                <c:if test="${not empty issuerLists['ideal']}">
                                     <adyen:alternativeMethod
                                             brandCode="ideal"
                                             name="iDEAL"
                                     />
                                 </c:if>
 
+                                <c:if test="${not empty issuerLists['eps']}">
+                                    <adyen:alternativeMethod
+                                            brandCode="eps"
+                                            name="EPS"
+                                    />
+                                </c:if>
+
                                 <c:if test="${showBoleto}">
                                     <adyen:alternativeMethod
                                             brandCode="boleto"