Skip to content

Commit ad45bb2

Browse files
committed
Remove new setting and check if WooCommerce Shipping plugin is enabled.
1 parent fe536c6 commit ad45bb2

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

classes/class-wc-connect-shipping-label.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ private function calculate_should_show_meta_box( $post ) {
532532
* @return bool True if shipping label is enabled from the settings.
533533
*/
534534
public function is_shipping_label_enabled() {
535-
if ( get_option( 'wc_connect_disable_shipping' ) === 'yes' ) {
535+
if ( ! WC_Connect_Loader::is_wc_shipping_activated() ) {
536536
return false;
537537
}
538538

classes/class-wc-connect-taxjar-integration.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,6 @@ public function add_tax_settings( $tax_settings ) {
236236
// Insert the "automated taxes" setting at the top (under the section title)
237237
array_splice( $tax_settings, 1, 0, array( $automated_taxes ) );
238238

239-
// Insert Disable Legacy Shipping Features setting
240-
$disable_shipping_setting = array(
241-
'title' => __( 'Disable Legacy Shipping Features in WooCommerce Tax', 'woocommerce-services' ),
242-
'desc' => __( 'Enabling this option will turn off the shipping features on the Edit Order pages and will improve overall performance.', 'woocommerce-services' ),
243-
'id' => 'wc_connect_disable_shipping',
244-
'default' => 'no',
245-
'type' => 'checkbox',
246-
'desc_tip' => true,
247-
);
248-
array_splice( $tax_settings, 2, 0, array( $disable_shipping_setting ) );
249-
250239
if ( $enabled ) {
251240
// If the automated taxes are enabled, disable the settings that would be reverted in the original plugin
252241
foreach ( $tax_settings as $index => $tax_setting ) {

0 commit comments

Comments
 (0)