WordPress.org
Get WordPress

Plugin Directory

Changeset 3301505


Ignore:
Timestamp:
05/27/2025 12:50:16 PM (10 months ago)
Author:
fantasyworld
Message:

update 3.5.8

Location:
ry-woocommerce-tools/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • ry-woocommerce-tools/trunk/includes/update.php

    r3296081 r3301505  
    112112        }
    113113
    114         if (version_compare($now_version, '3.5.7', '<')) {
    115             RY_WT::update_option('version', '3.5.7', true);
     114        if (version_compare($now_version, '3.5.8', '<')) {
     115            RY_WT::update_option('version', '3.5.8', true);
    116116        }
    117117    }

  • ry-woocommerce-tools/trunk/languages/ry-woocommerce-tools.pot

    r3294501 r3301505  
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: RY Tools for WooCommerce 3.5.6\n"
     5"Project-Id-Version: RY Tools for WooCommerce 3.5.8\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ry-woocommerce-tools\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2025-05-16T10:55:31+08:00\n"
     12"POT-Creation-Date: 2025-05-27T20:37:21+08:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1414"X-Generator: WP-CLI 2.11.0\n"
    … …  
    17691769
    17701770#. translators: 1: ECPay ID 2: Old status mag 3: Old status no 4: New status mag 5: New status no
    1771 #: woocommerce/shipping/ecpay/includes/shipping-response.php:151
     1771#: woocommerce/shipping/ecpay/includes/shipping-response.php:150
    17721772msgid "%1$s shipping status from %2$s(%3$d) to %4$s(%5$d)"
    17731773msgstr ""
    … …  
    17971797msgstr ""
    17981798
    1799 #: woocommerce/shipping/ecpay/shipping.php:266
    18001799#: woocommerce/shipping/ecpay/shipping.php:268
     1800#: woocommerce/shipping/ecpay/shipping.php:270
    18011801msgid "No convenience store has been chosen."
    18021802msgstr ""

  • ry-woocommerce-tools/trunk/readme.txt

    r3296081 r3301505  
    66Requires PHP: 8.0
    77Tested up to: 6.8
    8 Stable tag: 3.5.7
     8Stable tag: 3.5.8
    99License: GPLv3
    1010License URI: https://www.gnu.org/licenses/gpl-3.0.txt
    … …  
    4141== Changelog ==
    4242
     43= 3.5.8 - 2025-05-27 =
     44* 調整 - 調整綠界物流超商記憶資訊的刪除邏輯。
     45
    4346= 3.5.7 - 2025-05-19 =
    4447* 修正 - 列印託運單的時候可能發生訂單編號辨識錯誤的問題。

  • ry-woocommerce-tools/trunk/ry-woocommerce-tools.php

    r3296081 r3301505  
    55 * Plugin URI: https://ry-plugin.com/ry-woocommerce-tools
    66 * Description: WooCommerce paymet and shipping tools
    7  * Version: 3.5.7
     7 * Version: 3.5.8
    88 * Requires at least: 6.6
    99 * Requires PHP: 8.0
    … …  
    2222function_exists('plugin_dir_url') or exit('No direct script access allowed');
    2323
    24 define('RY_WT_VERSION', '3.5.7');
     24define('RY_WT_VERSION', '3.5.8');
    2525define('RY_WT_PLUGIN_URL', plugin_dir_url(__FILE__));
    2626define('RY_WT_PLUGIN_DIR', plugin_dir_path(__FILE__));

  • ry-woocommerce-tools/trunk/woocommerce/abstracts/abstract-wc-shipping-method.php

    r3195729 r3301505  
    9393
    9494        if ($this->cost_offisland > 0) {
    95             $cvs_info = (array) WC()->session->get('ry-ecpay-cvs-info', []);
     95            $cvs_info = (array) WC()->session->get('ry_ecpay_cvs_info', []);
    9696            if (isset($cvs_info['CVSOutSide']) && $cvs_info['CVSOutSide']) {
    9797                $rate['cost'] += $this->cost_offisland;

  • ry-woocommerce-tools/trunk/woocommerce/shipping/ecpay/includes/shipping-method.php

    r3145248 r3301505  
    3232        }
    3333
    34         $cvs_info = (array) WC()->session->get('ry-ecpay-cvs-info', []);
    35         if (isset($cvs_info['shipping_methods']) && $cvs_info['shipping_methods'] === WC()->session->get('chosen_shipping_methods')) {
     34        $cvs_info = (array) WC()->session->get('ry_ecpay_cvs_info', []);
     35        if (($cvs_info['shipping_methods'] ?? '') === WC()->session->get('chosen_shipping_methods')) {
    3636            $rate['meta_data']['LogisticsInfo'] = $cvs_info;
    3737        }

  • ry-woocommerce-tools/trunk/woocommerce/shipping/ecpay/includes/shipping-response.php

    r3294501 r3301505  
    1717    protected function do_init(): void
    1818    {
    19         if ('ry-ecpay-map-redirect' === ($_GET['ry-ecpay-map-redirect'] ?? '')) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended , WordPress.Security.ValidatedSanitizedInput.MissingUnslash , WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
    20             do_action('woocommerce_api_ry_ecpay_map_callback');
    21             $this->map_redirect();
    22         }
    23 
    2419        add_action('woocommerce_api_request', [$this, 'set_do_die']);
    2520        add_action('woocommerce_api_ry_ecpay_map_callback', [$this, 'map_redirect']);
    2621        add_action('woocommerce_api_ry_ecpay_shipping_callback', [$this, 'check_shipping_callback']);
    2722        add_action('valid_ecpay_shipping_request', [$this, 'shipping_callback']);
     23
     24        if ('ry-ecpay-map-redirect' === ($_GET['ry-ecpay-map-redirect'] ?? '')) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended , WordPress.Security.ValidatedSanitizedInput.MissingUnslash , WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
     25            do_action('woocommerce_api_ry_ecpay_map_callback');
     26        }
    2827
    2928        if ('yes' === RY_WT::get_option('ecpay_shipping_auto_order_status', 'yes')) {

  • ry-woocommerce-tools/trunk/woocommerce/shipping/ecpay/shipping.php

    r3294501 r3301505  
    137137            $item->delete_meta_data('LogisticsInfo');
    138138        }
     139        WC()->session->set('ry_ecpay_cvs_info', []);
    139140    }
    140141
    … …  
    182183            $chosen_shipping = array_shift($chosen_shipping);
    183184            if (str_contains($chosen_shipping, '_cvs')) {
     185                $cvs_info = (array) WC()->session->get('ry_ecpay_cvs_info', []);
     186                if (($cvs_info['shipping_methods'] ?? '') !== WC()->session->get('chosen_shipping_methods')) {
     187                    WC()->session->set('ry_ecpay_cvs_info', []);
     188                }
     189
    184190                $this->js_data['ecpay_cvs'] = true;
    185191
    … …  
    224230                ];
    225231            } else {
     232                WC()->session->set('ry_ecpay_cvs_info', []);
    226233                $this->js_data['ecpay_home'] = true;
    227234            }
     235        } else {
     236            WC()->session->set('ry_ecpay_cvs_info', []);
    228237        }
    229238    }
    … …  
    238247                    WC()->session->set('shipping_for_package_' . $package_key, '');
    239248                }
    240                 WC()->session->set('ry-ecpay-cvs-info', $cvs_info);
     249                WC()->session->set('ry_ecpay_cvs_info', $cvs_info);
    241250            } else {
    242                 WC()->session->set('ry-ecpay-cvs-info', []);
     251                WC()->session->set('ry_ecpay_cvs_info', []);
    243252            }
    244253        }
    … …  
    248257    {
    249258        if (WC()->cart && WC()->cart->needs_shipping()) {
    250             $cvs_method = false;
    251259            $chosen_shipping = wc_get_chosen_shipping_method_ids();
    252260            $chosen_shipping = array_intersect($chosen_shipping, array_keys(self::$support_methods));
    … …  
    254262                $chosen_shipping = array_shift($chosen_shipping);
    255263                if (str_contains($chosen_shipping, '_cvs')) {
    256                     $cvs_method = true;
    257                 }
    258             }
    259 
    260             if ($cvs_method) {
    261                 $csv_info = WC()->session->get('ry-ecpay-cvs-info', []);
    262 
    263                 if (!isset($csv_info['LogisticsSubType']) || !str_starts_with($csv_info['LogisticsSubType'], $chosen_shipping::Shipping_Sub_Type)) {
    264                     // 傳統結帳
    265                     if (is_array($data)) {
    266                         $errors->add('shipping', __('No convenience store has been chosen.', 'ry-woocommerce-tools'));
    267                     } else {
    268                         throw new RouteException('woocommerce_rest_checkout_missing_required_field', esc_html__('No convenience store has been chosen.', 'ry-woocommerce-tools'), 400);
     264                    $csv_info = (array) WC()->session->get('ry_ecpay_cvs_info', []);
     265
     266                    if (!str_starts_with(($csv_info['LogisticsSubType'] ?? ''), $chosen_shipping::Shipping_Sub_Type)) {
     267                        // 傳統結帳
     268                        if (is_array($data)) {
     269                            $errors->add('shipping', __('No convenience store has been chosen.', 'ry-woocommerce-tools'));
     270                        } else {
     271                            throw new RouteException('woocommerce_rest_checkout_missing_required_field', esc_html__('No convenience store has been chosen.', 'ry-woocommerce-tools'), 400);
     272                        }
    269273                    }
    270274                }
    … …  
    275279    public function get_cvs_info($value, $input)
    276280    {
    277         $cvs_info = (array) WC()->session->get('ry-ecpay-cvs-info', []);
    278         if (isset($cvs_info['shipping_methods']) && $cvs_info['shipping_methods'] === WC()->session->get('chosen_shipping_methods')) {
     281        $cvs_info = (array) WC()->session->get('ry_ecpay_cvs_info', []);
     282        if (($cvs_info['shipping_methods'] ?? '') === WC()->session->get('chosen_shipping_methods')) {
    279283            return $cvs_info[substr($input, 3)] ?? '';
    280284        }

  • ry-woocommerce-tools/trunk/woocommerce/shipping/smilepay/shipping.php

    r3217447 r3301505  
    7272            $chosen_shipping = array_intersect($chosen_shipping, array_keys(self::$support_methods));
    7373            if (count($chosen_shipping)) {
    74                 if (str_contains($chosen_shipping[0], '_cvs')) {
     74                $chosen_shipping = array_shift($chosen_shipping);
     75                if (str_contains($chosen_shipping, '_cvs')) {
    7576                    foreach ($_available_gateways as $key => $gateway) {
    7677                        if (str_starts_with($key, 'ry_smilepay_')) {
Note: See TracChangeset for help on using the changeset viewer.