Changeset 2940448

Timestamp:

07/19/2023 03:36:24 PM (3 years ago)

Author:

wppunk

Message:

Release 1.5.6

Location:

shipping-nova-poshta-for-woocommerce/trunk

Files:

• readme.txt (modified) (2 diffs)
• shipping-nova-poshta-for-woocommerce.php (modified) (5 diffs)
• src/Api/Api.php (modified) (2 diffs)
• src/Education/WooCommerce/Payments/Gateways/COD.php (modified) (1 diff)
• src/Education/WooCommerce/Shipping/Methods/Courier/Courier.php (modified) (1 diff)

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

@@ -4 +4 @@
 Requires at least: 5.8
 Tested up to: 6.2
-Stable tag: 1.5.5
+Stable tag: 1.5.6
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -85 +85 @@
 == Changelog ==
 
+= 1.5.6 =
+* Improved cache for multilanguage sites
+* Added compatibility with WooCommerce 7.9
+
 = 1.5.5 =
 * Improved search by cities

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.5
+ * Version: 1.5.6
  * Author: WP Unit
  * Author URI: http://wp-unit.com/
@@ -18 +18 @@
  * Requires PHP: 7.0
  * WC requires at least: 4.6
- * WC tested up to: 7.7
+ * WC tested up to: 7.9
  */
 
@@ -38 +38 @@
 }
 
+if ( defined( 'NOVA_POSHTA_PRO' ) ) {
+    add_action(
+        'admin_init',
+        static function () {
+
+            deactivate_plugins( plugin_basename( __FILE__ ) );
+        }
+    );
+}
+
 if ( ! function_exists( 'nova_poshta_load' ) ) {
     /**
@@ -52 +62 @@
 
         // Check WooCommerce version.
-        if ( ! function_exists( 'WC' ) || version_compare( WC()->version, '3.3', '<' ) ) {
+        if ( ! function_exists( 'WC' ) || version_compare( WC()->version, '4.9', '<' ) ) {
             $message = esc_html__( 'The Shipping for Nova Poshta plugin has been deactivated. Our plugin extends the WooCommerce plugin, but this plugin doesn\'t active.', 'shipping-nova-poshta-for-woocommerce' );
         }
@@ -66 +76 @@
             add_action(
                 'admin_init',
-                function () {
+                static function () {
 
                     deactivate_plugins( plugin_basename( __FILE__ ) );

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

@@ -176 +176 @@
 
         $cache      = $this->factory_cache->transient();
-        $warehouses = $cache->get( 'warehouse-' . $city_id );
+        $lang       = 'ru' === $this->language->get_current_language() ? 'ru' : 'ua';
+        $cache_key  = 'warehouse-' . $lang . '-' . $city_id;
+        $warehouses = $cache->get( $cache_key );
 
         if ( $warehouses ) {
@@ -193 +195 @@
         $this->db->update_warehouses( $warehouses );
 
-        $field_name = 'ru' === $this->language->get_current_language() ? 'DescriptionRu' : 'Description';
+        $field_name = 'ru' === $lang ? 'DescriptionRu' : 'Description';
         $warehouses = wp_list_pluck( $warehouses, $field_name, 'Ref' );
-        $cache->set( 'warehouse-' . $city_id, $warehouses, constant( 'DAY_IN_SECONDS' ) );
+        $cache->set( $cache_key, $warehouses, constant( 'DAY_IN_SECONDS' ) );
 
         return $warehouses;

shipping-nova-poshta-for-woocommerce/trunk/src/Education/WooCommerce/Payments/Gateways/COD.php

@@ -49 +49 @@
      * @var array
      */
-    protected $enable_for_methods;
+    public $enable_for_methods;
 
     /**

shipping-nova-poshta-for-woocommerce/trunk/src/Education/WooCommerce/Shipping/Methods/Courier/Courier.php

@@ -78 +78 @@
         $this->method_title       = esc_html__( 'Nova Poshta Courier Delivery (for Pro)', 'shipping-nova-poshta-for-woocommerce' );
         $this->method_description = esc_html__( 'Allow your customers to deliver your products right to their door. Your customer needs to choose a city and fill in the address. Also, you can gift customers free delivery if their cart more than any exact price.', 'shipping-nova-poshta-for-woocommerce' );
+        $this->label              = esc_html__( 'Fill the delivery address', 'shipping-nova-poshta-for-woocommerce' );
         $this->enabled            = 'no';
         $this->supports           = [