Changeset 3147257
- Timestamp:
- 09/05/2024 07:38:17 PM (18 months ago)
- Location:
- wc-dpd
- Files:
-
- 98 added
- 6 edited
-
tags/7.0.1 (added)
-
tags/7.0.1/includes (added)
-
tags/7.0.1/includes/Ajax.php (added)
-
tags/7.0.1/includes/Assets.php (added)
-
tags/7.0.1/includes/Client.php (added)
-
tags/7.0.1/includes/Core.php (added)
-
tags/7.0.1/includes/DpdExport.php (added)
-
tags/7.0.1/includes/DpdExportSettings.php (added)
-
tags/7.0.1/includes/DpdParcelShopShippingMethod.php (added)
-
tags/7.0.1/includes/Email.php (added)
-
tags/7.0.1/includes/Hooks.php (added)
-
tags/7.0.1/includes/Notice.php (added)
-
tags/7.0.1/includes/Order.php (added)
-
tags/7.0.1/includes/OrderList.php (added)
-
tags/7.0.1/includes/OrderMetabox.php (added)
-
tags/7.0.1/includes/Shipping.php (added)
-
tags/7.0.1/includes/helpers.php (added)
-
tags/7.0.1/index.php (added)
-
tags/7.0.1/languages (added)
-
tags/7.0.1/languages/wc-dpd-sk_SK.mo (added)
-
tags/7.0.1/languages/wc-dpd-sk_SK.po (added)
-
tags/7.0.1/languages/wc-dpd.pot (added)
-
tags/7.0.1/public (added)
-
tags/7.0.1/public/main.js (added)
-
tags/7.0.1/public/mix-manifest.json (added)
-
tags/7.0.1/public/scripts (added)
-
tags/7.0.1/public/scripts/dpd-export-settings-admin-repeater.js (added)
-
tags/7.0.1/public/scripts/dpd-export-settings-admin-repeater.js.map (added)
-
tags/7.0.1/public/scripts/dpd-export-settings-admin.js (added)
-
tags/7.0.1/public/scripts/dpd-export-settings-admin.js.map (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-map-widget.js (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-map-widget.js.map (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-popup.js (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-popup.js.map (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-shipping-method-weight-by-package-repeater.js (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-shipping-method-weight-by-package-repeater.js.map (added)
-
tags/7.0.1/public/scripts/dpd-parcelshop-widget.js (added)
-
tags/7.0.1/public/styles (added)
-
tags/7.0.1/public/styles/dpd-export-repeater-settings-field.css (added)
-
tags/7.0.1/public/styles/dpd-export-repeater-settings-field.css.map (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-map-widget.css (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-map-widget.css.map (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-popup.css (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-popup.css.map (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-shipping-method-content.css (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-shipping-method-content.css.map (added)
-
tags/7.0.1/public/styles/dpd-parcelshop-widget.css (added)
-
tags/7.0.1/readme.txt (added)
-
tags/7.0.1/templates (added)
-
tags/7.0.1/templates/chosen-parcelshop-order-data.php (added)
-
tags/7.0.1/templates/parcelshop-map-widget.php (added)
-
tags/7.0.1/templates/parcelshop-popup.php (added)
-
tags/7.0.1/templates/parcelshop-shipping-method-content.php (added)
-
tags/7.0.1/vendor (added)
-
tags/7.0.1/vendor/autoload.php (added)
-
tags/7.0.1/vendor/composer (added)
-
tags/7.0.1/vendor/composer/ClassLoader.php (added)
-
tags/7.0.1/vendor/composer/InstalledVersions.php (added)
-
tags/7.0.1/vendor/composer/LICENSE (added)
-
tags/7.0.1/vendor/composer/autoload_classmap.php (added)
-
tags/7.0.1/vendor/composer/autoload_files.php (added)
-
tags/7.0.1/vendor/composer/autoload_namespaces.php (added)
-
tags/7.0.1/vendor/composer/autoload_psr4.php (added)
-
tags/7.0.1/vendor/composer/autoload_real.php (added)
-
tags/7.0.1/vendor/composer/autoload_static.php (added)
-
tags/7.0.1/vendor/composer/installed.json (added)
-
tags/7.0.1/vendor/composer/installed.php (added)
-
tags/7.0.1/vendor/composer/platform_check.php (added)
-
tags/7.0.1/vendor/league (added)
-
tags/7.0.1/vendor/league/iso3166 (added)
-
tags/7.0.1/vendor/league/iso3166/.yamllint (added)
-
tags/7.0.1/vendor/league/iso3166/LICENSE (added)
-
tags/7.0.1/vendor/league/iso3166/composer.json (added)
-
tags/7.0.1/vendor/league/iso3166/src (added)
-
tags/7.0.1/vendor/league/iso3166/src/Exception (added)
-
tags/7.0.1/vendor/league/iso3166/src/Exception/DomainException.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/Exception/ISO3166Exception.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/Exception/OutOfBoundsException.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/Guards.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/ISO3166.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/ISO3166DataProvider.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/ISO3166DataValidator.php (added)
-
tags/7.0.1/vendor/league/iso3166/src/ISO3166WithAliases.php (added)
-
tags/7.0.1/vendor/symfony (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/LICENSE (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Mbstring.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/README.md (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources/unidata (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/bootstrap.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/bootstrap80.php (added)
-
tags/7.0.1/vendor/symfony/polyfill-mbstring/composer.json (added)
-
tags/7.0.1/wc-dpd.php (added)
-
trunk/includes/Shipping.php (modified) (3 diffs)
-
trunk/languages/wc-dpd-sk_SK.mo (modified) (previous)
-
trunk/languages/wc-dpd-sk_SK.po (modified) (1 diff)
-
trunk/languages/wc-dpd.pot (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/wc-dpd.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wc-dpd/trunk/includes/Shipping.php
r3143150 r3147257 113 113 } 114 114 115 $parcelshop_shipping_method_settings = DpdParcelShopShippingMethod::getSettings();115 $parcelshop_shipping_method_settings = DpdParcelShopShippingMethod::getSettings(); 116 116 117 117 // Get allowed countries codes in lowercase … … 184 184 } 185 185 186 $wc_weight_unit = get_option('woocommerce_weight_unit'); 187 $cart_weight = (float) WC()->cart->get_cart_contents_weight(); 188 189 // Convert weight to kg if necessary 190 $min_weight_kg = $cart_weight; 191 switch ($wc_weight_unit) { 192 case 'g': 193 $min_weight_kg = $cart_weight / 1000; 194 break; 195 case 'lbs': 196 $min_weight_kg = $cart_weight * 0.45359237; 197 break; 198 case 'oz': 199 $min_weight_kg = $cart_weight * 0.02834952; 200 break; 201 // 'kg' doesn't need conversion 202 } 186 203 187 204 $disallow_shops = isset($parcelshop_shipping_method_settings[DpdParcelShopShippingMethod::DISALLOW_SHOPS_OPTION_KEY]) ? filter_var($parcelshop_shipping_method_settings[DpdParcelShopShippingMethod::DISALLOW_SHOPS_OPTION_KEY], FILTER_VALIDATE_BOOL) : false; … … 204 221 'allowed_countries' => (array) $allowed_countries, 205 222 'base_country_code' => (string) strtolower($base_country_code), 206 'min_weight' => (float) WC()->cart->get_cart_contents_weight(),223 'min_weight' => (float) $min_weight_kg, 207 224 'is_eligible_for_alzabox' => $is_eligible_for_alzabox, 208 225 'is_eligible_for_slovenska_posta_box' => $is_eligible_for_slovenska_posta_box, -
wc-dpd/trunk/languages/wc-dpd-sk_SK.po
r3143150 r3147257 1 1 msgid "" 2 2 msgstr "" 3 "Project-Id-Version: DPD SK for WooCommerce - 7.0. 0\n"3 "Project-Id-Version: DPD SK for WooCommerce - 7.0.1\n" 4 4 "Report-Msgid-Bugs-To: \n" 5 "POT-Creation-Date: 2024-0 8-28 07:57+0200\n"6 "PO-Revision-Date: 2024-0 8-28 08:01+0200\n"5 "POT-Creation-Date: 2024-09-05 21:34+0200\n" 6 "PO-Revision-Date: 2024-09-05 21:34+0200\n" 7 7 "Last-Translator: \n" 8 8 "Language-Team: Slovenčina\n" -
wc-dpd/trunk/languages/wc-dpd.pot
r3143150 r3147257 4 4 msgid "" 5 5 msgstr "" 6 "Project-Id-Version: DPD SK for WooCommerce - 7.0. 0\n"6 "Project-Id-Version: DPD SK for WooCommerce - 7.0.1\n" 7 7 "Report-Msgid-Bugs-To: \n" 8 "POT-Creation-Date: 2024-0 8-28 07:57+0200\n"8 "POT-Creation-Date: 2024-09-05 21:34+0200\n" 9 9 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 10 10 "Last-Translator: Webikon <[email protected]>\n" -
wc-dpd/trunk/readme.txt
r3143150 r3147257 6 6 Tested up to: 6.6.1 7 7 Requires PHP: 7.4 8 Stable tag: 7.0. 08 Stable tag: 7.0.1 9 9 License: GPLv2 or later 10 10 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 62 62 63 63 == Changelog == 64 65 = 7.0.1 = 66 * Standardize weight unit to kg for parcelshop filtering 64 67 65 68 = 7.0.0 = -
wc-dpd/trunk/wc-dpd.php
r3143150 r3147257 4 4 * Plugin Name: DPD SK for WooCommerce 5 5 * Description: DPD SK plugin for WooCommerce which exports orders to the DPD through their API 6 * Version: 7.0. 06 * Version: 7.0.1 7 7 * Author: Webikon 8 8 * Author URI: https://www.webikon.sk
Note: See TracChangeset
for help on using the changeset viewer.