Changeset 2885659

Timestamp:

03/23/2023 12:51:24 PM (3 years ago)

Author:

wppunk

Message:

Release 1.5.4.6

Location:

shipping-nova-poshta-for-woocommerce/trunk

Files:

• readme.txt (modified) (1 diff)
• shipping-nova-poshta-for-woocommerce.php (modified) (1 diff)
• src/Notice/Notice.php (modified) (1 diff)
• src/WooCommerce/Shipping/Methods/NovaPoshta/Fields.php (modified) (2 diffs)

shipping-nova-poshta-for-woocommerce/trunk/readme.txt

@@ -85 +85 @@
 == Changelog ==
 
+= 1.5.4.6 =
+* Added compatibility with WooCommerce Checkout Manager plugin.
+
 = 1.5.4.5 =
 * Fixed filds weren't loaded on the WooCommerce 7.5

shipping-nova-poshta-for-woocommerce/trunk/shipping-nova-poshta-for-woocommerce.php

@@ -6 +6 @@
  * Plugin URI:  http://wp-unit.com/
  * Description: Select a branch on the checkout page, the creation of electronic invoices, calculating shipping costs, COD payment, and much more ...
- * Version: 1.5.4.5
+ * Version: 1.5.4.6
  * Author: WP Unit
  * Author URI: http://wp-unit.com/

shipping-nova-poshta-for-woocommerce/trunk/src/Notice/Notice.php

@@ -107 +107 @@
         ];
 
-        $this->notices = array_unique( $this->notices );
+        $this->notices = array_unique( $this->notices, SORT_REGULAR );
     }
 

shipping-nova-poshta-for-woocommerce/trunk/src/WooCommerce/Shipping/Methods/NovaPoshta/Fields.php

@@ -174 +174 @@
 
         // phpcs:disable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
-        return [
+        $fields = [
             'shipping_nova_poshta_for_woocommerce_nonce'     => [
                 'type'    => 'hidden',
@@ -201 +201 @@
         ];
         // phpcs:enable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
+
+
+        // Compatibility with WooCommerce Checkout Manager plugin.
+        if ( ! empty( $city_id ) ) {
+            unset( $fields['shipping_nova_poshta_for_woocommerce_city']['placeholder'], $fields['shipping_nova_poshta_for_woocommerce_warehouse']['placeholder'] );
+        }
+
+        return $fields;
     }