WordPress.org
Get WordPress

Plugin Directory

Changeset 3406673


Ignore:
Timestamp:
12/01/2025 10:15:31 AM (3 months ago)
Author:
shipany
Message:

release v1.1.91

Location:
shipany
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • shipany/tags/1.1.91/includes/abstract-shipany-wc-order.php

    r3400259 r3406673  
    627627        $order_id = '';
    628628        $wc_order = null;
    629         if($obj instanceof \Automattic\WooCommerce\Admin\Overrides\Order){
     629        if($obj instanceof WP_Post){
     630            $order_id = $obj->ID;
     631            $wc_order = wc_get_order($order_id);
     632        } else {
    630633            $order_id = $obj->get_id();
    631634            $wc_order = $obj;
    632         } else if($obj instanceof WP_Post){
    633             $order_id = $obj->ID;
    634             $wc_order = wc_get_order($order_id);
    635635        }
    636636        // Get saved label input fields or set default values

  • shipany/tags/1.1.91/pages/woocommerce-checkout.js

    r3329978 r3406673  
    99var useDispatch = window.wp.data.useDispatch;
    1010var wcBlocksData = window.wc.wcBlocksData;
     11var _createChangeLocationElement = undefined;
    1112
    1213if (typeof lang === 'undefined') {
    … …  
    2223// TODO: lock input field
    2324if (window.location.href.includes('checkout') || window.location.href.includes('cart')) {
    24     createChangeLocationElement = function () {
     25    _createChangeLocationElement = function () {
    2526        let defaultLabelName = __('Change address', 'shipany');
    2627        if (window?.shipany_setting?.shipany_enable_locker_list2_1) {
    … …  
    7071                });
    7172            }, []);
    72             return createElement(ExperimentalOrderShippingPackages, null, showLockerList ? createChangeLocationElement() : []);
     73            return createElement(ExperimentalOrderShippingPackages, null, showLockerList ? _createChangeLocationElement() : []);
    7374        },
    7475        scope: 'woocommerce-checkout',
    … …  
    103104                        }
    104105                        return createElement(ExperimentalOrderShippingPackages, null, [
    105                             createChangeLocationElement(),
     106                            _createChangeLocationElement(),
    106107                        ]);
    107108                    } else {

  • shipany/tags/1.1.91/readme.txt

    r3400259 r3406673  
    44Requires at least: 4.1
    55Tested up to: 6.8.3
    6 Stable tag: 1.1.90
     6Stable tag: 1.1.91
    77Requires PHP: 5.6
    88License: GPLv2 or later
    … …  
    7171== Changelog ==
    7272
     73= 1.1.91 =
     74- Fix High Performance Order Storage compatibility issue
     75- Locker listing page bug fix with other plugins
     76- Fix Cart page select locker list bug
     77
    7378= 1.1.90 =
    7479- Bug fix

  • shipany/tags/1.1.91/shipany-woocommerce.php

    r3400259 r3406673  
    77Plugin URI: http://wordpress.org/plugins/shipany
    88Description: ShipAny one-stop logistics platform interconnects WooCommerce to multiple logistics service providers (including SF Express, Kerry Express, SF Cold-Chain, Alfred Locker, Hongkong Post, SF Locker, Convenience Store, etc.) so merchants can enjoy full-set features of logistics automation which disrupt the manual logistics process and bring E-Commerce to new generation.
    9 Version: 1.1.90
     9Version: 1.1.91
    1010Author: ShipAny
    1111Author URI: https://www.shipany.io
    … …  
    591591 */
    592592function addClickAndCollectWidget($method, $index) {
    593     $chosen_methods = WC()->session->get('chosen_shipping_methods');
    594     $chosen_shipping = $chosen_methods[0];
    595 
    596     if (strpos($chosen_shipping, 'local_pickup') === 0 || strpos($method->get_id(), 'local_pickup') === 0) {
    597         include_once("pages/click-collect-widget.php");
    598     } else if(ShipanyHelper::get_settings('shipany_locker_list_selector') === 'yes'){
    599         include_once("pages/click-collect-widget.php");
     593    if ($index === 0) {
     594        $chosen_methods = WC()->session->get('chosen_shipping_methods');
     595        $chosen_shipping = $chosen_methods[0];
     596
     597        if (strpos($chosen_shipping, 'local_pickup') === 0 || strpos($method->get_id(), 'local_pickup') === 0) {
     598            include("pages/click-collect-widget.php");
     599        } else if(ShipanyHelper::get_settings('shipany_locker_list_selector') === 'yes'){
     600            include("pages/click-collect-widget.php");
     601        }
    600602    }
    601603}
    … …  
    647649    class SHIPANY_WC {
    648650        public static $list;
    649         private $version = "1.1.90";
     651        private $version = "1.1.91";
    650652
    651653        protected static $_instance = null;

  • shipany/trunk/includes/abstract-shipany-wc-order.php

    r3400259 r3406673  
    627627        $order_id = '';
    628628        $wc_order = null;
    629         if($obj instanceof \Automattic\WooCommerce\Admin\Overrides\Order){
     629        if($obj instanceof WP_Post){
     630            $order_id = $obj->ID;
     631            $wc_order = wc_get_order($order_id);
     632        } else {
    630633            $order_id = $obj->get_id();
    631634            $wc_order = $obj;
    632         } else if($obj instanceof WP_Post){
    633             $order_id = $obj->ID;
    634             $wc_order = wc_get_order($order_id);
    635635        }
    636636        // Get saved label input fields or set default values

  • shipany/trunk/pages/woocommerce-checkout.js

    r3329978 r3406673  
    99var useDispatch = window.wp.data.useDispatch;
    1010var wcBlocksData = window.wc.wcBlocksData;
     11var _createChangeLocationElement = undefined;
    1112
    1213if (typeof lang === 'undefined') {
    … …  
    2223// TODO: lock input field
    2324if (window.location.href.includes('checkout') || window.location.href.includes('cart')) {
    24     createChangeLocationElement = function () {
     25    _createChangeLocationElement = function () {
    2526        let defaultLabelName = __('Change address', 'shipany');
    2627        if (window?.shipany_setting?.shipany_enable_locker_list2_1) {
    … …  
    7071                });
    7172            }, []);
    72             return createElement(ExperimentalOrderShippingPackages, null, showLockerList ? createChangeLocationElement() : []);
     73            return createElement(ExperimentalOrderShippingPackages, null, showLockerList ? _createChangeLocationElement() : []);
    7374        },
    7475        scope: 'woocommerce-checkout',
    … …  
    103104                        }
    104105                        return createElement(ExperimentalOrderShippingPackages, null, [
    105                             createChangeLocationElement(),
     106                            _createChangeLocationElement(),
    106107                        ]);
    107108                    } else {

  • shipany/trunk/readme.txt

    r3400259 r3406673  
    44Requires at least: 4.1
    55Tested up to: 6.8.3
    6 Stable tag: 1.1.90
     6Stable tag: 1.1.91
    77Requires PHP: 5.6
    88License: GPLv2 or later
    … …  
    7171== Changelog ==
    7272
     73= 1.1.91 =
     74- Fix High Performance Order Storage compatibility issue
     75- Locker listing page bug fix with other plugins
     76- Fix Cart page select locker list bug
     77
    7378= 1.1.90 =
    7479- Bug fix

  • shipany/trunk/shipany-woocommerce.php

    r3400259 r3406673  
    77Plugin URI: http://wordpress.org/plugins/shipany
    88Description: ShipAny one-stop logistics platform interconnects WooCommerce to multiple logistics service providers (including SF Express, Kerry Express, SF Cold-Chain, Alfred Locker, Hongkong Post, SF Locker, Convenience Store, etc.) so merchants can enjoy full-set features of logistics automation which disrupt the manual logistics process and bring E-Commerce to new generation.
    9 Version: 1.1.90
     9Version: 1.1.91
    1010Author: ShipAny
    1111Author URI: https://www.shipany.io
    … …  
    591591 */
    592592function addClickAndCollectWidget($method, $index) {
    593     $chosen_methods = WC()->session->get('chosen_shipping_methods');
    594     $chosen_shipping = $chosen_methods[0];
    595 
    596     if (strpos($chosen_shipping, 'local_pickup') === 0 || strpos($method->get_id(), 'local_pickup') === 0) {
    597         include_once("pages/click-collect-widget.php");
    598     } else if(ShipanyHelper::get_settings('shipany_locker_list_selector') === 'yes'){
    599         include_once("pages/click-collect-widget.php");
     593    if ($index === 0) {
     594        $chosen_methods = WC()->session->get('chosen_shipping_methods');
     595        $chosen_shipping = $chosen_methods[0];
     596
     597        if (strpos($chosen_shipping, 'local_pickup') === 0 || strpos($method->get_id(), 'local_pickup') === 0) {
     598            include("pages/click-collect-widget.php");
     599        } else if(ShipanyHelper::get_settings('shipany_locker_list_selector') === 'yes'){
     600            include("pages/click-collect-widget.php");
     601        }
    600602    }
    601603}
    … …  
    647649    class SHIPANY_WC {
    648650        public static $list;
    649         private $version = "1.1.90";
     651        private $version = "1.1.91";
    650652
    651653        protected static $_instance = null;
Note: See TracChangeset for help on using the changeset viewer.