Merge branch '24.2.0'

mollie · Aug 5, 2024 · c71a32d · c71a32d
2 parents 43aca33 + d85059d
commit c71a32d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/cartridges/int_mollie/cartridge/models/payment.js b/cartridges/int_mollie/cartridge/models/payment.js
@@ -42,7 +42,7 @@ function applicablePaymentMethods(paymentMethods) {
             name: method.name,
             image: method.image && method.image.URL.toString(),
             molliePaymentMethodId: method.custom.molliePaymentMethodId,
-            processor: method.paymentProcessor.getID()
+            processor: method.paymentProcessor ? method.paymentProcessor.getID() : 'MOLLIE_ECOM_DEFAULT'
         };
     });
 }

diff --git a/cartridges/int_mollie/cartridge/scripts/checkout/checkoutHelpers.js b/cartridges/int_mollie/cartridge/scripts/checkout/checkoutHelpers.js
@@ -203,8 +203,9 @@ COHelpers.getMolliePaymentMethods = function (currentBasket, orderModel, country
         mappedMethod.name = mollieMethods[method.molliePaymentMethodId] ? mollieMethods[method.molliePaymentMethodId].description : method.name;
         if (method.molliePaymentMethodId) {
             var mollieMethod = mollieMethods[method.molliePaymentMethodId];
-            mappedMethod.issuers = mollieMethod && mollieMethod.issuers;
-
+            if (method.molliePaymentMethodId !== 'ideal') {
+                mappedMethod.issuers = mollieMethod && mollieMethod.issuers;
+            }
             if (mollieMethod.imageURL) {
                 mappedMethod.image = mollieMethod.imageURL;
             }

diff --git a/cartridges/int_mollie/cartridge/scripts/payment/paymentHelper.js b/cartridges/int_mollie/cartridge/scripts/payment/paymentHelper.js
@@ -179,7 +179,7 @@ function processPaymentResultHook(order, paymentResult) {
         case STATUS.EXPIRED:
         case STATUS.CANCELED:
         case STATUS.FAILED:
-            url = URLUtils.https('Checkout-Begin', 'orderID', orderId, 'orderToken', orderToken, 'stage', 'payment').toString();
+            url = URLUtils.https('Checkout-Begin', 'orderID', orderId, 'orderToken', order.orderToken, 'stage', 'payment').toString();
             Transaction.wrap(function () {
                 orderHelper.failOrCancelOrder(order,
                     'PAYMENT :: Canceling order, Mollie status :: ' + paymentResult.status);

diff --git a/..._changes/cartridge/templates/default/checkout/billing/paymentOptions/redirectContent.isml b/..._changes/cartridge/templates/default/checkout/billing/paymentOptions/redirectContent.isml
@@ -5,21 +5,23 @@
         <input type="hidden" class="form-control" name="${pdict.forms.billingForm.paymentMethod.htmlName}"
             value="${paymentOption.ID}">
         <isif condition="${paymentOption.processor !== 'MOLLIE_ECOM_QR'}">
-            <form class="issuers js-issuers">
-                <isloop items="${paymentOption.issuers}" alias="issuer" status="loopStatus">
-                    <label class="form-control-label">
-                        <input type="radio" class="issuers__input" value="${JSON.stringify(issuer)}" <isprint
-                            value="${pdict.forms.billingForm.issuer.attributes}" encoding="on" />
-                        <isif condition="${loopStatus.first}">checked</isif>/>
-                        <img class="issuers__image" src="${issuer.image}" height="32" alt="${issuer.name}"
-                             title="${issuer.name}" />
-                        <span>${issuer.name}</span>
-                    </label>
-                </isloop>
-                <!--- in case no issuer is found --->
-                <input type="hidden" value="" <isprint value="${pdict.forms.billingForm.issuer.attributes}"
-                                                       encoding="on" />/>
-            </form>
+
+                <form class="issuers js-issuers">
+                    <isloop items="${paymentOption.issuers}" alias="issuer" status="loopStatus">
+                        <label class="form-control-label">
+                            <input type="radio" class="issuers__input" value="${JSON.stringify(issuer)}" <isprint
+                                value="${pdict.forms.billingForm.issuer.attributes}" encoding="on" />
+                            <isif condition="${loopStatus.first}">checked</isif>/>
+                            <img class="issuers__image" src="${issuer.image}" height="32" alt="${issuer.name}"
+                                 title="${issuer.name}" />
+                            <span>${issuer.name}</span>
+                        </label>
+                    </isloop>
+                    <!--- in case no issuer is found --->
+                    <input type="hidden" value="" <isprint value="${pdict.forms.billingForm.issuer.attributes}"
+                                                           encoding="on" />/>
+                </form>
+
         </isif>
     </fieldset>
 </div>