Changeset 3035206
- Timestamp:
- 02/13/2024 05:17:37 PM (2 years ago)
- Location:
- dhlpwc
- Files:
-
- 14 edited
- 1 copied
-
tags/2.0.19 (copied) (copied from dhlpwc/trunk)
-
tags/2.0.19/README.md (modified) (1 diff)
-
tags/2.0.19/assets/css/dhlpwc.admin.css (modified) (1 diff)
-
tags/2.0.19/assets/js/dhlpwc.parcelshop.locator.js (modified) (1 diff)
-
tags/2.0.19/dhlpwoocommerce.php (modified) (1 diff)
-
tags/2.0.19/includes/controller/admin/class-dhlpwc-controller-admin-settings.php (modified) (3 diffs)
-
tags/2.0.19/includes/model/woocommerce/settings/class-dhlpwc-model-woocommerce-settings-shipping-method.php (modified) (1 diff)
-
tags/2.0.19/readme.txt (modified) (2 diffs)
-
trunk/README.md (modified) (1 diff)
-
trunk/assets/css/dhlpwc.admin.css (modified) (1 diff)
-
trunk/assets/js/dhlpwc.parcelshop.locator.js (modified) (1 diff)
-
trunk/dhlpwoocommerce.php (modified) (1 diff)
-
trunk/includes/controller/admin/class-dhlpwc-controller-admin-settings.php (modified) (3 diffs)
-
trunk/includes/model/woocommerce/settings/class-dhlpwc-model-woocommerce-settings-shipping-method.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dhlpwc/tags/2.0.19/README.md
r3012853 r3035206 1 1 # DHL eCommerce for WooCommerce 2 2 3 v2.0.19 4 ## Changes 5 - Added a filter to ServicePoint locator to only show pickup locations 6 - Fixed shipping zone settings not displaying correctly for the new WooCommerce layout 7 3 8 v2.0.18 4 9 ## Changes -
dhlpwc/tags/2.0.19/assets/css/dhlpwc.admin.css
r2974250 r3035206 245 245 left: 0; 246 246 width: inherit; 247 display: none;248 247 margin-right: -240px; 249 248 padding: 0 20px; 250 height: 0;251 249 } 252 250 -
dhlpwc/tags/2.0.19/assets/js/dhlpwc.parcelshop.locator.js
r2688414 r3035206 92 92 header: false, 93 93 resizable: true, 94 onSelect: window.dhlpwc_select_servicepoint 94 onSelect: window.dhlpwc_select_servicepoint, 95 filter: { 96 serviceType: 'pick-up' 97 } 95 98 }; 96 99 -
dhlpwc/tags/2.0.19/dhlpwoocommerce.php
r3012853 r3035206 4 4 * Plugin URI: https://www.dhlparcel.nl 5 5 * Description: This is the official DHL eCommerce for WooCommerce plugin. 6 * Author: DHL Parcel7 * Version: 2.0.1 86 * Author: DHL eCommerce 7 * Version: 2.0.19 8 8 * Requires at least: 4.7.16 9 9 * Tested up to: 6.3 10 10 * Requires PHP: 5.6 11 11 * WC requires at least: 3.0.0 12 * WC tested up to: 8. 0.212 * WC tested up to: 8.5.2 13 13 * License: GPL v3 or later 14 14 * License URI: https://www.gnu.org/licenses/gpl-3.0.html -
dhlpwc/tags/2.0.19/includes/controller/admin/class-dhlpwc-controller-admin-settings.php
r2995038 r3035206 117 117 public function load_styles() 118 118 { 119 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() ) {119 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() || $this->is_shipping_zone_instance_screen()) { 120 120 wp_enqueue_style('dhlpwc-admin-style', DHLPWC_PLUGIN_URL . 'assets/css/dhlpwc.admin.css'); 121 121 } … … 130 130 wp_enqueue_script( 'dhlpwc-admin-notices', DHLPWC_PLUGIN_URL . 'assets/js/dhlpwc.notices.js', array('jquery')); 131 131 132 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() ) {132 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() || $this->is_shipping_zone_instance_screen()) { 133 133 134 134 $condition_templates = array(); … … 250 250 } 251 251 252 protected function is_shipping_zone_instance_screen() 253 { 254 if (!function_exists('get_current_screen')) { 255 return false; 256 } 257 258 $screen = get_current_screen(); 259 if (!isset($screen)) { 260 return false; 261 } 262 263 if ($screen->base !== 'woocommerce_page_wc-settings') { 264 return false; 265 } 266 267 if (!isset($_GET['page']) || $_GET['page'] !== 'wc-settings') { 268 return false; 269 } 270 271 if (!isset($_GET['tab']) || $_GET['tab'] !== 'shipping') { 272 return false; 273 } 274 275 if (!isset($_GET['instance_id'])) { 276 return false; 277 } 278 279 /** @var WC_Shipping_Method $shipping_method */ 280 $shipping_method = WC_Shipping_Zones::get_shipping_method($_GET['instance_id']); 281 if (empty($shipping_method)) { 282 return false; 283 } 284 285 if ($shipping_method->id !== 'dhlpwc') { 286 return false; 287 } 288 289 return true; 290 } 291 252 292 public function check_for_notices() 253 293 { -
dhlpwc/tags/2.0.19/includes/model/woocommerce/settings/class-dhlpwc-model-woocommerce-settings-shipping-method.php
r2995038 r3035206 43 43 $this->supports = array( 44 44 'instance-settings', 45 'instance-settings-modal',46 45 'settings', 47 46 ); -
dhlpwc/tags/2.0.19/readme.txt
r3012853 r3035206 5 5 Requires PHP: 5.6 6 6 Tested up to: 6.2 7 Stable tag: 2.0.1 87 Stable tag: 2.0.19 8 8 WC requires at least: 3.0.0 9 WC tested up to: 7.3.09 WC tested up to: 8.5.2 10 10 License: GPL v3 or later 11 11 License URI: https://www.gnu.org/licenses/gpl-3.0.html … … 54 54 == Changelog == 55 55 56 = 2.0.19 = 57 - Added a filter to ServicePoint locator to only show pickup locations 58 - Fixed shipping zone settings not displaying correctly for the new WooCommerce layout 59 56 60 = 2.0.18 = 57 61 - Fixed DHL Plugin Settings page on WooCommerce v8.4.0 -
dhlpwc/trunk/README.md
r3012853 r3035206 1 1 # DHL eCommerce for WooCommerce 2 2 3 v2.0.19 4 ## Changes 5 - Added a filter to ServicePoint locator to only show pickup locations 6 - Fixed shipping zone settings not displaying correctly for the new WooCommerce layout 7 3 8 v2.0.18 4 9 ## Changes -
dhlpwc/trunk/assets/css/dhlpwc.admin.css
r2974250 r3035206 245 245 left: 0; 246 246 width: inherit; 247 display: none;248 247 margin-right: -240px; 249 248 padding: 0 20px; 250 height: 0;251 249 } 252 250 -
dhlpwc/trunk/assets/js/dhlpwc.parcelshop.locator.js
r2688414 r3035206 92 92 header: false, 93 93 resizable: true, 94 onSelect: window.dhlpwc_select_servicepoint 94 onSelect: window.dhlpwc_select_servicepoint, 95 filter: { 96 serviceType: 'pick-up' 97 } 95 98 }; 96 99 -
dhlpwc/trunk/dhlpwoocommerce.php
r3012853 r3035206 4 4 * Plugin URI: https://www.dhlparcel.nl 5 5 * Description: This is the official DHL eCommerce for WooCommerce plugin. 6 * Author: DHL Parcel7 * Version: 2.0.1 86 * Author: DHL eCommerce 7 * Version: 2.0.19 8 8 * Requires at least: 4.7.16 9 9 * Tested up to: 6.3 10 10 * Requires PHP: 5.6 11 11 * WC requires at least: 3.0.0 12 * WC tested up to: 8. 0.212 * WC tested up to: 8.5.2 13 13 * License: GPL v3 or later 14 14 * License URI: https://www.gnu.org/licenses/gpl-3.0.html -
dhlpwc/trunk/includes/controller/admin/class-dhlpwc-controller-admin-settings.php
r2995038 r3035206 117 117 public function load_styles() 118 118 { 119 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() ) {119 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() || $this->is_shipping_zone_instance_screen()) { 120 120 wp_enqueue_style('dhlpwc-admin-style', DHLPWC_PLUGIN_URL . 'assets/css/dhlpwc.admin.css'); 121 121 } … … 130 130 wp_enqueue_script( 'dhlpwc-admin-notices', DHLPWC_PLUGIN_URL . 'assets/js/dhlpwc.notices.js', array('jquery')); 131 131 132 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() ) {132 if ($this->is_plugin_screen() || $this->is_shipping_zone_screen() || $this->is_shipping_zone_instance_screen()) { 133 133 134 134 $condition_templates = array(); … … 250 250 } 251 251 252 protected function is_shipping_zone_instance_screen() 253 { 254 if (!function_exists('get_current_screen')) { 255 return false; 256 } 257 258 $screen = get_current_screen(); 259 if (!isset($screen)) { 260 return false; 261 } 262 263 if ($screen->base !== 'woocommerce_page_wc-settings') { 264 return false; 265 } 266 267 if (!isset($_GET['page']) || $_GET['page'] !== 'wc-settings') { 268 return false; 269 } 270 271 if (!isset($_GET['tab']) || $_GET['tab'] !== 'shipping') { 272 return false; 273 } 274 275 if (!isset($_GET['instance_id'])) { 276 return false; 277 } 278 279 /** @var WC_Shipping_Method $shipping_method */ 280 $shipping_method = WC_Shipping_Zones::get_shipping_method($_GET['instance_id']); 281 if (empty($shipping_method)) { 282 return false; 283 } 284 285 if ($shipping_method->id !== 'dhlpwc') { 286 return false; 287 } 288 289 return true; 290 } 291 252 292 public function check_for_notices() 253 293 { -
dhlpwc/trunk/includes/model/woocommerce/settings/class-dhlpwc-model-woocommerce-settings-shipping-method.php
r2995038 r3035206 43 43 $this->supports = array( 44 44 'instance-settings', 45 'instance-settings-modal',46 45 'settings', 47 46 ); -
dhlpwc/trunk/readme.txt
r3012853 r3035206 5 5 Requires PHP: 5.6 6 6 Tested up to: 6.2 7 Stable tag: 2.0.1 87 Stable tag: 2.0.19 8 8 WC requires at least: 3.0.0 9 WC tested up to: 7.3.09 WC tested up to: 8.5.2 10 10 License: GPL v3 or later 11 11 License URI: https://www.gnu.org/licenses/gpl-3.0.html … … 54 54 == Changelog == 55 55 56 = 2.0.19 = 57 - Added a filter to ServicePoint locator to only show pickup locations 58 - Fixed shipping zone settings not displaying correctly for the new WooCommerce layout 59 56 60 = 2.0.18 = 57 61 - Fixed DHL Plugin Settings page on WooCommerce v8.4.0
Note: See TracChangeset
for help on using the changeset viewer.