Changeset 2915384

Timestamp:

05/21/2023 12:04:27 PM (3 years ago)

Author:

wppunk

Message:

Release 1.5.5

Location:

shipping-nova-poshta-for-woocommerce/trunk

Files:

• readme.txt (modified) (2 diffs)
• shipping-nova-poshta-for-woocommerce.php (modified) (2 diffs)
• src/Admin/SettingsPage.php (modified) (2 diffs)
• src/Api/Api.php (modified) (2 diffs)
• src/Api/Connection.php (modified) (3 diffs)
• src/DB.php (modified) (2 diffs)
• src/License/License.php (modified) (1 diff)
• src/WooCommerce/Shipping/Methods/NovaPoshta/NovaPoshta.php (modified) (3 diffs)

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

@@ -4 +4 @@
 Requires at least: 5.8
 Tested up to: 6.2
-Stable tag: 1.5.4.5
+Stable tag: 1.5.5
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -85 +85 @@
 == Changelog ==
 
+= 1.5.5 =
+* Improved search by cities
+* Added flat cost for the shipping method
+* Added compatibility with WooCommerce 7.7
+* Added compabitility with WordPress 6.2
+
 = 1.5.4.6 =
-* Added compatibility with WooCommerce Checkout Manager plugin.
+* Added compatibility with WooCommerce Checkout Manager plugin
 
 = 1.5.4.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.6
+ * Version: 1.5.5
  * 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.5
+ * WC tested up to: 7.7
  */
 

shipping-nova-poshta-for-woocommerce/trunk/src/Admin/SettingsPage.php

@@ -84 +84 @@
         add_action( 'shipping_nova_poshta_for_woocommerce_settings_page_sender_tab', [ $this, 'sender_tab' ] );
         add_action( 'shipping_nova_poshta_for_woocommerce_print_notice', [ $this, 'notices' ] );
+        add_action( 'shipping_nova_poshta_for_woocommerce_upgraded', [ $this, 'load_cities' ] );
     }
 
@@ -190 +191 @@
 
             if ( ! $this->api->validate( $value['api_key'] ) ) {
-                unset( $value['api_key'] );
-                unset( $old_value['api_key'] );
+                unset( $value['api_key'], $old_value['api_key'] );
             }
         }
 
         return array_replace( $old_value, $value );
+    }
+
+    /**
+     * Load cities on plugin upgraded.
+     */
+    public function load_cities() {
+
+        $object_cache    = $this->factory_cache->object();
+        $transient_cache = $this->factory_cache->transient();
+
+        $object_cache->flush();
+        $transient_cache->flush();
+
+        $this->api->cities();
     }
 

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

@@ -104 +104 @@
 
         if ( empty( $limit ) ) {
-            $limit = (int) apply_filters( 'shipping_nova_poshta_for_woocommerce_api_cities_limit', 10 );
+            $limit = (int) apply_filters( 'shipping_nova_poshta_for_woocommerce_api_cities_limit', 20 );
         }
 
@@ -212 +212 @@
 
         $city_id = $this->settings->city_id();
-        $key     = 'shipping_cost-from-' . $city_id . '-to-' . $recipient_city_id . '-' . $weight . '-' . $volume;
+        $key     = 'shipping_cost-from-' . $city_id . '-to-' . $recipient_city_id . '-' . $weight . '-' . implode( '-', $volume );
         $cache   = $this->factory_cache->object();
         $costs   = $cache->get( $key );

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

@@ -21 +21 @@
 use NovaPoshta\Api\V2\Entities\Sender;
 use NovaPoshta\Api\V2\Entities\Recipient;
-use NovaPoshta\Api\V2\CalculateShippingCost;
 
 /**
@@ -161 +160 @@
     private function get_current_date(): string {
 
-        $date = new DateTime( '', new DateTimeZone( 'Europe/Kiev' ) );
-
-        return $date->format( 'd.m.Y' );
+        return ( new DateTime( '', new DateTimeZone( 'Europe/Kiev' ) ) )->format( 'd.m.Y' );
     }
 
@@ -236 +233 @@
                     'FirstName'            => $this->validator->validate_name( $first_name ),
                     'LastName'             => $this->validator->validate_name( $last_name ),
-                    'MiddleName'           => 'Отчество', // phpcs:ignore Squiz.PHP.CommentedOutCode.Found
                     'Phone'                => $this->validator->validate_phone( $phone ),
                     'RecipientsPhone'      => $this->validator->validate_phone( $phone ),

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

@@ -120 +120 @@
         $field_name = 'description_' . $this->language->get_current_language();
         $sql        = 'SELECT * FROM ' . $this->cities_table;
+        $search     = str_replace( [ '`', 'ʼ', '"' ], '\'', $search );
+
         if ( $search ) {
             //phpcs:disable WordPress.DB.PreparedSQL.NotPrepared
@@ -131 +133 @@
             //phpcs:enable WordPress.DB.PreparedSQL.NotPrepared
         }
-        $sql .= ' ORDER BY LENGTH(`' . $field_name . '`), `' . $field_name . '`';
+        $sql .= $wpdb->remove_placeholder_escape(
+            $wpdb->prepare(
+                ' ORDER BY CASE
+                    WHEN description_ua LIKE %s THEN 1
+                    WHEN description_ru LIKE %s THEN 1
+                    WHEN description_ua LIKE %s THEN 2
+                    WHEN description_ru LIKE %s THEN 2
+                    WHEN description_ua LIKE %s THEN 4
+                    WHEN description_ru LIKE %s THEN 4
+                    ELSE 3
+                END',
+                $wpdb->esc_like( $search ),
+                $wpdb->esc_like( $search ),
+                $wpdb->esc_like( $search ) . '%',
+                $wpdb->esc_like( $search ) . '%',
+                '%' . $wpdb->esc_like( $search ),
+                '%' . $wpdb->esc_like( $search )
+            )
+        );
         if ( $limit ) {
             $sql .= $wpdb->prepare( ' LIMIT %d', $limit );

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

@@ -169 +169 @@
             );
 
+            do_action( 'shipping_nova_poshta_for_woocommerce_upgraded' );
+
             return;
         }

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

@@ -13 +13 @@
 namespace NovaPoshta\WooCommerce\Shipping\Methods\NovaPoshta;
 
+use WC_Eval_Math;
 use WC_Shipping_Method;
 
@@ -114 +115 @@
                 'default' => esc_html__( 'Nova Poshta delivery', 'shipping-nova-poshta-for-woocommerce' ),
             ],
+            'cost'                 => [
+                'title'             => esc_html__( 'Cost', 'shipping-nova-poshta-for-woocommerce' ),
+                'type'              => 'text',
+                'placeholder'       => '',
+                'description'       => __( 'Enter a cost (excl. tax) or sum, e.g. <code>10.00 * [qty]</code>.', 'woocommerce' ) . '<br/><br/>' . __( 'Use <code>[qty]</code> for the number of items, <br/><code>[cost]</code> for the total cost of items, and <code>[fee percent="10" min_fee="20" max_fee=""]</code> for percentage based fees.', 'woocommerce' ),
+                'default'           => '0',
+                'desc_tip'          => true,
+                'sanitize_callback' => [ $this, 'sanitize_cost' ],
+            ],
             'enable_free_shipping' => [
                 'title'    => esc_html__( 'Enable free shipping', 'shipping-nova-poshta-for-woocommerce' ),
@@ -144 +154 @@
     public function calculate_shipping( $package = [] ) {
 
-        // Register the rate.
-        $this->add_rate(
+        $args = [
+            'id'       => $this->id,
+            'label'    => $this->title,
+            'calc_tax' => 'per_item',
+            'cost'     => 0,
+        ];
+
+        $cost = $this->get_option( 'cost' );
+
+        if ( '' !== $cost ) {
+            $args['cost'] = $this->evaluate_cost(
+                $cost,
+                [
+                    'qty'  => $this->get_package_item_qty( $package ),
+                    'cost' => $package['contents_cost'],
+                ]
+            );
+        }
+
+        $this->add_rate( $args );
+    }
+
+    /**
+     * Evaluate a cost from a sum/string.
+     *
+     * @param  string $sum Sum of shipping.
+     * @param  array  $args Args, must contain `cost` and `qty` keys. Having `array()` as default is for back compat reasons.
+     * @return string
+     */
+    private function evaluate_cost( $sum, $args = [] ) {
+
+        // Add warning for subclasses.
+        if ( ! is_array( $args ) || ! array_key_exists( 'qty', $args ) || ! array_key_exists( 'cost', $args ) ) {
+            wc_doing_it_wrong( __FUNCTION__, '$args must contain `cost` and `qty` keys.', '4.0.1' );
+        }
+
+        include_once WC()->plugin_path() . '/includes/libraries/class-wc-eval-math.php';
+
+        // Allow 3rd parties to process shipping cost arguments.
+        $args           = (array) apply_filters( 'woocommerce_evaluate_shipping_cost_args', $args, $sum, $this );
+        $locale         = localeconv();
+        $decimals       = [
+            wc_get_price_decimal_separator(),
+            $locale['decimal_point'],
+            $locale['mon_decimal_point'],
+            ',',
+        ];
+        $this->fee_cost = $args['cost'];
+
+        // Expand shortcodes.
+        add_shortcode( 'fee', [ $this, 'fee' ] );
+
+        $sum = do_shortcode(
+            str_replace(
+                [
+                    '[qty]',
+                    '[cost]',
+                ],
+                [
+                    $args['qty'],
+                    $args['cost'],
+                ],
+                $sum
+            )
+        );
+
+        remove_shortcode( 'fee', [ $this, 'fee' ] );
+
+        // Remove whitespace from string.
+        $sum = preg_replace( '/\s+/', '', $sum );
+
+        // Remove locale from string.
+        $sum = str_replace( $decimals, '.', $sum );
+
+        // Trim invalid start/end characters.
+        $sum = rtrim( ltrim( $sum, "\t\n\r\0\x0B+*/" ), "\t\n\r\0\x0B+-*/" );
+
+        // Do the math.
+        return $sum ? WC_Eval_Math::evaluate( $sum ) : 0;
+    }
+
+    /**
+     * Get items in package.
+     *
+     * @param array $package Package of items from cart.
+     *
+     * @return int
+     */
+    private function get_package_item_qty( array $package ): int {
+
+        $total_quantity = 0;
+        foreach ( $package['contents'] as $item_id => $values ) {
+            if ( $values['quantity'] > 0 && $values['data']->needs_shipping() ) {
+                $total_quantity += $values['quantity'];
+            }
+        }
+
+        return $total_quantity;
+    }
+
+    /**
+     * Work out fee (shortcode).
+     *
+     * @param array $atts Attributes.
+     *
+     * @return string
+     */
+    public function fee( $atts ) {
+
+        $atts = shortcode_atts(
             [
-                'id'       => $this->id,
-                'label'    => $this->title,
-                'calc_tax' => 'per_item',
-                'cost'     => 0,
-            ]
+                'percent' => '',
+                'min_fee' => '',
+                'max_fee' => '',
+            ],
+            $atts,
+            'fee'
         );
+
+        $calculated_fee = 0;
+
+        if ( $atts['percent'] ) {
+            $calculated_fee = $this->fee_cost * ( floatval( $atts['percent'] ) / 100 );
+        }
+
+        if ( $atts['min_fee'] && $calculated_fee < $atts['min_fee'] ) {
+            $calculated_fee = $atts['min_fee'];
+        }
+
+        if ( $atts['max_fee'] && $calculated_fee > $atts['max_fee'] ) {
+            $calculated_fee = $atts['max_fee'];
+        }
+
+        return $calculated_fee;
     }