release 24.1.0. (#469)

Co-authored-by: Tihomir Ivanov <[email protected]>

Author: tishonator

Cartridges.zip

@@ -23,6 +23,10 @@
 		{
             "name": "dw.extensions.applepay.shippingContactSelected",
             "script": "./payment/processor/CHECKOUTCOM_APPLE_PAY"
+        },
+		{
+            "name": "dw.extensions.applepay.getRequest",
+            "script": "./payment/processor/CHECKOUTCOM_APPLE_PAY"
         }
 	]
 }

Cartridges/int_checkoutcom/cartridge/scripts/hooks.json

@@ -154,3 +154,11 @@ exports.shippingContactSelected = function(basket, event, response) {
 
     return;
 };
+
+exports.getRequest = function(basket, req) {
+    var currentLocale = ckoHelper.getSiteCurrentCountryCode();
+    if(currentLocale === 'SA') {
+        req.supportedNetworks.push('mada');
+    }
+    session.custom.applepaysession = 'yes'; 
+};

Cartridges/int_checkoutcom/cartridge/scripts/payment/processor/CHECKOUTCOM_APPLE_PAY.js

@@ -5,6 +5,7 @@
 
 // API Includes
 var Transaction = require('dw/system/Transaction');
+var PaymentMgr = require('dw/order/PaymentMgr');
 
 // Site controller
 var Site = require('dw/system/Site');
@@ -79,6 +80,16 @@ function Handle(args) {
         cardType: paymentForm.get('type').value(),
     };
 
+    var paymentCard = PaymentMgr.getPaymentCard(cardData.cardType);
+
+    var creditCardStatus = paymentCard.verify(cardData.month, cardData.year, cardData.number, cardData.cvn);
+    if (creditCardStatus.error) {
+        var invalidatePaymentCardFormElements = require('*/cartridge/scripts/checkout/InvalidatePaymentCardFormElements');
+        invalidatePaymentCardFormElements.invalidatePaymentCardForm(creditCardStatus, session.forms.cardPaymentForm);
+
+        return { error: true };
+    }
+
     // Validate expiration date
     if (cardData.year === new Date().getFullYear() && cardData.month < new Date().getMonth() + 1) {
         paymentForm.get('expiration.month').invalidateFormElement();

Cartridges/int_checkoutcom/cartridge/scripts/payment/processor/CHECKOUTCOM_CARD.js

@@ -92,6 +92,10 @@
     margin-top: 1px;
 }
 
+label[for^="dwfrm_cardPaymentForm_number"]~.error-message {
+    margin-bottom: -20px;
+}
+
 .cartes-bancaires-wrapper.selected, .cartes-visa-wrapper.selected, .cartes-mastercard-wrapper.selected {
     border-color: #00D26A;
 }
@@ -159,6 +163,10 @@
     padding: 7px;
 }
 
+.no-click {
+    pointer-events: none;
+}
+
 @media only screen and (max-width: 768px) {
     .cartes-bancaires-options {
         top: 29%;

Cartridges/int_checkoutcom/cartridge/static/default/css/card.css

@@ -54,15 +54,13 @@ function launchGooglePay() {
               signedMessage: JSON.parse(e.paymentMethodToken.token)
                 .signedMessage,
             };
-            jQuery('[id="dwfrm_googlePayForm_data"]').val(JSON.stringify(o)),
-            "" ===
-              $(
-                'input[name="dwfrm_billing_googlePayForm_ckoGooglePayData"]'
-              ).val() 
-                ? $(".ckoGooglePayButton-invalid-field-message").text(
-                    window.ckoLang.googlePayDataInvalid
-                )
-                : $("#dwfrm_billing").submit();
+            jQuery('[id="dwfrm_googlePayForm_data"]').val(JSON.stringify(o));
+            if ('' === $('input[name="dwfrm_billing_googlePayForm_ckoGooglePayData"]').val()) {
+              $('.ckoGooglePayButton-invalid-field-message').text(window.ckoLang.googlePayDataInvalid);
+            } else {
+              $('.button-fancy-large').removeClass('no-click disabled');
+              $('#dwfrm_billing').submit();
+            }
           })(e);
         })
         .catch(function(e) {
@@ -73,6 +71,13 @@ function launchGooglePay() {
 document.addEventListener(
   "DOMContentLoaded",
   function() {
+    $('.input-radio').click(function() {
+      if ($(this).val() === 'CHECKOUTCOM_GOOGLE_PAY') {
+        $('.button-fancy-large').addClass('no-click disabled');
+      } else {
+        $('.button-fancy-large').removeClass('no-click disabled');
+      }
+    });
     launchGooglePay();
   },
   !1

Cartridges/int_checkoutcom/cartridge/static/default/js/googlepay.js

@@ -15,11 +15,16 @@
 
 
 	<!-- This to include the boleto pay apm form -->
+	<iscomment>
+	Boleto has been temporarily removed from the business manager configuration, rendering this payment method currently inactive.
+	To activate it, include the metadata in the business manager for 'CKO [5] APM Settings' custom preference.
+	Ticket no. CHECBLD-149
 	<isif condition="${(dw.system.Site.getCurrent().getCustomPreferenceValue('ckoBoletoEnabled'))}">
 		<div id="boleto" class="hideApm apmBox">	
 			<isinclude template="apm/includes/boleto.isml"/>
 		</div>
 	</isif>
+	</iscomment>
 
 
 	<!-- This to include the bancontact pay apm form -->
@@ -31,11 +36,16 @@
 
 
 	<!-- This to include the benefit pay apm form -->
+	<iscomment>
+	BenefitPay has been temporarily removed from the business manager configuration, rendering this payment method currently inactive.
+	To activate it, include the metadata in the business manager for 'CKO [5] APM Settings' custom preference.
+	Ticket no. CHECBLD-149
 	<isif condition="${(dw.system.Site.getCurrent().getCustomPreferenceValue('ckoBenefitEnabled'))}">
 		<div id="benefit" class="hideApm apmBox">	
 			<isinclude template="apm/includes/benefitPay.isml"/>
 		</div>
 	</isif>
+	</iscomment>
 
 
 	<!-- This to include the giro pay apm form -->
@@ -103,11 +113,16 @@
 
 
 	<!-- This to include the poli apm form -->
+	<iscomment>
+	Poli has been temporarily removed from the business manager configuration, rendering this payment method currently inactive.
+	To activate it, include the metadata in the business manager for 'CKO [5] APM Settings' custom preference.
+	Ticket no. CHECBLD-149
 	<isif condition="${(dw.system.Site.getCurrent().getCustomPreferenceValue('ckoPoliEnabled'))}">
 		<div id="poli" class="hideApm apmBox">	
 			<isinclude template="apm/includes/poli.isml"/>
 		</div>
 	</isif>
+	</iscomment>
 
 
 	<!-- This to include the p24 apm form -->
@@ -118,19 +133,29 @@
 	</isif>
 
 	<!-- This to include the Oxxo apm form -->
+	<iscomment> 
+	OXXO has been temporarily removed from the business manager configuration, rendering this payment method currently inactive.
+	To activate it, include the metadata in the business manager for 'CKO [5] APM Settings' custom preference.
+	Ticket no. CHECBLD-149
 	<isif condition="${(dw.system.Site.getCurrent().getCustomPreferenceValue('ckoOxxoEnabled'))}">
 		<div id="oxxo" class="hideApm apmBox">	
 			<isinclude template="apm/includes/oxxo.isml"/>
 		</div>
 	</isif>
+	</iscomment>
 
 
 	<!-- This to include the Alipay apm form -->
+	<iscomment>
+	Alipay has been temporarily removed from the business manager configuration, rendering this payment method currently inactive.
+	To activate it, include the metadata in the business manager for 'CKO [5] APM Settings' custom preference.
+	Ticket no. CHECBLD-149
 	<isif condition="${(dw.system.Site.getCurrent().getCustomPreferenceValue('ckoAlipayEnabled'))}">
 		<div id="alipay" class="hideApm apmBox">	
 			<isinclude template="apm/includes/alipay.isml"/>
 		</div>
 	</isif>
+	</iscomment>
 
 
 	<!-- This to include the klarna apm form -->

Cartridges/int_checkoutcom/cartridge/templates/default/apm/apm.isml

@@ -0,0 +1,51 @@
+'use strict';
+
+var base = require('base/checkout/billing');
+
+/**
+ * returns the payment method name
+ * @param {Object} applicablePaymentMethods - applicable payment methods
+ * @param {Object} selectedPaymentMethod - selected payment method
+ * @returns {string} paymentMethodName - payment method name
+ */
+function getPaymentMethodName(applicablePaymentMethods, selectedPaymentMethod) {
+    var paymentMethodName;
+    for (var i = 0; i < applicablePaymentMethods.length; i += 1) {
+        if (applicablePaymentMethods[i].ID === selectedPaymentMethod) {
+            paymentMethodName = applicablePaymentMethods[i].name;
+            break;
+        }
+    }
+    return paymentMethodName;
+}
+
+
+/**
+ * Updates the payment information in checkout, based on the supplied order model
+ * @param {Object} order - checkout model to use as basis of new truth
+ */
+base.methods.updatePaymentInformation = function(order) {
+    // update payment details
+    var $paymentSummary = $('.payment-details');
+    var htmlToAppend = '';
+    var selectedPaymentInstrument;
+
+    if (order.billing.payment && order.billing.payment.selectedPaymentInstruments
+        && order.billing.payment.selectedPaymentInstruments.length > 0) {
+        for (var i = 0; i < order.billing.payment.selectedPaymentInstruments.length; i += 1) {
+            selectedPaymentInstrument = order.billing.payment.selectedPaymentInstruments[i];
+        }
+        // CREDIT_CARD
+        if (selectedPaymentInstrument.paymentMethod === 'CREDIT_CARD') {
+            htmlToAppend += '<span>' + order.resources.cardType + ' ' + selectedPaymentInstrument.type + '</span><div>' + selectedPaymentInstrument.maskedCreditCardNumber
+             + '</div><div><span>' + order.resources.cardEnding + ' ' + selectedPaymentInstrument.expirationMonth + '/' + selectedPaymentInstrument.expirationYear + '</span></div>';
+        } else {
+            htmlToAppend += '<div><p>' + getPaymentMethodName(order.billing.payment.applicablePaymentMethods, selectedPaymentInstrument.paymentMethod) + '</p>'
+            + '<p>' + order.priceTotal + '</p></div>';
+        }
+    }
+
+    $paymentSummary.empty().append(htmlToAppend);
+};
+
+module.exports = base;

Cartridges/int_checkoutcom_sfra/cartridge/client/default/js/checkout/billing.js

@@ -6,10 +6,11 @@
 var customerHelpers = require('base/checkout/customer');
 var addressHelpers = require('base/checkout/address');
 var shippingHelpers = require('base/checkout/shipping');
-var billingHelpers = require('base/checkout/billing');
+var billingHelpers = require('./billing');
 var summaryHelpers = require('base/checkout/summary');
 var formHelpers = require('base/checkout/formErrors');
 var scrollAnimate = require('base/components/scrollAnimate');
+var initiPaypalbutton = require('../initPayPalButton');
 
 
 /**
@@ -191,6 +192,9 @@ var scrollAnimate = require('base/components/scrollAnimate');
                                  // enable the next:Payment button here
                                 $('body').trigger('checkout:enableButton', '.next-step-button button');
                                 shippingHelpers.methods.shippingFormResponse(defer, data);
+                                if (($('.paypal-buttons').length === 0) && ($('.payPal-tab').length > 0)) {
+                                    initiPaypalbutton.initPayPalButton();
+                                }
                             },
                             error: function(err) {
                                 // enable the next:Payment button here

Cartridges/int_checkoutcom_sfra/cartridge/client/default/js/checkout/checkout.js

@@ -0,0 +1,70 @@
+'use strict';
+
+var cart = require('base/cart/cart');
+var miniCartExpressPaypal = require('../paypal/minicartExpressPaypal');
+
+var updateMiniCart = true;
+
+module.exports = function () {
+    cart();
+
+    $('.minicart').on('count:update', function (event, count) {
+        if (count && $.isNumeric(count.quantityTotal)) {
+            $('.minicart .minicart-quantity').text(count.quantityTotal);
+            $('.minicart .minicart-link').attr({
+                'aria-label': count.minicartCountOfItems,
+                title: count.minicartCountOfItems
+            });
+        }
+    });
+
+    $('.minicart').on('mouseenter focusin touchstart', function () {
+        if ($('.search:visible').length === 0) {
+            return;
+        }
+        var url = $('.minicart').data('action-url');
+        var count = parseInt($('.minicart .minicart-quantity').text(), 10);
+
+        if (count !== 0 && $('.minicart .popover.show').length === 0) {
+            if (!updateMiniCart) {
+                $('.minicart .popover').addClass('show');
+                return;
+            }
+
+            $('.minicart .popover').addClass('show');
+            $('.minicart .popover').spinner().start();
+            $.get(url, function (data) {
+                $('.minicart .popover').empty();
+                $('.minicart .popover').append(data);
+                updateMiniCart = false;
+                miniCartExpressPaypal.miniCartPayPalSDK();
+                $.spinner().stop();
+            });
+        }
+    });
+    $('body').on('touchstart click', function (e) {
+        if ($('.minicart').has(e.target).length <= 0) {
+            $('.minicart .popover').removeClass('show');
+        }
+    });
+    $('.minicart').on('mouseleave focusout', function (event) {
+        if ((event.type === 'focusout' && $('.minicart').has(event.target).length > 0)
+            || (event.type === 'mouseleave' && $(event.target).is('.minicart .quantity'))
+            || $('body').hasClass('modal-open')) {
+            event.stopPropagation();
+            return;
+        }
+        $('.minicart .popover').removeClass('show');
+    });
+    $('body').on('change', '.minicart .quantity', function () {
+        if ($(this).parents('.bonus-product-line-item').length && $('.cart-page').length) {
+            location.reload();
+        }
+    });
+    $('body').on('product:afterAddToCart', function () {
+        updateMiniCart = true;
+    });
+    $('body').on('cart:update', function () {
+        updateMiniCart = true;
+    });
+};