Changeset 3043419

Timestamp:

03/01/2024 03:35:52 AM (2 years ago)

Author:

shipdepot

Message:

Update version 1.2.14 for switch classic checkout direction

Location:

ship-depot/trunk

Files:

• includes/Address/frontend/class-custom-checkout-fields.php (modified) (2 diffs)
• includes/Settings/class-ship-depot-classic-checkout-direction.php (added)
• includes/Settings/class-ship-depot-settings-backend.php (modified) (2 diffs)
• includes/Settings/class-ship-depot-settings-init.php (modified) (1 diff)
• includes/class-ship-depot-general.php (modified) (2 diffs)
• page/admin/settings/sd-classic-checkout-direction.php (added)
• page/frontend/sd-checkout-page.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• src/class_checkout_direction.mp4 (added)

ship-depot/trunk/includes/Address/frontend/class-custom-checkout-fields.php

@@ -98 +98 @@
         {
             //Ship_Depot_Logger::wrlog('[sd_woocommerce_default_address_fields] fields: ' . print_r($fields, true));
+            if (!Ship_Depot_Address_Helper::can_shipping_vietnam()) {
+                Ship_Depot_Logger::wrlog('[sd_woocommerce_default_address_fields] This page is not support shipping to Vietnam.');
+                return $fields;
+            }
+
             unset($fields['company']);
             unset($fields['postcode']);
             unset($fields['state']);
             unset($fields['address_2']);
-            if (!Ship_Depot_Address_Helper::can_shipping_vietnam()) return $fields;
             $fields['first_name']['label'] = esc_html__('Tên', 'ship-depot-translate');
 
@@ -135 +139 @@
     new Ship_Depot_Custom_fields();
 }
+
+
+// add_filter('__experimental_woocommerce_blocks_register_checkout_field', 'custom_register_checkout_field');
+
+// function custom_register_checkout_field($fields)
+// {
+//     // Replace 'custom_field' with your desired field name
+//     $fields['gov-id'] = array(
+//         'label'         => 'Government ID',
+//         'optionalLabel' => 'Government ID (optional)',
+//         'location'      => 'address',
+//         'required'      => true,
+//         'attributes'    => array(
+//             'autocomplete'     => 'government-id',
+//             'aria-describedby' => 'some-element',
+//             'aria-label'       => 'custom aria label',
+//             'pattern'          => '[A-Z0-9]{5}', // A 5-character string of capital letters and numbers.
+//             'title'            => 'Title to show on hover',
+//             'data-custom'      => 'custom data',
+//         ),
+//     );
+
+//     return $fields;
+// }

ship-depot/trunk/includes/Settings/class-ship-depot-settings-backend.php

@@ -73 +73 @@
                 //Tạm đóng chức năng này
                 // 'custom_css' => __('Thay đổi CSS', 'ship-depot-translate'),
-                'about' => __('Giới thiệu & Trợ giúp', 'ship-depot-translate')
+                'about' => __('Giới thiệu & Trợ giúp', 'ship-depot-translate'),
+                'classic_checkout_direction' => __('Hướng dẫn trở về Classic Checkout', 'ship-depot-translate')
             );
 
@@ -127 +128 @@
                         case 'about':
                             do_action('sd_about_section');
+                            break;
+                        case 'classic_checkout_direction':
+                            do_action('sd_classic_checkout_direction_section');
                             break;
                     }

ship-depot/trunk/includes/Settings/class-ship-depot-settings-init.php

@@ -14 +14 @@
         require_once SHIP_DEPOT_DIR_PATH . 'includes/Settings/class-ship-depot-couriers.php';
         require_once SHIP_DEPOT_DIR_PATH . 'includes/Settings/class-ship-depot-about.php';
+        require_once SHIP_DEPOT_DIR_PATH . 'includes/Settings/class-ship-depot-classic-checkout-direction.php';
         if (is_admin()) {
             add_filter('woocommerce_get_settings_pages', array($this, 'add_woocommerce_settings_tab'), PHP_INT_MAX);

ship-depot/trunk/includes/class-ship-depot-general.php

@@ -126 +126 @@
     {
         add_action('admin_notices', array($this, 'check_notify_update_plugin'), 99);
+        add_action('admin_notices', array($this, 'notify_switch_classic_checkout'), 99);
         if (!Ship_Depot_Helper::is_woocommerce_activated()) {
             add_action('admin_notices', array($this, 'no_woocommerce_deactivated'), 99);
@@ -508 +509 @@
     }
 
+    public function notify_switch_classic_checkout()
+    { ?>
+        <div class="vf-notice notice notice-error is-dismissible">
+            <p>
+                <?php
+                printf(
+                    esc_html__('%s cần phải chỉnh về classic checkout để tránh bị lỗi. Vui lòng vào %s để xem hướng dẫn.', 'ship-depot-translate'),
+                    '<strong>' . esc_html__('Ship Depot for WooCommerce', 'ship-depot-translate') . '</strong>',
+                    '<a href="' . esc_url(get_site_url() . '/wp-admin/admin.php?page=wc-settings&tab=sd_settings&section=classic_checkout_direction') . '">đây<strong></strong></a>'
+                );
+                ?>
+
+            </p>
+        </div>
+    <?php
+    }
+
     public function auto_deactivate()
     {
-        ?>
+    ?>
 <?php
         $vf_plugin = '';

ship-depot/trunk/page/frontend/sd-checkout-page.php

@@ -428 +428 @@
         $product = $item_product->get_product();
         Ship_Depot_Logger::wrlog('[sd_action_checkout_order_processed] product: ' . print_r($product, true));
+        // $item_product = new WC_Order_Item_Product($item);
+        // $product = new WC_Product($item_product->get_product_id());
 
         $package_size = new Ship_Depot_Package();
@@ -580 +582 @@
     Ship_Depot_Logger::wrlog('[sd_woocommerce_after_checkout_validation] data: ' . print_r($data, true));
     Ship_Depot_Logger::wrlog('[sd_woocommerce_after_checkout_validation] _POST: ' . print_r($_POST, true));
+    // if (isset($_POST['sd_call_validate']) && sanitize_text_field($_POST['sd_call_validate']) == '1') {
+    //     Ship_Depot_Logger::wrlog('[sd_woocommerce_after_checkout_validation] sd_call_validate: ' . print_r(sanitize_text_field($_POST['sd_call_validate']), true));
+    //     Ship_Depot_Logger::wrlog('[sd_woocommerce_after_checkout_validation] add fake error');
+    //     //Add fake error
+    //     wc_add_notice(__("custom_notice", 'fake_error'), 'error');
+    // }
     //Check address
     if (isset($data['ship_to_different_address']) && sanitize_text_field($data['ship_to_different_address']) == '1') {

ship-depot/trunk/readme.txt

@@ -3 +3 @@
 Tags: shipping, couriers, ghn, ghtk, aha
 Requires at least: 6.1.1
-Tested up to: 6.4.2
+Tested up to: 6.4.3
 Requires PHP: 7.4.3
-Stable tag: 1.2.13
+Stable tag: 1.2.14
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -65 +65 @@
 
 == Changelog ==
+= 1.2.14 =
+* Thêm phần hướng dẫn chỉnh về Classic Checkout trong trang Cài Đặt của Ship Depot.
+
 = 1.2.13 =
 * Sửa một số lỗi nhỏ.