Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cod not accounting for global rate values (https://github.com/woocommerce/woocommerce-blocks/pull/2894)

This commit is contained in:
Darren Ethier 2020-07-21 15:57:21 -04:00 committed by GitHub
parent ebf3b6a61a
commit 21b7637ef5
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/woocommerce-blocks/assets/js/payment-method-extensions/payment-methods/cod/index.js
View File

@ -12,10 +12,7 @@ import { decodeEntities } from '@wordpress/html-entities';
import { PAYMENT_METHOD_NAME } from './constants';
const settings = getSetting( 'cod_data', {} );
const defaultLabel = __(
'Cash on delivery',
'woo-gutenberg-products-block'
);
const defaultLabel = __( 'Cash on delivery', 'woo-gutenberg-products-block' );
const label = decodeEntities( settings.title ) || defaultLabel;
/**
@ -57,16 +54,16 @@ const canMakePayment = ( { cartNeedsShipping, selectedShippingMethods } ) => {
return true;
}
// Look for an not-supported shipping method in the user's selected
// shipping methods. If one is found, then COD is not allowed.
const selectedNotSupported = Object.values( selectedShippingMethods ).some(
( shippingMethodId ) => {
return ! settings.enableForShippingMethods.includes(
shippingMethodId
);
}
);
return ! selectedNotSupported;
// Look for a supported shipping method in the user's selected
// shipping methods. If one is found, then COD is allowed.
const selectedMethods = Object.values( selectedShippingMethods );
// supported shipping methods might be global (eg. "Any flat rate"), hence
// this is doing a `String.prototype.includes` match vs a `Array.prototype.includes` match.
return settings.enableForShippingMethods.some( ( shippingMethodId ) => {
return selectedMethods.some( ( selectedMethod ) => {
return selectedMethod.includes( shippingMethodId );
} );
} );
};
/**
@ -82,4 +79,6 @@ const cashOnDeliveryPaymentMethod = {
ariaLabel: label,
};
registerPaymentMethod( ( Config ) => new Config( cashOnDeliveryPaymentMethod ) );
registerPaymentMethod(
( Config ) => new Config( cashOnDeliveryPaymentMethod )
);