We will be off from 27/1 (Monday) to 31/1 (Friday) (GMT +7) for our Tet Holiday (Lunar New Year) in our country

Commit 1b91df43 authored by Rik ter Beek's avatar Rik ter Beek

HPP use custom messageContainer

parent 4fccc01b
...@@ -34,8 +34,10 @@ define( ...@@ -34,8 +34,10 @@ define(
'Magento_Customer/js/model/customer', 'Magento_Customer/js/model/customer',
'Magento_Checkout/js/model/full-screen-loader', 'Magento_Checkout/js/model/full-screen-loader',
'Magento_Checkout/js/action/place-order', 'Magento_Checkout/js/action/place-order',
'uiLayout',
'Magento_Ui/js/model/messages'
], ],
function (ko, $, Component, selectPaymentMethodAction, quote, checkoutData, additionalValidators, storage, urlBuilder, adyenPaymentService, customer, fullScreenLoader, placeOrderAction) { function (ko, $, Component, selectPaymentMethodAction, quote, checkoutData, additionalValidators, storage, urlBuilder, adyenPaymentService, customer, fullScreenLoader, placeOrderAction, layout, Messages) {
'use strict'; 'use strict';
var brandCode = ko.observable(null); var brandCode = ko.observable(null);
var paymentMethod = ko.observable(null); var paymentMethod = ko.observable(null);
...@@ -132,6 +134,29 @@ define( ...@@ -132,6 +134,29 @@ define(
console.log(JSON.stringify(error)); console.log(JSON.stringify(error));
fullScreenLoader.stopLoader(); fullScreenLoader.stopLoader();
}); });
// create component needs to be in initialize method
var messageComponents = {};
var paymentMethods = adyenPaymentService.getAvailablePaymentMethods();
_.map(paymentMethods, function (value) {
var messageContainer = new Messages();
var name = 'messages-' + value.brandCode;
var messagesComponent = {
parent: self.name,
name: 'messages-' + value.brandCode,
displayArea: 'messages-' + value.brandCode,
component: 'Magento_Ui/js/view/messages',
config: {
messageContainer: messageContainer
}
};
layout([messagesComponent]);
messageComponents[name] = messageContainer;
});
this.messageComponents = messageComponents;
}, },
getAdyenHppPaymentMethods: function () { getAdyenHppPaymentMethods: function () {
var self = this; var self = this;
...@@ -286,11 +311,18 @@ define( ...@@ -286,11 +311,18 @@ define(
placeRedirectOrder: function(data) { placeRedirectOrder: function(data) {
// Place Order but use our own redirect url after // Place Order but use our own redirect url after
var self = this; var self = this;
var messageContainer = this.messageContainer;
if(brandCode()) {
messageContainer = self.messageComponents['messages-' + brandCode()];
}
this.isPlaceOrderActionAllowed(false); this.isPlaceOrderActionAllowed(false);
fullScreenLoader.startLoader(); fullScreenLoader.startLoader();
$.when( $.when(
placeOrderAction(data, this.messageContainer) placeOrderAction(data, messageContainer)
).fail( ).fail(
function () { function () {
self.isPlaceOrderActionAllowed(true); self.isPlaceOrderActionAllowed(true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment