@@ -37,4 +37,4 @@
});
}
-
\ No newline at end of file
+
diff --git a/view/frontend/templates/info/payment_method.phtml b/view/frontend/templates/info/payment_method.phtml
index 50654028c..1cbbf2f3d 100644
--- a/view/frontend/templates/info/payment_method.phtml
+++ b/view/frontend/templates/info/payment_method.phtml
@@ -20,7 +20,7 @@
?>
getMethod() instanceof \Magento\Payment\Model\Method\Adapter) {
+if ($block->getMethod() instanceof \Magento\Payment\Model\Method\Adapter) {
$bpePaymentCode = $block->escapeHtml($block->getMethod()->getCode());
} else {
$bpePaymentCode = $block->escapeHtml($block->getMethod()->buckarooPaymentMethodCode);
diff --git a/view/frontend/web/js/action/amasty-place-order-mixin.js b/view/frontend/web/js/action/amasty-place-order-mixin.js
index 49aa74b50..7f0c98b26 100644
--- a/view/frontend/web/js/action/amasty-place-order-mixin.js
+++ b/view/frontend/web/js/action/amasty-place-order-mixin.js
@@ -4,36 +4,36 @@ define([
], function ($, wrapper) {
'use strict';
- let getAmastyPromise = function() {
+ let getAmastyPromise = function () {
let requestDeferred = $.Deferred();
- if(window.checkoutConfig.amOrderAttribute !== undefined) {
+ if (window.checkoutConfig.amOrderAttribute !== undefined) {
require([
'Amasty_Orderattr/js/model/attribute-sets/payment-attributes',
'Amasty_Orderattr/js/model/validate-and-save'
- ], function (attributesForm, validateAndSave) {
- requestDeferred.resolve(validateAndSave(attributesForm));
- })
+ ], function (attributesForm, validateAndSave) {
+ requestDeferred.resolve(validateAndSave(attributesForm));
+ })
} else {
- requestDeferred.resolve($.when());
+ requestDeferred.resolve($.when());
}
- return requestDeferred.promise().then(function(resp) {
- return resp;
+ return requestDeferred.promise().then(function (resp) {
+ return resp;
});
}
return function (placeOrderAction) {
return wrapper.wrap(placeOrderAction, function (originalAction, paymentData, redirectOnSuccess, messageContainer) {
var result = $.Deferred();
- getAmastyPromise().done(
- function() {
+ getAmastyPromise().done(
+ function () {
$.when(
originalAction(paymentData, redirectOnSuccess, messageContainer)
).fail(
- function() {
+ function () {
result.reject.apply(this, arguments);
}
).done(
- function() {
+ function () {
result.resolve.apply(this, arguments);
}
);
diff --git a/view/frontend/web/js/action/paypal-express.js b/view/frontend/web/js/action/paypal-express.js
index 151c1c8b0..312a6aa38 100644
--- a/view/frontend/web/js/action/paypal-express.js
+++ b/view/frontend/web/js/action/paypal-express.js
@@ -1,138 +1,144 @@
define([], function () {
- "use strict";
- let checkoutUrl = "https://checkout.buckaroo.nl";
- let payPalClientId =
+ "use strict";
+ let checkoutUrl = "https://checkout.buckaroo.nl";
+ let payPalClientId =
"ATv1oKfBmc76Zzl8rAMai_OwpXIp9CsDTMzEceayY7X2Sy8t6bQT2rm7DIC7LYbfkch9m9S3R3amkeyU";
- let buttonStyle = {
- color: "gold",
- shape: "rect",
- };
- let amount = 0.01;
- let currency = "EUR";
+ let buttonStyle = {
+ color: "gold",
+ shape: "rect",
+ };
+ let amount = 0.01;
+ let currency = "EUR";
/**
* Load the paypal sdk
*/
- const requirePayPal = function (url, callback) {
- const e = document.createElement("script");
- e.src = url;
- e.setAttribute("data-partner-attribution-id", "NL_BUCKAROO_PPCP");
- e.type = "text/javascript";
- e.addEventListener("load", callback);
- document.getElementsByTagName("head")[0].appendChild(e);
- };
+ const requirePayPal = function (url, callback) {
+ const e = document.createElement("script");
+ e.src = url;
+ e.setAttribute("data-partner-attribution-id", "NL_BUCKAROO_PPCP");
+ e.type = "text/javascript";
+ e.addEventListener("load", callback);
+ document.getElementsByTagName("head")[0].appendChild(e);
+ };
/**
* Set mode test
*/
- const setTestMode = function () {
- checkoutUrl = "https://testcheckout.buckaroo.nl";
- payPalClientId =
- "AfHztAEfaf3f76tNy8j_Z86w5y-fGbqbBt04PXppVFtJatje79gVSB27DwBENnyFgfhFvKzgJbegNpHv";
- };
+ const setTestMode = function () {
+ checkoutUrl = "https://testcheckout.buckaroo.nl";
+ payPalClientId =
+ "AfHztAEfaf3f76tNy8j_Z86w5y-fGbqbBt04PXppVFtJatje79gVSB27DwBENnyFgfhFvKzgJbegNpHv";
+ };
- const setAmount = function (newAmount) {
- amount = newAmount;
- };
+ const setAmount = function (newAmount) {
+ amount = newAmount;
+ };
- const setCurrency = function (newCurrency) {
- currency = newCurrency;
- };
+ const setCurrency = function (newCurrency) {
+ currency = newCurrency;
+ };
/**
* Initiate de button display
*/
- const initiate = function (options) {
- const style = options.style || {};
- if (options.isTestMode) {
- setTestMode();
- }
+ const initiate = function (options) {
+ const style = options.style || {};
+ if (options.isTestMode) {
+ setTestMode();
+ }
- if (options.amount) {
- amount = options.amount;
- }
+ if (options.amount) {
+ amount = options.amount;
+ }
- if (options.currency) {
- currency = options.currency;
- }
+ if (options.currency) {
+ currency = options.currency;
+ }
- requirePayPal(
- "https://www.paypal.com/sdk/js?client-id=" +
- payPalClientId +
- "&merchant-id=" +
- options.paypalMerchantId +
- "¤cy=" +
- currency +
- "&disable-funding=credit,card,bancontact,blik,eps,giropay,ideal,mercadopago,mybank,p24,sepa,sofort,venmo&enable-funding=paylater",
- function () {
- paypal
- .Buttons({
- style: Object.assign(buttonStyle, style),
- createOrder: function () {
- var createOrderUrl =
- checkoutUrl +
- "/api/paypal/createOrder?buckarooWebsiteKey=" +
- options.buckarooWebsiteKey +
- "¤cy=" +
- currency +
- "&initialAmount=" +
- amount;
- // Optional - Add InvoiceId when available.
- if (
- options.invoiceId !== undefined &&
- options.invoiceId !== null
- ) {
- createOrderUrl += "&invoiceId=" + options.invoiceId;
- }
- return fetch(createOrderUrl, {
- method: "post",
- })
- .then(function (res) {
- return res.json();
+ requirePayPal(
+ "https://www.paypal.com/sdk/js?client-id=" +
+ payPalClientId +
+ "&merchant-id=" +
+ options.paypalMerchantId +
+ "¤cy=" +
+ currency +
+ "&disable-funding=credit,card,bancontact,blik,eps,giropay,ideal,mercadopago,mybank,p24,sepa,sofort,venmo&enable-funding=paylater",
+ function () {
+ paypal
+ .Buttons({
+ style: Object.assign(buttonStyle, style),
+ createOrder: function () {
+ var createOrderUrl =
+ checkoutUrl +
+ "/api/paypal/createOrder?buckarooWebsiteKey=" +
+ options.buckarooWebsiteKey +
+ "¤cy=" +
+ currency +
+ "&initialAmount=" +
+ amount;
+ // Optional - Add InvoiceId when available.
+ if (
+ options.invoiceId !== undefined &&
+ options.invoiceId !== null
+ ) {
+ createOrderUrl += "&invoiceId=" + options.invoiceId;
+ }
+ return fetch(createOrderUrl, {
+ method: "post",
+ })
+ .then(function (res) {
+ return res.json();
+ })
+ .then(function (orderData) {
+ console.log(orderData);
+ return orderData.PaypalOrderId;
+ });
+ },
+ onApprove: function (data) {
+ return options.createPaymentHandler(data).then(
+ function () {
+ options.onSuccessCallback();
+ },
+ function (reason) {
+ if (options.onErrorCallback !== undefined) {
+ options.onErrorCallback(reason);
+ }
+ }
+ );
+ },
+ onShippingChange: function (data, actions) {
+ if (options.onShippingChangeHandler !== undefined) {
+ return options.onShippingChangeHandler(data, actions);
+ }
+ },
+ onCancel: function () {
+ if (options.onCancelCallback !== undefined) {
+ options.onCancelCallback();
+ }
+ },
+ onError: function (reason) {
+ if (options.onErrorCallback !== undefined) {
+ options.onErrorCallback(reason);
+ }
+ },
+ onInit: function () {
+ if (options.onInitCallback !== undefined) {
+ options.onInitCallback();
+ }
+ },
+ onClick: function () {
+ if (options.onClickCallback !== undefined) {
+ options.onClickCallback();
+ }
+ },
})
- .then(function (orderData) {
- console.log(orderData);
- return orderData.PaypalOrderId;
- });
- },
- onApprove: function (data) {
- return options.createPaymentHandler(data).then(
- function () {
- options.onSuccessCallback();
- },
- function (reason) {
- if (options.onErrorCallback !== undefined)
- options.onErrorCallback(reason);
- }
- );
- },
- onShippingChange: function (data, actions) {
- if (options.onShippingChangeHandler !== undefined)
- return options.onShippingChangeHandler(data, actions);
- },
- onCancel: function () {
- if (options.onCancelCallback !== undefined)
- options.onCancelCallback();
- },
- onError: function (reason) {
- if (options.onErrorCallback !== undefined)
- options.onErrorCallback(reason);
- },
- onInit: function () {
- if (options.onInitCallback !== undefined)
- options.onInitCallback();
- },
- onClick: function () {
- if (options.onClickCallback !== undefined)
- options.onClickCallback();
- },
- })
- .render(options.containerSelector);
- }
- );
- };
- return {
- initiate,
- setAmount,
- setCurrency,
- };
+ .render(options.containerSelector);
+ }
+ );
+ };
+ return {
+ initiate,
+ setAmount,
+ setCurrency,
+ };
});
diff --git a/view/frontend/web/js/action/place-order.js b/view/frontend/web/js/action/place-order.js
index d8e31fe45..f8763b9b4 100644
--- a/view/frontend/web/js/action/place-order.js
+++ b/view/frontend/web/js/action/place-order.js
@@ -111,8 +111,8 @@ define(
title: $t('Error'),
content: $t(jsonResponse.limitReachedMessage),
buttons: [{
- text: $t('Close'),
- class: 'action primary accept',
+ text: $t('Close'),
+ class: 'action primary accept',
click: function () {
this.closeModal(true);
}
diff --git a/view/frontend/web/js/view/checkout/common.js b/view/frontend/web/js/view/checkout/common.js
index d0c0bb9f3..1136a9297 100644
--- a/view/frontend/web/js/view/checkout/common.js
+++ b/view/frontend/web/js/view/checkout/common.js
@@ -37,24 +37,24 @@ define(
window.location.replace(response.RequiredAction.RedirectURL);
}
},
- getSubtextStyle: function(paymentCode) {
+ getSubtextStyle: function (paymentCode) {
let config = window.checkoutConfig.payment.buckaroo[paymentCode];
- if(config === undefined) {
+ if (config === undefined) {
return;
}
let subtextColor = config.subtext_color || '#757575';
let subtextStyle = config.subtext_style || 'regular';
let style = { color: subtextColor }
- if(subtextStyle == 'bold') {
- style.fontWeight = 'bold';
+ if (subtextStyle == 'bold') {
+ style.fontWeight = 'bold';
}
- if(subtextStyle == 'italic') {
- style.fontStyle = 'italic';
+ if (subtextStyle == 'italic') {
+ style.fontStyle = 'italic';
}
return style;
- }
+ }
};
}
diff --git a/view/frontend/web/js/view/checkout/paypal-express/button.js b/view/frontend/web/js/view/checkout/paypal-express/button.js
index 272068af1..23d76f51d 100644
--- a/view/frontend/web/js/view/checkout/paypal-express/button.js
+++ b/view/frontend/web/js/view/checkout/paypal-express/button.js
@@ -16,7 +16,7 @@
* @copyright Copyright (c) Buckaroo B.V.
* @license https://tldrlegal.com/license/mit-license
*/
- define(
+define(
[
'uiComponent',
'buckaroo/paypal-express/pay',
diff --git a/view/frontend/web/js/view/checkout/paypal-express/pay.js b/view/frontend/web/js/view/checkout/paypal-express/pay.js
index 9441b7756..2ffa3d384 100644
--- a/view/frontend/web/js/view/checkout/paypal-express/pay.js
+++ b/view/frontend/web/js/view/checkout/paypal-express/pay.js
@@ -17,192 +17,194 @@
* @license https://tldrlegal.com/license/mit-license
*/
define([
- "jquery",
- "ko",
- "mage/url",
- "Magento_Customer/js/customer-data",
- "Buckaroo_Magento2/js/action/paypal-express",
- "mage/translate",
- ,
+ "jquery",
+ "ko",
+ "mage/url",
+ "Magento_Customer/js/customer-data",
+ "Buckaroo_Magento2/js/action/paypal-express",
+ "mage/translate",
+ ,
], function ($, ko, urlBuilder, customerData, sdk, __) {
- // 'use strict';
- return {
- setConfig(config, page) {
- this.page = page;
- if (this.page === "cart") {
- require(["Magento_Checkout/js/model/quote"], function (quote) {
- quote.totals.subscribe((totalData) => {
- sdk.setAmount( (
- totalData.grand_total + totalData.tax_amount
- ).toFixed(2));
- sdk.setCurrency(totalData.quote_currency_code);
- });
- });
- }
- this.options = Object.assign(
- {
- containerSelector: ".buckaroo-paypal-express",
- buckarooWebsiteKey: "",
- paypalMerchantId: "",
- currency: "EUR",
- amount: 0.1,
- createPaymentHandler: this.createPaymentHandler.bind(this),
- onShippingChangeHandler: this.onShippingChangeHandler.bind(this),
- onSuccessCallback: this.onSuccessCallback.bind(this),
- onErrorCallback: this.onErrorCallback.bind(this),
- onCancelCallback: this.onCancelCallback.bind(this),
- onInitCallback: this.onInitCallback.bind(this),
- onClickCallback: this.onClickCallback.bind(this),
+ // 'use strict';
+ return {
+ setConfig(config, page) {
+ this.page = page;
+ if (this.page === "cart") {
+ require(["Magento_Checkout/js/model/quote"], function (quote) {
+ quote.totals.subscribe((totalData) => {
+ sdk.setAmount((
+ totalData.grand_total + totalData.tax_amount
+ ).toFixed(2));
+ sdk.setCurrency(totalData.quote_currency_code);
+ });
+ });
+ }
+ this.options = Object.assign(
+ {
+ containerSelector: ".buckaroo-paypal-express",
+ buckarooWebsiteKey: "",
+ paypalMerchantId: "",
+ currency: "EUR",
+ amount: 0.1,
+ createPaymentHandler: this.createPaymentHandler.bind(this),
+ onShippingChangeHandler: this.onShippingChangeHandler.bind(this),
+ onSuccessCallback: this.onSuccessCallback.bind(this),
+ onErrorCallback: this.onErrorCallback.bind(this),
+ onCancelCallback: this.onCancelCallback.bind(this),
+ onInitCallback: this.onInitCallback.bind(this),
+ onClickCallback: this.onClickCallback.bind(this),
+ },
+ config
+ );
},
- config
- );
- },
- result: null,
+ result: null,
- cart_id: null,
- /**
- * Api events
- */
- onShippingChangeHandler(data, actions) {
- let shipping = this.setShipping(data);
- return new Promise((resolve, reject) => {
- shipping.then(
- (response) => {
- if (!response.message) {
- this.options.amount = response.value;
- this.cart_id = response.cart_id;
- actions.order
- .patch([
- {
- op: "replace",
- path: "/purchase_units/@reference_id=='default'/amount",
- value: response,
- },
- ])
- .then(
- (resp) => resolve(resp),
- (err) => reject(err)
+ cart_id: null,
+ /**
+ * Api events
+ */
+ onShippingChangeHandler(data, actions) {
+ let shipping = this.setShipping(data);
+ return new Promise((resolve, reject) => {
+ shipping.then(
+ (response) => {
+ if (!response.message) {
+ this.options.amount = response.value;
+ this.cart_id = response.cart_id;
+ actions.order
+ .patch([
+ {
+ op: "replace",
+ path: "/purchase_units/@reference_id=='default'/amount",
+ value: response,
+ },
+ ])
+ .then(
+ (resp) => resolve(resp),
+ (err) => reject(err)
+ );
+ } else {
+ reject(response.message);
+ }
+ },
+ () => {
+ reject(__("Cannot create payment"));
+ }
);
+ });
+ },
+ createPaymentHandler(data) {
+ return this.createTransaction(data.orderID);
+ },
+ onSuccessCallback() {
+ if (this.result.message) {
+ this.displayErrorMessage(message);
} else {
- reject(response.message);
+ if (this.result.cart_id && this.result.cart_id.length) {
+ window.location.replace(
+ urlBuilder.build("checkout/onepage/success/")
+ );
+ } else {
+ this.displayErrorMessage(__("Cannot create payment"));
+ }
}
- },
- () => {
- reject(__("Cannot create payment"));
- }
- );
- });
- },
- createPaymentHandler(data) {
- return this.createTransaction(data.orderID);
- },
- onSuccessCallback() {
- if (this.result.message) {
- this.displayErrorMessage(message);
- } else {
- if (this.result.cart_id && this.result.cart_id.length) {
- window.location.replace(
- urlBuilder.build("checkout/onepage/success/")
- );
- } else {
- this.displayErrorMessage(__("Cannot create payment"));
- }
- }
- },
+ },
- onErrorCallback(reason) {
- // custom error behavior
- this.displayErrorMessage(reason);
- },
- onInitCallback() {},
- onCancelCallback() {
- this.displayErrorMessage(__("You have canceled the payment request"));
- },
- onClickCallback() {
- //reset any previous payment response;
- this.result = null;
- },
- /**
- * Init class
- */
- init() {
- sdk.initiate(this.options);
- },
+ onErrorCallback(reason) {
+ // custom error behavior
+ this.displayErrorMessage(reason);
+ },
+ onInitCallback() {
+ },
+ onCancelCallback() {
+ this.displayErrorMessage(__("You have canceled the payment request"));
+ },
+ onClickCallback() {
+ //reset any previous payment response;
+ this.result = null;
+ },
+ /**
+ * Init class
+ */
+ init() {
+ sdk.initiate(this.options);
+ },
- /**
- * Create order and do payment
- * @param {string} orderId
- * @returns Promise
- */
- createTransaction(orderId) {
- const cart_id = this.cart_id;
- return new Promise((resolve, reject) => {
- $.post(
- urlBuilder.build(
- "rest/default/V1/buckaroo/paypal-express/order/create"
- ),
- {
- paypal_order_id: orderId,
- cart_id,
- }
- ).then(
- (response) => {
- this.result = response;
- resolve(response);
- },
- (reason) => reject(reason)
- );
- });
- },
+ /**
+ * Create order and do payment
+ * @param {string} orderId
+ * @returns Promise
+ */
+ createTransaction(orderId) {
+ const cart_id = this.cart_id;
+ return new Promise((resolve, reject) => {
+ $.post(
+ urlBuilder.build(
+ "rest/default/V1/buckaroo/paypal-express/order/create"
+ ),
+ {
+ paypal_order_id: orderId,
+ cart_id,
+ }
+ ).then(
+ (response) => {
+ this.result = response;
+ resolve(response);
+ },
+ (reason) => reject(reason)
+ );
+ });
+ },
- /**
- * Set shipping on cart and return new total
- * @param {Object} data
- * @returns
- */
- setShipping(data) {
- return $.post(
- urlBuilder.build(
- "rest/default/V1/buckaroo/paypal-express/quote/create"
- ),
- {
- shippingAddress: data.shipping_address,
- orderData: this.getOrderData(),
- page: this.page,
- }
- );
- },
- /**
- * Get form data for product page to create cart
- * @returns
- */
- getOrderData() {
- let form = $("#product_addtocart_form");
- if (this.page === "product") {
- return form.serializeArray();
- }
- },
- /**
- * Display any validation errors we receive
- * @param {string} message
- */
- displayErrorMessage(message) {
- if (typeof message === "object") {
- if (message.responseJSON && message.responseJSON.message) {
- message = __(message.responseJSON.message);
- } else {
- message = __("Cannot create payment");
- }
- }
- customerData.set("messages", {
- messages: [
- {
- type: "error",
- text: message,
- },
- ],
- });
- },
- };
+ /**
+ * Set shipping on cart and return new total
+ * @param {Object} data
+ * @returns
+ */
+ setShipping(data) {
+ return $.post(
+ urlBuilder.build(
+ "rest/default/V1/buckaroo/paypal-express/quote/create"
+ ),
+ {
+ shippingAddress: data.shipping_address,
+ orderData: this.getOrderData(),
+ page: this.page,
+ }
+ );
+ },
+ /**
+ * Get form data for product page to create cart
+ * @returns
+ */
+ getOrderData() {
+ let form = $("#product_addtocart_form");
+ if (this.page === "product") {
+ return form.serializeArray();
+ }
+ },
+ /**
+ * Display any validation errors we receive
+ * @param {string} message
+ */
+ displayErrorMessage(message) {
+ if (typeof message === "object") {
+ if (message.responseJSON && message.responseJSON.message) {
+ message = __(message.responseJSON.message);
+ } else {
+ message = __("Cannot create payment");
+ }
+ }
+ customerData.set("messages", {
+ messages: [
+ {
+ type: "error",
+ text: message,
+ },
+ ],
+ });
+ },
+ };
});
+
diff --git a/view/frontend/web/js/view/payment/method-renderer/afterpay.js b/view/frontend/web/js/view/payment/method-renderer/afterpay.js
index 773d956ea..0cd3e167d 100644
--- a/view/frontend/web/js/view/payment/method-renderer/afterpay.js
+++ b/view/frontend/web/js/view/payment/method-renderer/afterpay.js
@@ -103,15 +103,16 @@ define(
value.substr(6, 4),
value.substr(3, 2) - 1,
value.substr(0, 2),
- 0, 0, 0
+ 0,
+ 0,
+ 0
);
return ~~((Date.now() - birthday) / (31557600000)) >= 18;
}
}
return false;
},
- $.mage.__('You should be at least 18 years old.')
- );
+ $.mage.__('You should be at least 18 years old.'));
return Component.extend(
{
@@ -173,7 +174,7 @@ define(
this.billingName = ko.computed(
function () {
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
return quote.billingAddress().firstname + " " + quote.billingAddress().lastname;
}
},
@@ -182,7 +183,7 @@ define(
this.termsUrl = ko.computed(
function () {
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
let newUrl = 'https://www.afterpay.nl/nl/algemeen/betalen-met-afterpay/betalingsvoorwaarden';
if (this.paymentMethod == PAYMENT_METHOD_DIGIACCEPT) {
newUrl = this.getDigiacceptUrl(quote.billingAddress().countryId);
@@ -208,24 +209,24 @@ define(
*/
this.bankAccountNumber.extend({ uppercase: true });
- this.dateValidate.subscribe(function() {
+ this.dateValidate.subscribe(function () {
const dobId = 'buckaroo_magento2_afterpay_DoB';
const isValid = $(`#${dobId}`).valid();
let state = this.validationState();
state[dobId] = isValid;
this.validationState(state);
- }, this);
+ }, this);
this.buttoncheck = ko.computed(
function () {
const state = this.validationState();
const valid = this.getActiveValidationFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -248,7 +249,7 @@ define(
let fields = [
'buckaroo_magento2_afterpay_TermsCondition',
];
- if(!this.hasTelephoneNumber()) {
+ if (!this.hasTelephoneNumber()) {
fields.push('buckaroo_magento2_afterpay_Telephone')
}
@@ -259,9 +260,9 @@ define(
)
) {
fields.push('buckaroo_magento2_afterpay_DoB')
- if(this.paymentMethod == PAYMENT_METHOD_ACCEPTGIRO) {
- fields.push('buckaroo_magento2_afterpay_IBAN')
- }
+ if (this.paymentMethod == PAYMENT_METHOD_ACCEPTGIRO) {
+ fields.push('buckaroo_magento2_afterpay_IBAN')
+ }
} else {
fields = fields.concat(
[
@@ -350,7 +351,7 @@ define(
}
};
},
- getDigiacceptUrl :function(country) {
+ getDigiacceptUrl :function (country) {
var businessMethod = this.getBusinessMethod();
var url = 'https://www.afterpay.nl/nl/algemeen/betalen-met-afterpay/betalingsvoorwaarden';
@@ -369,7 +370,7 @@ define(
return url;
},
- getBusinessMethod : function() {
+ getBusinessMethod : function () {
var businessMethod = BUSINESS_METHOD_B2C;
if (this.businessMethod == BUSINESS_METHOD_B2B
diff --git a/view/frontend/web/js/view/payment/method-renderer/afterpay2.js b/view/frontend/web/js/view/payment/method-renderer/afterpay2.js
index 44457ae99..27b6583d3 100644
--- a/view/frontend/web/js/view/payment/method-renderer/afterpay2.js
+++ b/view/frontend/web/js/view/payment/method-renderer/afterpay2.js
@@ -103,15 +103,16 @@ define(
value.substr(6, 4),
value.substr(3, 2) - 1,
value.substr(0, 2),
- 0, 0, 0
+ 0,
+ 0,
+ 0
);
return ~~((Date.now() - birthday) / (31557600000)) >= 18;
}
}
return false;
},
- $.mage.__('You should be at least 18 years old.')
- );
+ $.mage.__('You should be at least 18 years old.'));
return Component.extend(
{
@@ -172,7 +173,7 @@ define(
this.billingName = ko.computed(
function () {
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
return quote.billingAddress().firstname + " " + quote.billingAddress().lastname;
}
},
@@ -181,7 +182,7 @@ define(
this.termsUrl = ko.computed(
function () {
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
let newUrl = 'https://www.afterpay.nl/nl/algemeen/betalen-met-afterpay/betalingsvoorwaarden';
if (this.paymentMethod == PAYMENT_METHOD_DIGIACCEPT) {
newUrl = this.getDigiacceptUrl(quote.billingAddress().countryId);
@@ -207,24 +208,24 @@ define(
*/
this.bankAccountNumber.extend({ uppercase: true });
- this.dateValidate.subscribe(function() {
+ this.dateValidate.subscribe(function () {
const dobId = 'buckaroo_magento2_afterpay2_DoB';
const isValid = $(`#${dobId}`).valid();
let state = this.validationState();
state[dobId] = isValid;
this.validationState(state);
- }, this);
+ }, this);
this.buttoncheck = ko.computed(
function () {
const state = this.validationState();
const valid = this.getActiveValidationFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -247,7 +248,7 @@ define(
let fields = [
'buckaroo_magento2_afterpay2_TermsCondition',
];
- if(!this.hasTelephoneNumber()) {
+ if (!this.hasTelephoneNumber()) {
fields.push('buckaroo_magento2_afterpay2_Telephone')
}
@@ -258,9 +259,9 @@ define(
)
) {
fields.push('buckaroo_magento2_afterpay2_DoB')
- if(this.paymentMethod == PAYMENT_METHOD_ACCEPTGIRO) {
- fields.push('buckaroo_magento2_afterpay2_IBAN')
- }
+ if (this.paymentMethod == PAYMENT_METHOD_ACCEPTGIRO) {
+ fields.push('buckaroo_magento2_afterpay2_IBAN')
+ }
} else {
fields = fields.concat(
[
@@ -349,7 +350,7 @@ define(
}
};
},
- getDigiacceptUrl :function(country) {
+ getDigiacceptUrl :function (country) {
var businessMethod = this.getBusinessMethod();
var url = 'https://www.afterpay.nl/nl/algemeen/betalen-met-afterpay/betalingsvoorwaarden';
@@ -368,7 +369,7 @@ define(
return url;
},
- getBusinessMethod : function() {
+ getBusinessMethod : function () {
var businessMethod = BUSINESS_METHOD_B2C;
if (this.businessMethod == BUSINESS_METHOD_B2B
diff --git a/view/frontend/web/js/view/payment/method-renderer/afterpay20.js b/view/frontend/web/js/view/payment/method-renderer/afterpay20.js
index 1cbe63f96..e0d285686 100644
--- a/view/frontend/web/js/view/payment/method-renderer/afterpay20.js
+++ b/view/frontend/web/js/view/payment/method-renderer/afterpay20.js
@@ -64,8 +64,7 @@ define(
return value.length <= 8;
},
- $.mage.__('Invalid COC number')
- );
+ $.mage.__('Invalid COC number'));
$.validator.addMethod('phoneValidation', function (value) {
var countryId = quote.billingAddress().countryId;
@@ -82,35 +81,34 @@ define(
min: 11,
max: 14
}
- };
- if (!value) {
- return false;
- }
+ };
+ if (!value) {
+ return false;
+ }
value = value.replace(/^\+|(00)/, '');
value = value.replace(/\(0\)|\s|-/g, '');
- if (value.match(/\+/)) {
- return false;
- }
+ if (value.match(/\+/)) {
+ return false;
+ }
+
+ if (value.match(/[^0-9]/)) {
+ return false;
+ }
- if (value.match(/[^0-9]/)) {
+ if (lengths.hasOwnProperty(countryId)) {
+ if (lengths[countryId].min && (value.length < lengths[countryId].min)) {
return false;
}
-
- if (lengths.hasOwnProperty(countryId)) {
- if (lengths[countryId].min && (value.length < lengths[countryId].min)) {
- return false;
- }
- if (lengths[countryId].max && (value.length > lengths[countryId].max)) {
- return false;
- }
+ if (lengths[countryId].max && (value.length > lengths[countryId].max)) {
+ return false;
}
+ }
return true;
- },
- $.mage.__('Phone number should be correct.')
- );
+ },
+ $.mage.__('Phone number should be correct.'));
$.validator.addMethod('validateAge', function (value) {
if (value && (value.length > 0)) {
@@ -120,15 +118,16 @@ define(
value.substr(6, 4),
value.substr(3, 2) - 1,
value.substr(0, 2),
- 0, 0, 0
+ 0,
+ 0,
+ 0
);
return ~~((Date.now() - birthday) / (31557600000)) >= 18;
}
}
return false;
},
- $.mage.__('You should be at least 18 years old.')
- );
+ $.mage.__('You should be at least 18 years old.'));
return Component.extend(
{
@@ -184,8 +183,8 @@ define(
);
this.activeAddress = ko.computed(
- function() {
- if(quote.billingAddress()) {
+ function () {
+ if (quote.billingAddress()) {
return quote.billingAddress();
}
return quote.shippingAddress();
@@ -193,14 +192,14 @@ define(
);
this.country = ko.computed(
- function() {
+ function () {
return this.activeAddress().countryId;
},
this
);
this.showCOC = ko.computed(
- function() {
+ function () {
let shipping = quote.shippingAddress();
let billing = quote.billingAddress();
@@ -218,9 +217,8 @@ define(
return (!this.isCustomerLoggedIn() && this.isOsc()) ||
(this.country() === 'NL' || this.country() === 'BE') ||
this.phoneValidate()
- },
- this
- );
+ },
+ this);
this.showNLBEFields = ko.computed(
function () {
@@ -262,15 +260,15 @@ define(
);
this.buttoncheck = ko.computed(
- function() {
+ function () {
const state = this.validationState();
const valid = this.getActiveValidationFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -280,26 +278,26 @@ define(
this
)
- this.activeAddress.subscribe(function(address) {
- if(address.phone) {
+ this.activeAddress.subscribe(function (address) {
+ if (address.phone) {
this.phoneValidate(address.phone)
}
}, this)
- this.dateValidate.subscribe(function() {
- this.validateField('DoB');
+ this.dateValidate.subscribe(function () {
+ this.validateField('DoB');
}, this);
- this.customerCoc.subscribe(function() {
+ this.customerCoc.subscribe(function () {
this.validateField('coc');
- }, this);
- this.termsValidate.subscribe(function() {
- this.validateField('TermsCondition');
}, this);
- this.identificationValidate.subscribe(function() {
- this.validateField('Identificationnumber');
+ this.termsValidate.subscribe(function () {
+ this.validateField('TermsCondition');
+ }, this);
+ this.identificationValidate.subscribe(function () {
+ this.validateField('Identificationnumber');
}, this);
- this.phoneValidate.subscribe(function() {
- this.validateField('Telephone');
+ this.phoneValidate.subscribe(function () {
+ this.validateField('Telephone');
}, this);
return this;
@@ -307,26 +305,26 @@ define(
getActiveValidationFields() {
let fields = ['TermsCondition'];
- if(this.showPhone()) {
+ if (this.showPhone()) {
fields.push('Telephone')
}
- if(this.showIdentification()) {
+ if (this.showIdentification()) {
fields.push('Identificationnumber')
}
- if(this.showCOC()) {
+ if (this.showCOC()) {
fields.push('coc')
}
- if(this.showNLBEFields()) {
+ if (this.showNLBEFields()) {
fields.push('DoB')
}
return fields;
},
- validateField: function(id) {
+ validateField: function (id) {
this.messageContainer.clear();
const isValid = $(`#buckaroo_magento2_afterpay20_${id}`).valid();
let state = this.validationState();
@@ -366,7 +364,7 @@ define(
'dpd-selected-parcelshop-city',
'dpd-selected-parcelshop-country'
];
- dpdCookies.forEach(function(item) {
+ dpdCookies.forEach(function (item) {
var value = $.mage.cookies.get(item);
if (value) {
$.mage.cookies.clear(item);
diff --git a/view/frontend/web/js/view/payment/method-renderer/billink.js b/view/frontend/web/js/view/payment/method-renderer/billink.js
index b139a441f..c1e2903c8 100644
--- a/view/frontend/web/js/view/payment/method-renderer/billink.js
+++ b/view/frontend/web/js/view/payment/method-renderer/billink.js
@@ -56,15 +56,16 @@ define(
value.substr(6, 4),
value.substr(3, 2) - 1,
value.substr(0, 2),
- 0, 0, 0
+ 0,
+ 0,
+ 0
);
return ~~((Date.now() - birthday) / (31557600000)) >= 18;
}
}
return false;
},
- $.mage.__('You should be at least 18 years old.')
- );
+ $.mage.__('You should be at least 18 years old.'));
const validPhone = function (value) {
if (quote.billingAddress() === null) {
@@ -111,7 +112,9 @@ define(
return true;
};
- $.validator.addMethod('phoneValidation', validPhone ,
+ $.validator.addMethod(
+ 'phoneValidation',
+ validPhone ,
$.mage.__('Phone number should be correct.')
);
@@ -173,10 +176,10 @@ define(
);
this.billingName = ko.computed(
function () {
- if(this.isB2B && quote.billingAddress() !== null) {
+ if (this.isB2B && quote.billingAddress() !== null) {
return quote.billingAddress().company;
}
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
return quote.billingAddress().firstname + " " + quote.billingAddress().lastname;
}
},
@@ -201,7 +204,7 @@ define(
);
this.showB2B = ko.computed(
- function() {
+ function () {
let shipping = quote.shippingAddress();
let billing = quote.billingAddress();
@@ -214,24 +217,24 @@ define(
this
);
- this.dob.subscribe(function() {
+ this.dob.subscribe(function () {
const dobId = 'buckaroo_magento2_billink_DoB';
const isValid = $(`#${dobId}`).valid();
let state = this.validationState();
state[dobId] = isValid;
this.validationState(state);
- }, this);
+ }, this);
this.buttoncheck = ko.computed(
function () {
const state = this.validationState();
const valid = this.getActiveValidationFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -254,7 +257,7 @@ define(
let fields = [
'buckaroo_magento2_billink_TermsCondition',
];
- if(this.showPhone()) {
+ if (this.showPhone()) {
fields.push('buckaroo_magento2_billink_Telephone')
}
@@ -323,7 +326,7 @@ define(
getData: function () {
let phone = this.phone();
- if(!this.showPhone() && quote.billingAddress() !== null) {
+ if (!this.showPhone() && quote.billingAddress() !== null) {
phone = quote.billingAddress().telephone;
}
diff --git a/view/frontend/web/js/view/payment/method-renderer/capayablein3.js b/view/frontend/web/js/view/payment/method-renderer/capayablein3.js
index c5b5513aa..e6f127098 100644
--- a/view/frontend/web/js/view/payment/method-renderer/capayablein3.js
+++ b/view/frontend/web/js/view/payment/method-renderer/capayablein3.js
@@ -90,9 +90,11 @@ define(
return true;
};
- $.validator.addMethod('in3phoneValidation', validPhone ,
- $.mage.__('Phone number should be correct.')
- );
+ $.validator.addMethod(
+ 'in3phoneValidation',
+ validPhone ,
+ $.mage.__('Phone number should be correct.')
+ );
return Component.extend(
{
@@ -144,7 +146,7 @@ define(
this.billingName = ko.computed(
function () {
- if(quote.billingAddress() !== null) {
+ if (quote.billingAddress() !== null) {
return quote.billingAddress().firstname + " " + quote.billingAddress().lastname
}
return '';
@@ -158,12 +160,12 @@ define(
function () {
const state = this.validationState();
const valid =this.getActiveFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -173,13 +175,13 @@ define(
this
);
- this.dateValidate.subscribe(function() {
+ this.dateValidate.subscribe(function () {
const id = 'buckaroo_magento2_capayablein3_DoB';
const isValid = $(`#${id}`).valid();
let state = this.validationState();
state[id] = isValid;
this.validationState(state);
- }, this);
+ }, this);
return this;
},
@@ -187,7 +189,7 @@ define(
let fields = [
'buckaroo_magento2_capayablein3_DoB',
];
- if(this.showPhone()) {
+ if (this.showPhone()) {
fields.push('buckaroo_magento2_capayablein3_Telephone');
}
return fields;
@@ -257,7 +259,7 @@ define(
return $('.' + this.getCode() + ' .payment-method-second-col form').valid();
},
- getData : function() {
+ getData : function () {
let telephone = quote.billingAddress().telephone;
if (validPhone(this.phone())) {
telephone = this.phone();
diff --git a/view/frontend/web/js/view/payment/method-renderer/creditcards.js b/view/frontend/web/js/view/payment/method-renderer/creditcards.js
index 614e9093b..3c68ac0ff 100644
--- a/view/frontend/web/js/view/payment/method-renderer/creditcards.js
+++ b/view/frontend/web/js/view/payment/method-renderer/creditcards.js
@@ -48,44 +48,39 @@ define(
*/
$.validator.addMethod('validateCardNumber', function (value) {
return BuckarooClientSideEncryption.V001.validateCardNumber(value.replace(/\s+/g, ''));
- },
- $.mage.__('Please enter a valid creditcard number.')
- );
+ },
+ $.mage.__('Please enter a valid creditcard number.'));
$.validator.addMethod('validateCvc', function (value) {
return BuckarooClientSideEncryption.V001.validateCvc(
value,
$('#buckaroo_magento2_creditcards_issuer').val()
);
- },
- $.mage.__('Please enter a valid Cvc number.')
- );
+ },
+ $.mage.__('Please enter a valid Cvc number.'));
$.validator.addMethod('validateCardHolderName', function (value) {
return BuckarooClientSideEncryption.V001.validateCardholderName(value);
- },
- $.mage.__('Please enter a valid card holder name.')
- );
+ },
+ $.mage.__('Please enter a valid card holder name.'));
$.validator.addMethod('bkValidateYear', function (value) {
- if(value.length === 0) {
- return false;
- }
+ if (value.length === 0) {
+ return false;
+ }
const parts = value.split("/");
return BuckarooClientSideEncryption.V001.validateYear(parts[1]);
- },
- $.mage.__('Enter a valid year number.')
- );
+ },
+ $.mage.__('Enter a valid year number.'));
$.validator.addMethod('bkValidateMonth', function (value) {
- if(value.length === 0) {
- return false;
- }
+ if (value.length === 0) {
+ return false;
+ }
const parts = value.split("/");
return BuckarooClientSideEncryption.V001.validateMonth(parts[0]);
- },
- $.mage.__('Enter a valid month number.')
- );
+ },
+ $.mage.__('Enter a valid month number.'));
return Component.extend(
{
@@ -136,7 +131,7 @@ define(
this.formatedCardNumber = ko.computed({
read: function () {
let cardNumber = this.cardNumber();
- if(cardNumber.length) {
+ if (cardNumber.length) {
return this.cardNumber().match(new RegExp('.{1,4}', 'g')).join(" ");
}
return '';
@@ -150,22 +145,29 @@ define(
this.formatedExpirationDate = ko.computed({
read: function () {
let expireDate = this.expireDate();
- if(expireDate.length) {
+ if (expireDate.length) {
return expireDate.replace(
- /^([1-9]\/|[2-9])$/g, '0$1/' // 3 > 03/
- ).replace(
- /^(0[1-9]|1[0-2])$/g, '$1/' // 11 > 11/
- ).replace(
- /^([0-1])([3-9])$/g, '0$1/$2' // 13 > 01/3
- ).replace(
- /^(0?[1-9]|1[0-2])([0-9]{2})$/g, '$1/$2' // 141 > 01/41
- ).replace(
- /^([0]+)\/|[0]+$/g, '0' // 0/ > 0 and 00 > 0
- ).replace(
- /[^\d\/]|^[\/]*$/g, '' // To allow only digits and `/`
- ).replace(
- /\/\//g, '/' // Prevent entering more than 1 `/`
- );
+ /^([1-9]\/|[2-9])$/g,
+ '0$1/' // 3 > 03/
+ ).replace(
+ /^(0[1-9]|1[0-2])$/g,
+ '$1/' // 11 > 11/
+ ).replace(
+ /^([0-1])([3-9])$/g,
+ '0$1/$2' // 13 > 01/3
+ ).replace(
+ /^(0?[1-9]|1[0-2])([0-9]{2})$/g,
+ '$1/$2' // 141 > 01/41
+ ).replace(
+ /^([0]+)\/|[0]+$/g,
+ '0' // 0/ > 0 and 00 > 0
+ ).replace(
+ /[^\d\/]|^[\/]*$/g,
+ '' // To allow only digits and `/`
+ ).replace(
+ /\/\//g,
+ '/' // Prevent entering more than 1 `/`
+ );
}
return '';
},
@@ -185,7 +187,7 @@ define(
cardLogo = issuer.img;
}
- return cardLogo;
+ return cardLogo;
},
this
);
@@ -203,9 +205,9 @@ define(
)
//validate the cvc if exists
- if(this.cvc().length) {
- $('#buckaroo_magento2_creditcards_cvc').valid();
- }
+ if (this.cvc().length) {
+ $('#buckaroo_magento2_creditcards_cvc').valid();
+ }
},
validateField(data, event) {
@@ -260,7 +262,7 @@ define(
selectPaymentMethod: function () {
window.checkoutConfig.buckarooFee.title(this.paymentFeeLabel);
- this.getData().then(function(data) {
+ this.getData().then(function (data) {
selectPaymentMethodAction(data);
})
checkoutData.setSelectedPaymentMethod(this.item.method);
@@ -296,7 +298,7 @@ define(
if (this.validate() && additionalValidators.validate()) {
this.isPlaceOrderActionAllowed(false);
- this.getData().then(function(data) {
+ this.getData().then(function (data) {
placeOrder = placeOrderAction(data, self.redirectAfterPlaceOrder, self.messageContainer);
$.when(placeOrder).fail(
@@ -317,14 +319,14 @@ define(
},
getData: function () {
- return new Promise(function(resolve) {
+ return new Promise(function (resolve) {
const parts = this.expireDate().split("/");
const month = parts[0];
const year = parts[1];
const method = this.item.method;
let cardIssuer = this.cardIssuer();
- if(cardIssuer == null) {
+ if (cardIssuer == null) {
cardIssuer = this.determineIssuer(this.cardNumber());
}
@@ -335,7 +337,7 @@ define(
month,
this.cvc(),
this.cardHolderName(),
- function(encryptedCardData) {
+ function (encryptedCardData) {
resolve({
"method": method,
"po_number": null,
@@ -344,7 +346,8 @@ define(
"card_type" : cardIssuer
}
})
- });
+ }
+ );
}.bind(this))
}
}
diff --git a/view/frontend/web/js/view/payment/method-renderer/giropay.js b/view/frontend/web/js/view/payment/method-renderer/giropay.js
index 63d4f59c6..d8ec27314 100644
--- a/view/frontend/web/js/view/payment/method-renderer/giropay.js
+++ b/view/frontend/web/js/view/payment/method-renderer/giropay.js
@@ -61,16 +61,16 @@ define(
bicNumber: '',
validationState: {}
},
- paymentFeeLabel : window.checkoutConfig.payment.buckaroo.giropay.paymentFeeLabel,
- subtext : window.checkoutConfig.payment.buckaroo.giropay.subtext,
- subTextStyle : checkoutCommon.getSubtextStyle('giropay'),
- currencyCode : window.checkoutConfig.quoteData.quote_currency_code,
- baseCurrencyCode : window.checkoutConfig.quoteData.base_currency_code,
+ paymentFeeLabel: window.checkoutConfig.payment.buckaroo.giropay.paymentFeeLabel,
+ subtext: window.checkoutConfig.payment.buckaroo.giropay.subtext,
+ subTextStyle: checkoutCommon.getSubtextStyle('giropay'),
+ currencyCode: window.checkoutConfig.quoteData.quote_currency_code,
+ baseCurrencyCode: window.checkoutConfig.quoteData.base_currency_code,
/**
- * @override
- */
- initialize : function (options) {
+ * @override
+ */
+ initialize: function (options) {
if (checkoutData.getSelectedPaymentMethod() == options.index) {
window.checkoutConfig.buckarooFee.title(this.paymentFeeLabel);
}
@@ -81,19 +81,19 @@ define(
initObservable: function () {
this._super().observe(['bicNumber', 'validationState']);
- /** Check used to see form is valid **/
- this.buttoncheck = ko.computed(
+ /** Check used to see form is valid **/
+ this.buttoncheck = ko.computed(
function () {
const state = this.validationState();
const valid = [
'bicnumber',
].map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -129,7 +129,7 @@ define(
*/
placeOrder: function (data, event) {
var self = this,
- placeOrder;
+ placeOrder;
if (event) {
event.preventDefault();
@@ -188,3 +188,4 @@ define(
);
}
);
+
diff --git a/view/frontend/web/js/view/payment/method-renderer/ideal.js b/view/frontend/web/js/view/payment/method-renderer/ideal.js
index 10618b4e9..235a624a1 100644
--- a/view/frontend/web/js/view/payment/method-renderer/ideal.js
+++ b/view/frontend/web/js/view/payment/method-renderer/ideal.js
@@ -80,12 +80,12 @@ define(
const valid = [
'issuer',
].map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
diff --git a/view/frontend/web/js/view/payment/method-renderer/idealprocessing.js b/view/frontend/web/js/view/payment/method-renderer/idealprocessing.js
index fb3d8cfb5..cb9f4ebfc 100644
--- a/view/frontend/web/js/view/payment/method-renderer/idealprocessing.js
+++ b/view/frontend/web/js/view/payment/method-renderer/idealprocessing.js
@@ -80,12 +80,12 @@ define(
const valid = [
'issuer',
].map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
diff --git a/view/frontend/web/js/view/payment/method-renderer/klarna.js b/view/frontend/web/js/view/payment/method-renderer/klarna.js
index 1983b3437..78e8f1978 100644
--- a/view/frontend/web/js/view/payment/method-renderer/klarna.js
+++ b/view/frontend/web/js/view/payment/method-renderer/klarna.js
@@ -79,8 +79,8 @@ define(
* Check if the required fields are filled. If so: enable place order button (true) | if not: disable place order button (false)
*/
this.buttoncheck = ko.computed(
- function () {
- return this.selectedGender() != null;
+ function () {
+ return this.selectedGender() != null;
},
this
);
@@ -143,7 +143,7 @@ define(
var text = $.mage.__('The transaction will be processed using %s.');
return text.replace('%s', this.baseCurrencyCode);
- },
+ },
getData: function () {
return {
diff --git a/view/frontend/web/js/view/payment/method-renderer/klarnain.js b/view/frontend/web/js/view/payment/method-renderer/klarnain.js
index f8ef6ac4b..22c5684b2 100644
--- a/view/frontend/web/js/view/payment/method-renderer/klarnain.js
+++ b/view/frontend/web/js/view/payment/method-renderer/klarnain.js
@@ -77,8 +77,8 @@ define(
* Check if the required fields are filled. If so: enable place order button (true) | if not: disable place order button (false)
*/
this.buttoncheck = ko.computed(
- function () {
- return this.selectedGender() != null;
+ function () {
+ return this.selectedGender() != null;
},
this
);
diff --git a/view/frontend/web/js/view/payment/method-renderer/mrcash.js b/view/frontend/web/js/view/payment/method-renderer/mrcash.js
index 2d578eb78..6a3348c41 100644
--- a/view/frontend/web/js/view/payment/method-renderer/mrcash.js
+++ b/view/frontend/web/js/view/payment/method-renderer/mrcash.js
@@ -49,33 +49,29 @@ define(
*/
$.validator.addMethod('validateCardNumber', function (value) {
return BuckarooClientSideEncryption.V001.validateCardNumber(value.replace(/\s+/g, ''));
- },
- $.mage.__('Please enter a valid creditcard number.')
- );
+ },
+ $.mage.__('Please enter a valid creditcard number.'));
$.validator.addMethod('validateCardHolderName', function (value) {
return BuckarooClientSideEncryption.V001.validateCardholderName(value);
- },
- $.mage.__('Please enter a valid card holder name.')
- );
+ },
+ $.mage.__('Please enter a valid card holder name.'));
$.validator.addMethod('bkValidateYear', function (value) {
- if(value.length === 0) {
- return false;
- }
+ if (value.length === 0) {
+ return false;
+ }
const parts = value.split("/");
return BuckarooClientSideEncryption.V001.validateYear(parts[1]);
- },
- $.mage.__('Enter a valid year number.')
- );
+ },
+ $.mage.__('Enter a valid year number.'));
$.validator.addMethod('bkValidateMonth', function (value) {
- if(value.length === 0) {
- return false;
- }
+ if (value.length === 0) {
+ return false;
+ }
const parts = value.split("/");
return BuckarooClientSideEncryption.V001.validateMonth(parts[0]);
- },
- $.mage.__('Enter a valid month number.')
- );
+ },
+ $.mage.__('Enter a valid month number.'));
return Component.extend(
{
@@ -133,7 +129,7 @@ define(
this.formatedCardNumber = ko.computed({
read: function () {
let cardNumber = this.cardNumber();
- if(cardNumber.length) {
+ if (cardNumber.length) {
return this.cardNumber().match(new RegExp('.{1,4}', 'g')).join(" ");
}
return '';
@@ -147,22 +143,29 @@ define(
this.formatedExpirationDate = ko.computed({
read: function () {
let expireDate = this.expireDate();
- if(expireDate.length) {
+ if (expireDate.length) {
return expireDate.replace(
- /^([1-9]\/|[2-9])$/g, '0$1/' // 3 > 03/
- ).replace(
- /^(0[1-9]|1[0-2])$/g, '$1/' // 11 > 11/
- ).replace(
- /^([0-1])([3-9])$/g, '0$1/$2' // 13 > 01/3
- ).replace(
- /^(0?[1-9]|1[0-2])([0-9]{2})$/g, '$1/$2' // 141 > 01/41
- ).replace(
- /^([0]+)\/|[0]+$/g, '0' // 0/ > 0 and 00 > 0
- ).replace(
- /[^\d\/]|^[\/]*$/g, '' // To allow only digits and `/`
- ).replace(
- /\/\//g, '/' // Prevent entering more than 1 `/`
- );
+ /^([1-9]\/|[2-9])$/g,
+ '0$1/' // 3 > 03/
+ ).replace(
+ /^(0[1-9]|1[0-2])$/g,
+ '$1/' // 11 > 11/
+ ).replace(
+ /^([0-1])([3-9])$/g,
+ '0$1/$2' // 13 > 01/3
+ ).replace(
+ /^(0?[1-9]|1[0-2])([0-9]{2})$/g,
+ '$1/$2' // 141 > 01/41
+ ).replace(
+ /^([0]+)\/|[0]+$/g,
+ '0' // 0/ > 0 and 00 > 0
+ ).replace(
+ /[^\d\/]|^[\/]*$/g,
+ '' // To allow only digits and `/`
+ ).replace(
+ /\/\//g,
+ '/' // Prevent entering more than 1 `/`
+ );
}
return '';
},
@@ -174,7 +177,7 @@ define(
this.buttoncheck = ko.computed(
function () {
- if(this.isMobileMode() || this.useClientSide == false) {
+ if (this.isMobileMode() || this.useClientSide == false) {
return true;
}
const state = this.validationState();
@@ -183,12 +186,12 @@ define(
'buckaroo_magento2_mrcash_cardnumber',
'buckaroo_magento2_mrcash_expireDate',
].map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -210,7 +213,7 @@ define(
},
getData: function () {
- return new Promise(function(resolve) {
+ return new Promise(function (resolve) {
const parts = this.expireDate().split("/");
const month = parts[0];
const year = parts[1];
@@ -224,7 +227,7 @@ define(
month,
'',
this.cardHolderName(),
- function(encryptedCardData) {
+ function (encryptedCardData) {
resolve({
"method": method,
"po_number": null,
@@ -233,7 +236,8 @@ define(
"client_side_mode" :clientSideMode
}
})
- });
+ }
+ );
}.bind(this))
},
@@ -246,7 +250,7 @@ define(
* placeOrderAction has been changed from Magento_Checkout/js/action/place-order to our own version
* (Buckaroo_Magento2/js/action/place-order) to prevent redirect and handle the response.
*/
- placeOrder: function (data, event) {
+ placeOrder: function (data, event) {
var self = this,
placeOrder;
@@ -256,7 +260,7 @@ define(
if (additionalValidators.validate()) {
this.isPlaceOrderActionAllowed(false);
- this.getData().then(function(data) {
+ this.getData().then(function (data) {
placeOrder = placeOrderAction(data, self.redirectAfterPlaceOrder, self.messageContainer);
$.when(placeOrder).fail(
diff --git a/view/frontend/web/js/view/payment/method-renderer/paybybank.js b/view/frontend/web/js/view/payment/method-renderer/paybybank.js
index e566f09de..548bc7858 100644
--- a/view/frontend/web/js/view/payment/method-renderer/paybybank.js
+++ b/view/frontend/web/js/view/payment/method-renderer/paybybank.js
@@ -29,190 +29,190 @@ define([
"Magento_Checkout/js/action/select-payment-method",
"buckaroo/checkout/common",
], function (
- $,
- Component,
- additionalValidators,
- placeOrderAction,
- ko,
- $t,
- checkoutData,
- selectPaymentMethodAction,
- checkoutCommon
+ $,
+ Component,
+ additionalValidators,
+ placeOrderAction,
+ ko,
+ $t,
+ checkoutData,
+ selectPaymentMethodAction,
+ checkoutCommon
) {
- "use strict";
-
- return Component.extend({
- defaults: {
- template: "Buckaroo_Magento2/payment/buckaroo_magento2_paybybank",
- selectedBank: "",
- validationState: {},
- showAll: false,
- bankTypes: window.checkoutConfig.payment.buckaroo.paybybank.banks,
- isMobile: $(window).width() < 768,
- logo: require.toUrl('Buckaroo_Magento2/images/paybybank.gif')
- },
- redirectAfterPlaceOrder: false,
- selectionType:
- window.checkoutConfig.payment.buckaroo.paybybank.selectionType,
- subtext: window.checkoutConfig.payment.buckaroo.paybybank.subtext,
- subTextStyle: checkoutCommon.getSubtextStyle("paybybank"),
- currencyCode: window.checkoutConfig.quoteData.quote_currency_code,
- baseCurrencyCode: window.checkoutConfig.quoteData.base_currency_code,
- internalBanks: window.checkoutConfig.payment.buckaroo.paybybank.banks,
- /**
- * @override
- */
- initialize: function (options) {
- return this._super(options);
- },
-
- initObservable: function () {
- this._super().observe(["selectedBank", "validationState", "showAll", "isMobile"]);
- this.initialSelected();
- const self = this;
- $(window).resize(function () {
- const width = $(window).width();
- if(width < 768 && self.isMobile() === false) {
- self.isMobile(true);
- } else if (width >= 768) {
- self.isMobile(false);
- }
- });
-
- this.bankTypes = ko.computed(function () {
- const issuers = window.checkoutConfig.payment.buckaroo.paybybank.banks;
- if (this.showAll() === false && !this.isMobile()) {
- if (this.selectedBank() !== "") {
- return issuers.filter(function (bank) {
- return bank.code === this.selectedBank();
+ "use strict";
+
+ return Component.extend({
+ defaults: {
+ template: "Buckaroo_Magento2/payment/buckaroo_magento2_paybybank",
+ selectedBank: "",
+ validationState: {},
+ showAll: false,
+ bankTypes: window.checkoutConfig.payment.buckaroo.paybybank.banks,
+ isMobile: $(window).width() < 768,
+ logo: require.toUrl('Buckaroo_Magento2/images/paybybank.gif')
+ },
+ redirectAfterPlaceOrder: false,
+ selectionType:
+ window.checkoutConfig.payment.buckaroo.paybybank.selectionType,
+ subtext: window.checkoutConfig.payment.buckaroo.paybybank.subtext,
+ subTextStyle: checkoutCommon.getSubtextStyle("paybybank"),
+ currencyCode: window.checkoutConfig.quoteData.quote_currency_code,
+ baseCurrencyCode: window.checkoutConfig.quoteData.base_currency_code,
+ internalBanks: window.checkoutConfig.payment.buckaroo.paybybank.banks,
+ /**
+ * @override
+ */
+ initialize: function (options) {
+ return this._super(options);
+ },
+
+ initObservable: function () {
+ this._super().observe(["selectedBank", "validationState", "showAll", "isMobile"]);
+ this.initialSelected();
+ const self = this;
+ $(window).resize(function () {
+ const width = $(window).width();
+ if (width < 768 && self.isMobile() === false) {
+ self.isMobile(true);
+ } else if (width >= 768) {
+ self.isMobile(false);
+ }
+ });
+
+ this.bankTypes = ko.computed(function () {
+ const issuers = window.checkoutConfig.payment.buckaroo.paybybank.banks;
+ if (this.showAll() === false && !this.isMobile()) {
+ if (this.selectedBank() !== "") {
+ return issuers.filter(function (bank) {
+ return bank.code === this.selectedBank();
+ }, this);
+ }
+ return issuers.slice(0, 4);
+ }
+ return issuers;
}, this);
- }
- return issuers.slice(0, 4);
- }
- return issuers;
- }, this);
-
- /** Check used to see form is valid **/
- this.buttoncheck = ko.computed(function () {
- const state = this.validationState();
- const valid = ["issuer"]
- .map((field) => {
- if (state[field] !== undefined) {
- return state[field];
- }
- return false;
- })
- .reduce(function (prev, cur) {
- return prev && cur;
- }, true);
- return valid;
- }, this);
-
- this.logo = ko.computed(function () {
- let found = this.internalBanks.find(function (bank) {
- return bank.code === this.selectedBank();
- }, this);
+
+ /** Check used to see form is valid **/
+ this.buttoncheck = ko.computed(function () {
+ const state = this.validationState();
+ const valid = ["issuer"]
+ .map((field) => {
+ if (state[field] !== undefined) {
+ return state[field];
+ }
+ return false;
+ })
+ .reduce(function (prev, cur) {
+ return prev && cur;
+ }, true);
+ return valid;
+ }, this);
+
+ this.logo = ko.computed(function () {
+ let found = this.internalBanks.find(function (bank) {
+ return bank.code === this.selectedBank();
+ }, this);
+ if (found !== undefined) {
+ return found.img;
+ }
+ return require.toUrl('Buckaroo_Magento2/images/paybybank.gif')
+ }, this);
+ return this;
+ },
+
+
+ initialSelected() {
+ let found = this.internalBanks.find(function (bank) {
+ return bank.selected === true;
+ });
+
if (found !== undefined) {
- return found.img;
+ this.selectedBank(found.code);
+ this.updateFormState(true);
}
- return require.toUrl('Buckaroo_Magento2/images/paybybank.gif')
- }, this);
- return this;
- },
-
-
- initialSelected() {
- let found = this.internalBanks.find(function (bank) {
- return bank.selected === true;
- });
-
- if (found !== undefined) {
- this.selectedBank(found.code);
- this.updateFormState(true);
- }
- },
-
- validateField(data, event) {
- this.updateFormState(
- $(event.target).valid()
- );
- },
-
- updateFormState(isValid) {
- let state = this.validationState();
- state["issuer"] = isValid;
- this.validationState(state);
- },
-
- toggleShow: function () {
- this.showAll(!this.showAll());
- },
- /**
- * Place order.
- *
- * placeOrderAction has been changed from Magento_Checkout/js/action/place-order to our own version
- * (Buckaroo_Magento2/js/action/place-order) to prevent redirect and handle the response.
- */
- placeOrder: function (data, event) {
- var self = this,
- placeOrder;
-
- if (event) {
- event.preventDefault();
- }
-
- if (this.validate() && additionalValidators.validate()) {
- this.isPlaceOrderActionAllowed(false);
- placeOrder = placeOrderAction(
- this.getData(),
- this.redirectAfterPlaceOrder,
- this.messageContainer
- );
-
- $.when(placeOrder)
- .fail(function () {
- self.isPlaceOrderActionAllowed(true);
- })
- .done(this.afterPlaceOrder.bind(this));
- return true;
- }
- return false;
- },
-
- afterPlaceOrder: function () {
- var response = window.checkoutConfig.payment.buckaroo.response;
- response = $.parseJSON(response);
- checkoutCommon.redirectHandle(response);
- },
-
- selectPaymentMethod: function () {
- selectPaymentMethodAction(this.getData());
- checkoutData.setSelectedPaymentMethod(this.item.method);
- return true;
- },
-
- getData: function () {
- return {
- method: this.item.method,
- po_number: null,
- additional_data: {
- issuer: this.selectedBank(),
},
- };
- },
- payWithBaseCurrency: function () {
- var allowedCurrencies =
- window.checkoutConfig.payment.buckaroo.paybybank.allowedCurrencies;
+ validateField(data, event) {
+ this.updateFormState(
+ $(event.target).valid()
+ );
+ },
+
+ updateFormState(isValid) {
+ let state = this.validationState();
+ state["issuer"] = isValid;
+ this.validationState(state);
+ },
- return allowedCurrencies.indexOf(this.currencyCode) < 0;
- },
+ toggleShow: function () {
+ this.showAll(!this.showAll());
+ },
+ /**
+ * Place order.
+ *
+ * placeOrderAction has been changed from Magento_Checkout/js/action/place-order to our own version
+ * (Buckaroo_Magento2/js/action/place-order) to prevent redirect and handle the response.
+ */
+ placeOrder: function (data, event) {
+ var self = this,
+ placeOrder;
+
+ if (event) {
+ event.preventDefault();
+ }
- getPayWithBaseCurrencyText: function () {
- var text = $.mage.__("The transaction will be processed using %s.");
+ if (this.validate() && additionalValidators.validate()) {
+ this.isPlaceOrderActionAllowed(false);
+ placeOrder = placeOrderAction(
+ this.getData(),
+ this.redirectAfterPlaceOrder,
+ this.messageContainer
+ );
+
+ $.when(placeOrder)
+ .fail(function () {
+ self.isPlaceOrderActionAllowed(true);
+ })
+ .done(this.afterPlaceOrder.bind(this));
+ return true;
+ }
+ return false;
+ },
+
+ afterPlaceOrder: function () {
+ var response = window.checkoutConfig.payment.buckaroo.response;
+ response = $.parseJSON(response);
+ checkoutCommon.redirectHandle(response);
+ },
- return text.replace("%s", this.baseCurrencyCode);
- },
- });
+ selectPaymentMethod: function () {
+ selectPaymentMethodAction(this.getData());
+ checkoutData.setSelectedPaymentMethod(this.item.method);
+ return true;
+ },
+
+ getData: function () {
+ return {
+ method: this.item.method,
+ po_number: null,
+ additional_data: {
+ issuer: this.selectedBank(),
+ },
+ };
+ },
+
+ payWithBaseCurrency: function () {
+ var allowedCurrencies =
+ window.checkoutConfig.payment.buckaroo.paybybank.allowedCurrencies;
+
+ return allowedCurrencies.indexOf(this.currencyCode) < 0;
+ },
+
+ getPayWithBaseCurrencyText: function () {
+ var text = $.mage.__("The transaction will be processed using %s.");
+
+ return text.replace("%s", this.baseCurrencyCode);
+ },
+ });
});
diff --git a/view/frontend/web/js/view/payment/method-renderer/payperemail.js b/view/frontend/web/js/view/payment/method-renderer/payperemail.js
index 88b4cee98..14d9e2e40 100644
--- a/view/frontend/web/js/view/payment/method-renderer/payperemail.js
+++ b/view/frontend/web/js/view/payment/method-renderer/payperemail.js
@@ -84,7 +84,7 @@ define(
]
);
quote.billingAddress.subscribe(function (address) {
- if(address !== null) {
+ if (address !== null) {
this.firstName(address.firstname || '');
this.lastName(address.lastname || '');
this.middleName(address.middlename || '');
@@ -108,7 +108,7 @@ define(
);
}
- if(quote.guestEmail) {
+ if (quote.guestEmail) {
this.email(quote.guestEmail);
this.updateState(
'buckaroo_magento2_payperemail_Email',
@@ -126,12 +126,12 @@ define(
"buckaroo_magento2_payperemail_BillingLastName",
"buckaroo_magento2_payperemail_Email"
].map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
diff --git a/view/frontend/web/js/view/payment/method-renderer/sepadirectdebit.js b/view/frontend/web/js/view/payment/method-renderer/sepadirectdebit.js
index 427f65918..0bf48dda0 100644
--- a/view/frontend/web/js/view/payment/method-renderer/sepadirectdebit.js
+++ b/view/frontend/web/js/view/payment/method-renderer/sepadirectdebit.js
@@ -148,12 +148,12 @@ define(
function () {
const state = this.validationState();
const valid =this.getActiveFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -171,7 +171,7 @@ define(
'bankaccountholder',
'bankaccountnumber',
];
- if(!this.isnl()) {
+ if (!this.isnl()) {
fields.push('bicnumber');
}
return fields;
diff --git a/view/frontend/web/js/view/payment/method-renderer/tinka.js b/view/frontend/web/js/view/payment/method-renderer/tinka.js
index 5c35c4b67..3e658f3de 100644
--- a/view/frontend/web/js/view/payment/method-renderer/tinka.js
+++ b/view/frontend/web/js/view/payment/method-renderer/tinka.js
@@ -56,15 +56,16 @@ define(
value.substr(6, 4),
value.substr(3, 2) - 1,
value.substr(0, 2),
- 0, 0, 0
+ 0,
+ 0,
+ 0
);
return ~~((Date.now() - birthday) / (31557600000)) >= 18;
}
}
return false;
},
- $.mage.__('You should be at least 18 years old.')
- );
+ $.mage.__('You should be at least 18 years old.'));
return Component.extend(
{
@@ -110,8 +111,8 @@ define(
);
this.activeAddress = ko.computed(
- function() {
- if(quote.billingAddress()) {
+ function () {
+ if (quote.billingAddress()) {
return quote.billingAddress();
}
return quote.shippingAddress();
@@ -119,7 +120,7 @@ define(
);
this.country = ko.computed(
- function() {
+ function () {
return this.activeAddress().countryId;
},
this
@@ -152,12 +153,12 @@ define(
function () {
const state = this.validationState();
const valid = this.getActiveValidationFields().map((field) => {
- if(state[field] !== undefined) {
+ if (state[field] !== undefined) {
return state[field];
}
return false;
}).reduce(
- function(prev, cur) {
+ function (prev, cur) {
return prev && cur
},
true
@@ -167,13 +168,13 @@ define(
this
);
- this.dateValidate.subscribe(function() {
+ this.dateValidate.subscribe(function () {
const dobId = 'buckaroo_magento2_tinka_DoB';
const isValid = $(`#${dobId}`).valid();
let state = this.validationState();
state[dobId] = isValid;
this.validationState(state);
- }, this);
+ }, this);
return this;
},
@@ -188,11 +189,11 @@ define(
getActiveValidationFields() {
let fields = [];
- if(this.showPhone()) {
+ if (this.showPhone()) {
fields.push('buckaroo_magento2_tinka_Telephone')
}
- if(this.showNLBEFields()) {
+ if (this.showNLBEFields()) {
fields.push('buckaroo_magento2_tinka_DoB')
}
return fields;
diff --git a/view/frontend/web/js/view/payment/method-renderer/voucher.js b/view/frontend/web/js/view/payment/method-renderer/voucher.js
index 33c295855..88458f552 100644
--- a/view/frontend/web/js/view/payment/method-renderer/voucher.js
+++ b/view/frontend/web/js/view/payment/method-renderer/voucher.js
@@ -161,7 +161,7 @@ define(
}
}
- );
+ );
}
);
diff --git a/view/frontend/web/js/view/payment/save-payment.js b/view/frontend/web/js/view/payment/save-payment.js
index 46cd7f31e..910643b83 100644
--- a/view/frontend/web/js/view/payment/save-payment.js
+++ b/view/frontend/web/js/view/payment/save-payment.js
@@ -39,7 +39,7 @@ define(
if (messagesComponent && messagesComponent.cookieMessages) {
messagesComponent.cookieMessages.forEach(function (message) {
if (message.type == 'error') {
- messageList.addErrorMessage({message: $.mage.__($("").html(message.text).text())});
+ messageList.addErrorMessage({message: $.mage.__($("").html(message.text).text())});
}
});
}