Fix Stripe charge status check, payment feedback, and modal HTML rendering

- auto_charge: verify payment_intent.status is succeeded/processing before returning success; add description/metadata params so subscription charges are labeled correctly in Stripe
- pricing: redirect to ?success= after upgrade/downgrade so the persistent server-side banner shows instead of a 1.5s toast that disappears on reload
- pricing GET endpoint: pass success/error query params to template context
- base modal: support html:true option in open() so showConfirm can render HTML content; update showConfirm signature to accept html flag
- pricing: pass html=true to showConfirm so the upgrade confirmation renders bold/colored text instead of raw tags

aisbf/payments/fiat/stripe_handler.py

@@ -268,14 +268,13 @@ class StripePaymentHandler:
         )
         logger.info(f"Wallet credited: user={user_id}, amount={amount}, intent={payment_intent['id']}")
 
-    async def auto_charge(self, user_id: int, amount: Decimal, payment_method_id: str) -> Dict[str, Any]:
-        """
-        Automatically charge a saved payment method for auto top up
-        """
+    async def auto_charge(self, user_id: int, amount: Decimal, payment_method_id: str,
+                          description: Optional[str] = None, metadata: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+        """Charge a saved payment method immediately (off-session)."""
         try:
             customer_id = await self._get_or_create_customer(user_id)
             amount_cents = int(amount * 100)
-            
+
             payment_intent = await asyncio.to_thread(
                 stripe.PaymentIntent.create,
                 amount=amount_cents,
@@ -284,23 +283,21 @@ class StripePaymentHandler:
                 payment_method=payment_method_id,
                 confirm=True,
                 off_session=True,
-                description=f'Auto wallet top up: ${amount:.2f}',
-                metadata={
-                    'user_id': str(user_id),
-                    'topup': 'true',
-                    'auto_topup': 'true',
-                    'amount': str(amount)
-                }
+                description=description or f'Charge: ${amount:.2f}',
+                metadata=metadata or {'user_id': str(user_id), 'amount': str(amount)}
             )
-            
-            logger.info(f"Auto charge successful for user {user_id}: {payment_intent.id}")
-            
+
+            if payment_intent.status not in ('succeeded', 'processing'):
+                logger.error(f"Unexpected PaymentIntent status for user {user_id}: {payment_intent.status} ({payment_intent.id})")
+                return {"success": False, "error": f"Payment not completed (status: {payment_intent.status})"}
+
+            logger.info(f"Auto charge successful for user {user_id}: {payment_intent.id} status={payment_intent.status}")
             return {
                 "success": True,
                 "gateway_transaction_id": payment_intent.id,
                 "amount": amount
             }
-            
+
         except stripe.error.CardError as e:
             logger.error(f"Auto charge card error for user {user_id}: {e.user_message}")
             return {"success": False, "error": e.user_message}

main.py

@@ -8946,6 +8946,8 @@ async def dashboard_pricing(request: Request):
             "currency_symbol": currency_symbol,
             "wallet_balance": wallet_balance,
             "has_stripe_card": has_stripe_card,
+            "success": request.query_params.get("success"),
+            "error": request.query_params.get("error"),
         }
     )
 
@@ -9072,7 +9074,9 @@ async def dashboard_subscribe_tier(request: Request, tier_id: int):
     result = await payment_service.stripe_handler.auto_charge(
         user_id,
         Decimal(str(tier_price)),
-        default_method['identifier']
+        default_method['identifier'],
+        description=f"Subscription upgrade to {target_tier['name']}",
+        metadata={'user_id': str(user_id), 'tier_id': str(tier_id), 'tier_name': target_tier['name'], 'amount': str(tier_price)}
     )
     if not result.get('success'):
         return JSONResponse({"error": result.get('error', 'Card charge failed')}, status_code=402)

templates/base.html

@@ -1083,7 +1083,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
         function open(opts) {
             titleEl.textContent = opts.title || 'Notice';
-            msgEl.textContent   = opts.message || '';
+            if (opts.html) msgEl.innerHTML = opts.message || '';
+            else msgEl.textContent = opts.message || '';
             if (opts.icon) { iconEl.className = 'ui-modal-icon ' + (opts.iconClass||'info'); iconEl.textContent = opts.icon; iconEl.style.display='block'; }
             else { iconEl.style.display='none'; }
             inputEl.style.display = opts.prompt ? 'block' : 'none';
@@ -1113,10 +1114,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                     buttons: [{label:'OK', value:true, cls:'btn'}] });
             });
         };
-        window.showConfirm = function(message, title, icon, iconClass) {
+        window.showConfirm = function(message, title, icon, iconClass, html) {
             return new Promise(res => {
                 _resolve = res;
-                open({ title: title||'Confirm', message, icon: icon||'⚠️', iconClass: iconClass||'warn',
+                open({ title: title||'Confirm', message, html, icon: icon||'⚠️', iconClass: iconClass||'warn',
                     buttons: [
                         {label:'Cancel', value:false, cls:'btn-secondary'},
                         {label:'Confirm', value:true, cls:'btn'}

templates/dashboard/pricing.html

@@ -278,7 +278,7 @@ async function subscribeToTier(tierId, tierName, tierPrice) {
         msg += `<br><br><span style="color:#f87171;"><i class="fas fa-exclamation-triangle me-1"></i>Your wallet balance (${CURRENCY_SYMBOL}${WALLET_BALANCE.toFixed(2)}) is insufficient and no card is saved.</span><br><a href="/dashboard/wallet" style="color:#4a9eff;">Top up wallet</a> or <a href="/dashboard/billing/add-method" style="color:#4a9eff;">add a card</a> first.`;
     }
 
-    const ok = await showConfirm(msg, 'Upgrade Plan');
+    const ok = await showConfirm(msg, 'Upgrade Plan', undefined, undefined, true);
     if (!ok) return;
 
     const btn = document.querySelector(`button[onclick*="subscribeToTier(${tierId}"]`);
@@ -291,8 +291,8 @@ async function subscribeToTier(tierId, tierName, tierPrice) {
     .then(r => r.json())
     .then(result => {
         if (result.success) {
-            showToast(result.message || 'Plan upgraded successfully!', 'success');
-            setTimeout(() => window.location.reload(), 1500);
+            const msg = encodeURIComponent(result.message || 'Plan upgraded successfully!');
+            window.location.href = `/dashboard/pricing?success=${msg}`;
         } else if (result.error === 'insufficient_funds') {
             showToast(
                 `Insufficient funds. Wallet: ${CURRENCY_SYMBOL}${(result.wallet_balance||0).toFixed(2)}, needed: ${CURRENCY_SYMBOL}${(result.required||0).toFixed(2)}. ` +
@@ -322,8 +322,8 @@ async function downgradeToFree() {
     .then(r => r.json())
     .then(result => {
         if (result.success) {
-            showToast(result.message || 'Downgraded to free plan', 'success');
-            setTimeout(() => window.location.reload(), 1500);
+            const msg = encodeURIComponent(result.message || 'Downgraded to free plan');
+            window.location.href = `/dashboard/pricing?success=${msg}`;
         } else {
             showToast(result.error || 'Error processing downgrade', 'danger');
         }