Changeset 3757857

Timestamp:

10/21/2026 07:26:01 AM (3 weeks ago)

Author:

walletup

Message:

6.3.6: correct edition labels and licence reminder; safer Stripe payment updates

Location:

wallet-up/trunk

Files:

• readme.txt (modified) (2 diffs)
• src/API/WebhookHandler.php (modified) (2 diffs)
• src/Core/Admin/AdminManager.php (modified) (1 diff)
• src/Core/Admin/CheckoutHandoff.php (modified) (1 diff)
• src/Core/Admin/NonprofitOffer.php (modified) (1 diff)
• src/Core/Admin/Notices/PremiumActivationNotice.php (modified) (4 diffs)
• src/Core/Admin/Notices/ProInstallModal.php (modified) (2 diffs)
• src/WooCommerce/Express/ApplePayDomain.php (modified) (2 diffs)
• wallet-up-start.php (modified) (2 diffs)
• wallet-up.php (modified) (1 diff)

wallet-up/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 8.1
-Stable tag: 6.3.5
+Stable tag: 6.3.6
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -205 +205 @@
 
 == Changelog ==
+= 6.3.6 - October 21, 2026 =
+* Improved (Pro): Orders are marked paid from Stripe only for live payments that cover the order total while your store takes live payments.
+* Improved (Pro): Store pages stay fast while Apple Pay setup runs in the background.
+* Improved: The Plugins screen labels the free and Pro editions correctly, whichever one is installed.
+* Improved: The licence activation reminder appears only when your account holds a licence that is not active on this site, and names Pro correctly in every edition.
+
 = 6.3.5 - October 20, 2026 =
 * Improved (Pro): The card payment form at WooCommerce checkout shows the test card notice only while Stripe is in test mode.

wallet-up/trunk/src/API/WebhookHandler.php

@@ -481 +481 @@
             }
 
+            if (!$isTestMode && empty($event->livemode)) {
+                $this->errorHandler->log('Stripe webhook ignored: a test-mode event (' . $event->type . ') reached a store that takes live payments');
+                $this->updateWebhookStatus($webhookId, 'completed', 200, microtime(true) - $startTime, 'Test-mode event ignored on a live store');
+                return new WP_REST_Response(['success' => true, 'ignored' => 'test_mode_event'], 200);
+            }
+
             $eventType = $event->type;
             $object = $event->data->object;
@@ -606 +612 @@
         if ($orderKey && $order->get_order_key() !== $orderKey) {
             $this->errorHandler->log("Stripe webhook: order key mismatch for order {$orderId}");
+            return;
+        }
+
+        $paidMinor = (int) ($paymentIntent->amount_received ?? $paymentIntent->amount ?? 0);
+        $dueMinor = \WalletUpPro\Core\Payments\PaymentGatewayHandler::toMinorUnits((float) $order->get_total(), (string) $order->get_currency());
+        $sameCurrency = strtolower((string) ($paymentIntent->currency ?? '')) === strtolower((string) $order->get_currency());
+        if (!$order->is_paid() && (!$sameCurrency || $paidMinor < $dueMinor)) {
+            $this->errorHandler->log("Stripe webhook: PaymentIntent {$paymentIntent->id} does not cover order {$orderId}; order left unpaid");
+            /* translators: %s: Stripe PaymentIntent ID */
+            $order->add_order_note(sprintf(esc_html__('Stripe reported a payment (PaymentIntent: %s) that does not match this order total, so the order was not marked as paid.', 'walletup'), $paymentIntent->id));
+            $order->save();
             return;
         }

wallet-up/trunk/src/Core/Admin/AdminManager.php

@@ -822 +822 @@
                         $name = \WalletUpPro\Core\Config\PaymentMethodsConfig::getMethodName($methodId);
                         throw new Exception(esc_html(sprintf(
-                            __('%s requires Wallet Up. The free version supports Cash App, PayPal, and Venmo.', 'walletup'),
-                            $name
+                            /* translators: 1: payment method name, 2: Pro product name */
+                            __('%1$s requires %2$s. The free version supports Cash App, PayPal, and Venmo.', 'walletup'),
+                            $name,
+                            WALLET_UP_PRO_PRODUCT_NAME
                         )));
                     }

wallet-up/trunk/src/Core/Admin/CheckoutHandoff.php

@@ -161 +161 @@
         switch ($kind) {
             case self::ACTION_OWNED:
-                return __('Wallet Up is already licensed on this site, so no second purchase was started. You can change your plan or add sites here.', 'walletup');
+                /* translators: %s: Pro product name */
+                return sprintf(__('%s is already licensed on this site, so no second purchase was started. You can change your plan or add sites here.', 'walletup'), WALLET_UP_PRO_PRODUCT_NAME);
             case 'connect':
                 return __('Choose an option below to continue. Your checkout opens right after.', 'walletup');

wallet-up/trunk/src/Core/Admin/NonprofitOffer.php

@@ -416 +416 @@
         }
         if (self::otherLicence()) {
-            wp_send_json_error(['message' => __('This site already uses a Wallet Up licence. Reply to your approval email and we will move it to your lifetime licence and stop the old plan, so you are not charged again.', 'walletup'), 'activation' => 'existing'], 409);
+            wp_send_json_error(['message' => /* translators: %s: Pro product name */ sprintf(__('This site already uses a %s licence. Reply to your approval email and we will move it to your lifetime licence and stop the old plan, so you are not charged again.', 'walletup'), WALLET_UP_PRO_PRODUCT_NAME), 'activation' => 'existing'], 409);
         }
         if (self::premiumCode()) {

wallet-up/trunk/src/Core/Admin/Notices/PremiumActivationNotice.php

@@ -40 +40 @@
         $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
         return strpos( $page, 'wallet-up' ) === 0;
+    }
+
+    public static function unusedLicenceOnAccount( $fs ): bool {
+        if ( ! is_object( $fs ) || ! method_exists( $fs, 'is_registered' ) || ! $fs->is_registered() ) {
+            return false;
+        }
+        if ( ! method_exists( $fs, 'has_any_license' ) || ! $fs->has_any_license( false ) ) {
+            return false;
+        }
+        return ! ( method_exists( $fs, 'has_active_valid_license' ) && $fs->has_active_valid_license() );
     }
 
@@ -126 +136 @@
         <div class="notice notice-warning is-dismissible">
             <p style="font-size:14px;line-height:1.6;margin:8px 0 4px;">
-                <strong><?php esc_html_e( 'Thanks for upgrading to Wallet Up!', 'walletup' ); ?></strong>
+                <strong><?php /* translators: %s: Pro product name */ echo esc_html( sprintf( __( 'Thanks for upgrading to %s!', 'walletup' ), WALLET_UP_PRO_PRODUCT_NAME ) ); ?></strong>
                 <?php esc_html_e( 'Your purchase is confirmed. One step is left before the Pro features unlock: download the Pro version and install it from Plugins, Add New, Upload. Your license and all your settings carry over automatically.', 'walletup' ); ?>
             </p>
@@ -146 +156 @@
         }
 
+        if ( ! self::unusedLicenceOnAccount( $fs ) ) {
+            return;
+        }
+
         $activateUrl = ( is_object( $fs ) && method_exists( $fs, 'get_activation_url' ) ) ? $fs->get_activation_url() : self::SELF_SERVE_URL;
         $dismissUrl = wp_nonce_url( add_query_arg( 'walletup_dismiss_activate_help', '1' ), 'walletup_dismiss_activate_help' );
@@ -151 +165 @@
         <div class="notice notice-info" style="border-left-color:#7c3aed;">
             <p style="font-size:14px;line-height:1.6;margin:8px 0 4px;">
-                <strong><?php esc_html_e( 'Already purchased Wallet Up?', 'walletup' ); ?></strong>
-                <?php esc_html_e( 'If you bought Pro but still see the free version, your license just needs to be activated on this site. Activate it and get your Pro download in one place — no re-purchase needed.', 'walletup' ); ?>
+                <strong><?php /* translators: %s: Pro product name */ echo esc_html( sprintf( __( 'Your %s licence is ready for this site.', 'walletup' ), WALLET_UP_PRO_PRODUCT_NAME ) ); ?></strong>
+                <?php esc_html_e( 'Your account has a licence that is not active here yet. Activate it to unlock Pro and get the Pro download. There is nothing more to pay.', 'walletup' ); ?>
             </p>
             <p style="margin:8px 0 12px;">

wallet-up/trunk/src/Core/Admin/Notices/ProInstallModal.php

@@ -86 +86 @@
 
                 <p id="wup-pro-modal-body">
-                    <?php esc_html_e( 'This site is still running the free version. Download Wallet Up and install it over this one to unlock your Pro features. Your licence, settings and payment methods all carry across.', 'walletup' ); ?>
+                    <?php /* translators: %s: Pro product name */ echo esc_html( sprintf( __( 'This site is still running the free version. Download %s and install it over this one to unlock your Pro features. Your licence, settings and payment methods all carry across.', 'walletup' ), WALLET_UP_PRO_PRODUCT_NAME ) ); ?>
                 </p>
 
@@ -98 +98 @@
                     <?php if ( $downloadUrl ) : ?>
                         <a class="wup-pro-modal__cta" href="<?php echo esc_url( $downloadUrl ); ?>" autofocus>
-                            <?php esc_html_e( 'Download Wallet Up', 'walletup' ); ?>
+                            <?php /* translators: %s: Pro product name */ echo esc_html( sprintf( __( 'Download %s', 'walletup' ), WALLET_UP_PRO_PRODUCT_NAME ) ); ?>
                         </a>
                     <?php endif; ?>

wallet-up/trunk/src/WooCommerce/Express/ApplePayDomain.php

@@ -61 +61 @@
                 return;
             }
-            $connect = class_exists('\\WalletUpPro\\Core\\Payments\\StripeConnect')
-                && \WalletUpPro\Core\Payments\StripeConnect::isActive();
-            $signature = self::registrationSignature($domain, $connect);
-            if ($signature === '' || get_option(self::REGISTERED_OPT) === $signature || get_transient(self::RETRY_PAUSE)) {
+            if (get_transient(self::RETRY_PAUSE)) {
+                return;
+            }
+            $status = self::connectStatus(is_admin() && !wp_doing_ajax());
+            $connect = !empty($status['connected']) && !empty($status['charges_enabled']) && !empty($status['account_id']);
+            $signature = self::registrationSignature($domain, $connect, $status);
+            if ($signature === '' || get_option(self::REGISTERED_OPT) === $signature) {
                 return;
             }
@@ -100 +103 @@
     }
 
-    public static function registrationSignature(string $domain, bool $connect): string
+    private static function connectStatus(bool $mayFetch): array
+    {
+        if (!class_exists('\\WalletUpPro\\Core\\Payments\\StripeConnect')) {
+            return [];
+        }
+        return $mayFetch
+            ? \WalletUpPro\Core\Payments\StripeConnect::getStatus()
+            : \WalletUpPro\Core\Payments\StripeConnect::getCachedStatus();
+    }
+
+    public static function registrationSignature(string $domain, bool $connect, array $status = []): string
     {
         if ($connect) {
-            $status = \WalletUpPro\Core\Payments\StripeConnect::getStatus();
             $account = (string) ($status['account_id'] ?? '');
             return $account === '' ? '' : implode('|', [$domain, $account, \WalletUpPro\Core\Payments\StripeConnect::mode()]);

wallet-up/trunk/wallet-up-start.php

@@ -28 +28 @@
     private function __construct() {
         $this->ensurePluginFunctionsLoaded();
+        if ( self::FREE_PLUGIN_BASENAME === plugin_basename( WALLET_UP_PRO_FILE ) ) {
+            return;
+        }
         $this->deactivateFreeVersion();
         add_filter(
@@ -136 +139 @@
 }
 // which has the Plugin Name header — WooCommerce FeaturesUtil requires this
-define( 'WALLET_UP_PRO_VERSION', '6.3.5' );
+define( 'WALLET_UP_PRO_VERSION', '6.3.6' );
+define( 'WALLET_UP_PRO_PRODUCT_NAME', 'Wallet Up Pro' );
 define( 'WALLET_UP_IS_PRO_BUILD', false );
 define( 'WALLET_UP_PRO_FILE', dirname( __FILE__ ) . '/wallet-up.php' );

wallet-up/trunk/wallet-up.php

@@ -5 +5 @@
  * Plugin URI: https://walletup.app/
  * Author: WalletUp.app
- * Version: 6.3.5
+ * Version: 6.3.6
  * Requires at least: 5.8
  * Tested up to: 7.1