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

Onboarding: Create flat rate and free shipping methods from task list (https://github.com/woocommerce/woocommerce-admin/pull/3927) 

* Get flat rate and free shipping methods in Rates component

* Update shipping methods by type

* Disable all shipping methods except the one being updated

* Update toggleEnabled to be toggleable for readability

* Check if shipping method has cost before getting value
This commit is contained in:
Joshua T Flowers 2020-03-23 17:25:02 +02:00 committed by GitHub
parent cbf0405b95
commit 1db98a78d9
2 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-admin/client/dashboard/task-list/tasks/shipping/index.js
View File

@ -70,7 +70,7 @@ class Shipping extends Component {
path: `/wc/v3/shipping/zones/${ zone.id }/methods`,
} );
zone.name = __( 'Rest of the world', 'woocommerce-admin' );
zone.toggleEnabled = true;
zone.toggleable = true;
shippingZones.push( zone );
return;
}

110
plugins/woocommerce-admin/client/dashboard/task-list/tasks/shipping/rates.js
View File

@ -32,32 +32,22 @@ class ShippingRates extends Component {
this.updateShippingZones = this.updateShippingZones.bind( this );
}
async updateShippingZones( values ) {
const { createNotice, shippingZones } = this.props;
let restOfTheWorld = false;
let shippingCost = false;
shippingZones.forEach( zone => {
if ( zone.id === 0 ) {
restOfTheWorld =
zone.toggleEnabled && values[ `${ zone.id }_enabled` ];
} else {
shippingCost =
values[ `${ zone.id }_rate` ] !== '' &&
parseFloat( values[ `${ zone.id }_rate` ] ) !==
parseFloat( 0 );
getShippingMethods( zone, type = null ) {
if ( ! type ) {
return zone.methods;
}
const flatRateMethods = zone.methods
? zone.methods.filter(
( method ) => method.method_id === 'flat_rate'
)
return zone.methods
? zone.methods.filter( ( method ) => method.method_id === type )
: [];
}
if ( zone.toggleEnabled && ! values[ `${ zone.id }_enabled` ] ) {
// Disable any flat rate methods that exist if toggled off.
if ( flatRateMethods.length ) {
flatRateMethods.forEach( method => {
disableShippingMethods( zone, methods ) {
if ( ! methods.length ) {
return;
}
methods.forEach( ( method ) => {
apiFetch( {
method: 'POST',
path: `/wc/v3/shipping/zones/${ zone.id }/methods/${ method.instance_id }`,
@ -67,30 +57,58 @@ class ShippingRates extends Component {
} );
} );
}
return;
async updateShippingZones( values ) {
const { createNotice, shippingZones } = this.props;
let restOfTheWorld = false;
let shippingCost = false;
shippingZones.forEach( ( zone ) => {
if ( zone.id === 0 ) {
restOfTheWorld =
zone.toggleable && values[ `${ zone.id }_enabled` ];
} else {
shippingCost =
values[ `${ zone.id }_rate` ] !== '' &&
parseFloat( values[ `${ zone.id }_rate` ] ) !==
parseFloat( 0 );
}
const shippingMethods = this.getShippingMethods( zone );
const methodType =
parseFloat( values[ `${ zone.id }_rate` ] ) === parseFloat( 0 )
? 'free_shipping'
: 'flat_rate';
const shippingMethod = this.getShippingMethods( zone, methodType )
.length
? this.getShippingMethods( zone, methodType )[ 0 ]
: null;
if ( zone.toggleable && ! values[ `${ zone.id }_enabled` ] ) {
// Disable any shipping methods that exist if toggled off.
this.disableShippingMethods( zone, shippingMethods );
return;
} else if ( shippingMethod ) {
// Disable all methods except the one being updated.
const methodsToDisable = shippingMethods.filter(
( method ) =>
method.instance_id !== shippingMethod.instance_id
);
this.disableShippingMethods( zone, methodsToDisable );
}
if ( flatRateMethods.length ) {
// Update the existing method.
apiFetch( {
method: 'POST',
path: `/wc/v3/shipping/zones/${ zone.id }/methods/${ flatRateMethods[ 0 ].instance_id }`,
path: shippingMethod
? // Update the first existing method if one exists, otherwise create a new one.
`/wc/v3/shipping/zones/${ zone.id }/methods/${ shippingMethod.instance_id }`
: `/wc/v3/shipping/zones/${ zone.id }/methods`,
data: {
method_id: methodType,
enabled: true,
settings: { cost: values[ `${ zone.id }_rate` ] },
},
} );
} else {
// Add new method if one doesn't exist.
apiFetch( {
method: 'POST',
path: `/wc/v3/shipping/zones/${ zone.id }/methods`,
data: {
method_id: 'flat_rate',
settings: { cost: values[ `${ zone.id }_rate` ] },
},
} );
}
} );
recordEvent( 'tasklist_shipping_set_costs', {
@ -153,20 +171,16 @@ class ShippingRates extends Component {
const values = {};
this.props.shippingZones.forEach( ( zone ) => {
const flatRateMethods =
zone.methods && zone.methods.length
? zone.methods.filter(
( method ) => method.method_id === 'flat_rate'
)
: [];
const rate = flatRateMethods.length
const shippingMethods = this.getShippingMethods( zone );
const rate =
shippingMethods.length && shippingMethods[ 0 ].settings.cost
? this.getFormattedRate(
flatRateMethods[ 0 ].settings.cost.value
shippingMethods[ 0 ].settings.cost.value
)
: getCurrencyFormatString( 0 );
values[ `${ zone.id }_rate` ] = rate;
if ( flatRateMethods.length && flatRateMethods[ 0 ].enabled ) {
if ( shippingMethods.length && shippingMethods[ 0 ].enabled ) {
values[ `${ zone.id }_enabled` ] = true;
} else {
values[ `${ zone.id }_enabled` ] = false;
@ -248,7 +262,7 @@ class ShippingRates extends Component {
<div className="woocommerce-shipping-rate__main">
<div className="woocommerce-shipping-rate__name">
{ zone.name }
{ zone.toggleEnabled && (
{ zone.toggleable && (
<FormToggle
{ ...getInputProps(
`${ zone.id }_enabled`
@ -256,7 +270,7 @@ class ShippingRates extends Component {
/>
) }
</div>
{ ( ! zone.toggleEnabled ||
{ ( ! zone.toggleable ||
values[
`${ zone.id }_enabled`
] ) && (