woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 16:24:33 +08:00
Code Issues Projects Packages Wiki Activity Actions

Use the same errorHandler

Browse source 
Otherwise old messages may get stuck
This commit is contained in:
Alex P 2022-10-27 09:09:45 +03:00
parent 3926ae2d96
commit 9020c9b797
6 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/ppcp-button/resources/js/button.js
View file

@ -100,7 +100,8 @@ const bootstrap = () => {
if (PayPalCommerceGateway.mini_cart_buttons_enabled === '1') { if (PayPalCommerceGateway.mini_cart_buttons_enabled === '1') {
const miniCartBootstrap = new MiniCartBootstap( const miniCartBootstrap = new MiniCartBootstap(
PayPalCommerceGateway, PayPalCommerceGateway,
renderer renderer,
errorHandler,
); );
miniCartBootstrap.init(); miniCartBootstrap.init();
@ -112,6 +113,7 @@ const bootstrap = () => {
PayPalCommerceGateway, PayPalCommerceGateway,
renderer, renderer,
messageRenderer, messageRenderer,
errorHandler,
); );
singleProductBootstrap.init(); singleProductBootstrap.init();
@ -121,6 +123,7 @@ const bootstrap = () => {
const cartBootstrap = new CartBootstrap( const cartBootstrap = new CartBootstrap(
PayPalCommerceGateway, PayPalCommerceGateway,
renderer, renderer,
errorHandler,
); );
cartBootstrap.init(); cartBootstrap.init();
@ -131,7 +134,8 @@ const bootstrap = () => {
PayPalCommerceGateway, PayPalCommerceGateway,
renderer, renderer,
messageRenderer, messageRenderer,
spinner spinner,
errorHandler,
); );
checkoutBootstap.init(); checkoutBootstap.init();
@ -142,7 +146,8 @@ const bootstrap = () => {
PayPalCommerceGateway, PayPalCommerceGateway,
renderer, renderer,
messageRenderer, messageRenderer,
spinner spinner,
errorHandler,
); );
payNowBootstrap.init(); payNowBootstrap.init();
} }

5
modules/ppcp-button/resources/js/modules/ContextBootstrap/CartBootstap.js
View file

@ -2,9 +2,10 @@ import CartActionHandler from '../ActionHandler/CartActionHandler';
import ErrorHandler from '../ErrorHandler'; import ErrorHandler from '../ErrorHandler';
class CartBootstrap { class CartBootstrap {
constructor(gateway, renderer) { constructor(gateway, renderer, errorHandler) {
this.gateway = gateway; this.gateway = gateway;
this.renderer = renderer; this.renderer = renderer;
this.errorHandler = errorHandler;
} }
init() { init() {
@ -28,7 +29,7 @@ class CartBootstrap {
render() { render() {
const actionHandler = new CartActionHandler( const actionHandler = new CartActionHandler(
PayPalCommerceGateway, PayPalCommerceGateway,
new ErrorHandler(this.gateway.labels.error.generic), this.errorHandler,
); );
this.renderer.render( this.renderer.render(

5
modules/ppcp-button/resources/js/modules/ContextBootstrap/CheckoutBootstap.js
View file

@ -8,11 +8,12 @@ import {
} from "../Helper/CheckoutMethodState"; } from "../Helper/CheckoutMethodState";
class CheckoutBootstap { class CheckoutBootstap {
constructor(gateway, renderer, messages, spinner) { constructor(gateway, renderer, messages, spinner, errorHandler) {
this.gateway = gateway; this.gateway = gateway;
this.renderer = renderer; this.renderer = renderer;
this.messages = messages; this.messages = messages;
this.spinner = spinner; this.spinner = spinner;
this.errorHandler = errorHandler;
this.standardOrderButtonSelector = ORDER_BUTTON_SELECTOR; this.standardOrderButtonSelector = ORDER_BUTTON_SELECTOR;
} }
@ -60,7 +61,7 @@ class CheckoutBootstap {
} }
const actionHandler = new CheckoutActionHandler( const actionHandler = new CheckoutActionHandler(
PayPalCommerceGateway, PayPalCommerceGateway,
new ErrorHandler(this.gateway.labels.error.generic), this.errorHandler,
this.spinner this.spinner
); );

5
modules/ppcp-button/resources/js/modules/ContextBootstrap/MiniCartBootstap.js
View file

@ -2,9 +2,10 @@ import ErrorHandler from '../ErrorHandler';
import CartActionHandler from '../ActionHandler/CartActionHandler'; import CartActionHandler from '../ActionHandler/CartActionHandler';
class MiniCartBootstap { class MiniCartBootstap {
constructor(gateway, renderer) { constructor(gateway, renderer, errorHandler) {
this.gateway = gateway; this.gateway = gateway;
this.renderer = renderer; this.renderer = renderer;
this.errorHandler = errorHandler;
this.actionHandler = null; this.actionHandler = null;
} }
@ -12,7 +13,7 @@ class MiniCartBootstap {
this.actionHandler = new CartActionHandler( this.actionHandler = new CartActionHandler(
PayPalCommerceGateway, PayPalCommerceGateway,
new ErrorHandler(this.gateway.labels.error.generic), this.errorHandler,
); );
this.render(); this.render();

4
modules/ppcp-button/resources/js/modules/ContextBootstrap/PayNowBootstrap.js
View file

@ -2,8 +2,8 @@ import CheckoutBootstap from './CheckoutBootstap'
import {isChangePaymentPage} from "../Helper/Subscriptions"; import {isChangePaymentPage} from "../Helper/Subscriptions";
class PayNowBootstrap extends CheckoutBootstap { class PayNowBootstrap extends CheckoutBootstap {
constructor(gateway, renderer, messages, spinner) { constructor(gateway, renderer, messages, spinner, errorHandler) {
super(gateway, renderer, messages, spinner) super(gateway, renderer, messages, spinner, errorHandler)
} }
updateUi() { updateUi() {

5
modules/ppcp-button/resources/js/modules/ContextBootstrap/SingleProductBootstap.js
View file

@ -3,10 +3,11 @@ import UpdateCart from "../Helper/UpdateCart";
import SingleProductActionHandler from "../ActionHandler/SingleProductActionHandler"; import SingleProductActionHandler from "../ActionHandler/SingleProductActionHandler";
class SingleProductBootstap { class SingleProductBootstap {
constructor(gateway, renderer, messages) { constructor(gateway, renderer, messages, errorHandler) {
this.gateway = gateway; this.gateway = gateway;
this.renderer = renderer; this.renderer = renderer;
this.messages = messages; this.messages = messages;
this.errorHandler = errorHandler;
} }
@ -81,7 +82,7 @@ class SingleProductBootstap {
this.messages.hideMessages(); this.messages.hideMessages();
}, },
document.querySelector('form.cart'), document.querySelector('form.cart'),
new ErrorHandler(this.gateway.labels.error.generic), this.errorHandler,
); );
this.renderer.render( this.renderer.render(