Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Always show the Enable the shipping calculator on the cart page option in WC Admin #11421

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Always show the Enable the shipping calculator on the cart page option in WC Admin #11421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
044efda
Always show `Enable the shipping calculator ...`
tarhi-saad Oct 23, 2023
71c5ea8
Update remove_shipping_settings docblock to accurately describe its p…
mikejolley Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 2 additions & 42 deletions src/Shipping/ShippingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,52 +171,12 @@ public function show_local_pickup_details( $return, $order ) {
}

/**
* If the Checkout block Remove shipping settings from WC Core's admin panels that are now block settings.
* When using the cart and checkout blocks this method is used to adjust core shipping settings via a filter hook.
*
* @param array $settings The default WC shipping settings.
* @return array|mixed The filtered settings with relevant items removed.
* @return array|mixed The filtered settings.
*/
public function remove_shipping_settings( $settings ) {

// Do not add the shipping calculator setting if the Cart block is not used on the WC cart page.
if ( CartCheckoutUtils::is_cart_block_default() ) {

// Ensure the 'Calculations' title is added to the `woocommerce_shipping_cost_requires_address` options
// group, since it is attached to the `woocommerce_enable_shipping_calc` option that gets removed if the
// Cart block is in use.
$calculations_title = '';

// Get Calculations title so we can add it to 'Hide shipping costs until an address is entered' option.
foreach ( $settings as $setting ) {
if ( 'woocommerce_enable_shipping_calc' === $setting['id'] ) {
$calculations_title = $setting['title'];
break;
}
}

// Add Calculations title to 'Hide shipping costs until an address is entered' option.
foreach ( $settings as $index => $setting ) {
if ( 'woocommerce_shipping_cost_requires_address' === $setting['id'] ) {
$settings[ $index ]['title'] = $calculations_title;
$settings[ $index ]['checkboxgroup'] = 'start';
break;
}
}

$settings = array_filter(
$settings,
function( $setting ) {
return ! in_array(
$setting['id'],
array(
'woocommerce_enable_shipping_calc',
),
true
);
}
);
}

if ( CartCheckoutUtils::is_checkout_block_default() && $this->local_pickup_enabled ) {
foreach ( $settings as $index => $setting ) {
if ( 'woocommerce_shipping_cost_requires_address' === $setting['id'] ) {
Expand Down
Loading