Changeset 3742480
- Timestamp:
- 10/12/2026 08:34:26 PM (5 days ago)
- Location:
- maple-parcel
- Files:
-
- 51 added
- 4 edited
-
tags/1.1.1 (added)
-
tags/1.1.1/assets (added)
-
tags/1.1.1/assets/admin.css (added)
-
tags/1.1.1/assets/admin.js (added)
-
tags/1.1.1/assets/index.php (added)
-
tags/1.1.1/includes (added)
-
tags/1.1.1/includes/Admin (added)
-
tags/1.1.1/includes/Admin/ConnectionTest.php (added)
-
tags/1.1.1/includes/Admin/HealthNotice.php (added)
-
tags/1.1.1/includes/Admin/ProUpsell.php (added)
-
tags/1.1.1/includes/Admin/index.php (added)
-
tags/1.1.1/includes/Api (added)
-
tags/1.1.1/includes/Api/ApiException.php (added)
-
tags/1.1.1/includes/Api/AuthException.php (added)
-
tags/1.1.1/includes/Api/Client.php (added)
-
tags/1.1.1/includes/Api/Credentials.php (added)
-
tags/1.1.1/includes/Api/Quote.php (added)
-
tags/1.1.1/includes/Api/RateLimitedException.php (added)
-
tags/1.1.1/includes/Api/RatingClient.php (added)
-
tags/1.1.1/includes/Api/TokenProvider.php (added)
-
tags/1.1.1/includes/Api/TransportException.php (added)
-
tags/1.1.1/includes/Api/index.php (added)
-
tags/1.1.1/includes/Plugin.php (added)
-
tags/1.1.1/includes/Settings (added)
-
tags/1.1.1/includes/Settings/CustomFields.php (added)
-
tags/1.1.1/includes/Settings/Fields.php (added)
-
tags/1.1.1/includes/Settings/SecretBox.php (added)
-
tags/1.1.1/includes/Settings/Settings.php (added)
-
tags/1.1.1/includes/Settings/index.php (added)
-
tags/1.1.1/includes/Shipping (added)
-
tags/1.1.1/includes/Shipping/Destination.php (added)
-
tags/1.1.1/includes/Shipping/Method.php (added)
-
tags/1.1.1/includes/Shipping/Parcel.php (added)
-
tags/1.1.1/includes/Shipping/ParcelBuilder.php (added)
-
tags/1.1.1/includes/Shipping/RateCache.php (added)
-
tags/1.1.1/includes/Shipping/Rater.php (added)
-
tags/1.1.1/includes/Shipping/Services.php (added)
-
tags/1.1.1/includes/Shipping/index.php (added)
-
tags/1.1.1/includes/Support (added)
-
tags/1.1.1/includes/Support/Health.php (added)
-
tags/1.1.1/includes/Support/Logger.php (added)
-
tags/1.1.1/includes/Support/index.php (added)
-
tags/1.1.1/includes/Tracking (added)
-
tags/1.1.1/includes/Tracking/ManualTracking.php (added)
-
tags/1.1.1/includes/Tracking/index.php (added)
-
tags/1.1.1/includes/index.php (added)
-
tags/1.1.1/includes/uninstall-cleanup.php (added)
-
tags/1.1.1/index.php (added)
-
tags/1.1.1/maple-parcel.php (added)
-
tags/1.1.1/readme.txt (added)
-
tags/1.1.1/uninstall.php (added)
-
trunk/includes/Admin/ProUpsell.php (modified) (2 diffs)
-
trunk/includes/uninstall-cleanup.php (modified) (3 diffs)
-
trunk/maple-parcel.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
maple-parcel/trunk/includes/Admin/ProUpsell.php
r3739921 r3742480 63 63 $features = array( 64 64 array( 65 __( 'Canada Post labels', 'maple-parcel' ), 66 __( 'Make a label for a parcel within Canada from the order screen, and the tracking number goes to your customer.', 'maple-parcel' ), 67 ), 68 array( 65 69 __( 'Pack into your own boxes', 'maple-parcel' ), 66 70 __( 'List the boxes you ship in once. Each order is quoted as the fewest boxes that hold it, at each box\'s real size and weight.', 'maple-parcel' ), … … 78 82 <div class="bbmmp-pro-panel" style="max-width: 60em; margin-top: 2em;"> 79 83 <h2><?php esc_html_e( 'What Pro adds', 'maple-parcel' ); ?></h2> 80 <p><?php esc_html_e( 'Maple Parcel Pro is a separate plugin for stores that want more say over their shipping prices. Everything on this page works the same with or without it.', 'maple-parcel' ); ?></p>84 <p><?php esc_html_e( 'Maple Parcel Pro is a separate plugin for stores that want labels and more say over their shipping prices. Everything on this page works the same with or without it.', 'maple-parcel' ); ?></p> 81 85 <ul style="list-style: disc; padding-left: 1.5em;"> 82 86 <?php foreach ( $features as $feature ) : ?> -
maple-parcel/trunk/includes/uninstall-cleanup.php
r3739921 r3742480 9 9 * after_uninstall action in maple-parcel.php (the premium zip cannot ship an 10 10 * uninstall.php). Both need it, so it lives here. 11 * 12 * Free and Pro share every setting, so nothing is deleted while the other 13 * edition is still installed: deleting the free plugin after upgrading must 14 * not take Pro's keys and zones with it. 11 15 */ 12 16 … … 14 18 15 19 defined( 'ABSPATH' ) || exit; 20 21 if ( ! function_exists( 'bbmmp_other_edition_installed' ) ) { 22 /** 23 * Whether another copy of Maple Parcel (free or Pro, in any folder) is 24 * installed besides the one being uninstalled. 25 * 26 * @param string $self_dir Folder name of the copy being uninstalled. 27 */ 28 function bbmmp_other_edition_installed( string $self_dir ): bool { 29 if ( ! function_exists( 'get_plugins' ) ) { 30 require_once ABSPATH . 'wp-admin/includes/plugin.php'; 31 } 32 33 foreach ( get_plugins() as $file => $data ) { 34 if ( 'maple-parcel' === ( $data['TextDomain'] ?? '' ) && dirname( $file ) !== $self_dir ) { 35 return true; 36 } 37 } 38 39 return false; 40 } 41 } 16 42 17 43 if ( ! function_exists( 'bbmmp_uninstall_cleanup' ) ) { … … 22 48 function bbmmp_uninstall_cleanup(): void { 23 49 global $wpdb; 50 51 // The folder this file sits in (includes/) belongs to the copy being uninstalled. 52 if ( bbmmp_other_edition_installed( basename( dirname( __DIR__ ) ) ) ) { 53 return; 54 } 24 55 25 56 // Our own options (bbmmp_health and any added later). -
maple-parcel/trunk/maple-parcel.php
r3739921 r3742480 4 4 * Plugin URI: https://bluebrainmedia.ca/maple-parcel/ 5 5 * Description: Live Canada Post rates at WooCommerce checkout, using your own keys from Canada Post's new Developer Portal. 6 * Version: 1.1. 06 * Version: 1.1.1 7 7 * Requires at least: 6.8 8 8 * Requires PHP: 8.2 … … 60 60 } 61 61 62 define( 'BBMMP_VERSION', '1.1. 0' );62 define( 'BBMMP_VERSION', '1.1.1' ); 63 63 define( 'BBMMP_FILE', __FILE__ ); 64 64 define( 'BBMMP_PATH', plugin_dir_path( __FILE__ ) ); -
maple-parcel/trunk/readme.txt
r3739921 r3742480 5 5 Tested up to: 7.1 6 6 Requires PHP: 8.2 7 Stable tag: 1.1. 07 Stable tag: 1.1.1 8 8 License: GPLv2 or later 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 67 67 == Changelog == 68 68 69 = 1.1.1 = 70 * Fixed: if you upgrade to Pro and then delete this free version, your Canada Post keys and shipping zone settings are now kept for Pro. Before, deleting it cleared them. 71 * The "What Pro adds" panel now mentions Canada Post labels. 72 69 73 = 1.1.0 = 70 74 * Fixed: the order screen no longer shows an internal "_bbmmp_service" line under the shipping method. … … 78 82 == Upgrade Notice == 79 83 84 = 1.1.1 = 85 Update before you upgrade to Pro: deleting the free version no longer clears the settings Pro uses. 86 80 87 = 1.1.0 = 81 88 Tidies the order screen: an internal shipping note no longer shows under the shipping method.
Note:
See TracChangeset
for help on using the changeset viewer.
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)