Samir Boulahtit
d1fe3584ff
- Fix admin tier change: resolve tier_code→tier_id in update_subscription(), delegate to billing_service.change_tier() for Stripe-connected subs - Add platform support to admin tiers page: platform column, filter dropdown, platform selector in create/edit modal, platform_name in tier API response - Filter used platforms in create subscription modal on merchant detail page - Enrich merchant portal API responses with tier code, tier_name, platform_name - Add eager-load of platform relationship in get_merchant_subscription() - Remove stale store_name/store_code references from merchant templates - Add merchant tier change endpoint (POST /change-tier) and tier selector UI replacing broken requestUpgrade() button - Fix subscription detail link to use platform_id instead of sub.id Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
269 lines
12 KiB
HTML
269 lines
12 KiB
HTML
{# app/modules/billing/templates/billing/merchant/subscription-detail.html #}
|
|
{% extends "merchant/base.html" %}
|
|
|
|
{% block title %}Subscription Details{% endblock %}
|
|
|
|
{% block content %}
|
|
<div x-data="merchantSubscriptionDetail()">
|
|
|
|
<!-- Back link and header -->
|
|
<div class="mb-8">
|
|
<a href="/merchants/billing/subscriptions" class="inline-flex items-center text-sm text-indigo-600 hover:text-indigo-800 mb-4">
|
|
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
|
|
</svg>
|
|
Back to Subscriptions
|
|
</a>
|
|
<h2 class="text-2xl font-bold text-gray-900">Subscription Details</h2>
|
|
</div>
|
|
|
|
<!-- Loading -->
|
|
<div x-show="loading" class="text-center py-12 text-gray-500">
|
|
<svg class="inline w-6 h-6 animate-spin mr-2" fill="none" viewBox="0 0 24 24">
|
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
|
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
|
|
</svg>
|
|
Loading...
|
|
</div>
|
|
|
|
<!-- Error -->
|
|
<div x-show="error" x-cloak class="mb-6 p-4 bg-red-50 border border-red-200 rounded-lg">
|
|
<p class="text-sm text-red-800" x-text="error"></p>
|
|
</div>
|
|
|
|
<!-- Success Message -->
|
|
<div x-show="successMessage" x-cloak class="mb-6 p-4 bg-green-50 border border-green-200 rounded-lg">
|
|
<p class="text-sm text-green-800" x-text="successMessage"></p>
|
|
</div>
|
|
|
|
<!-- Subscription Info -->
|
|
<div x-show="!loading && subscription" class="space-y-6">
|
|
|
|
<!-- Main Details Card -->
|
|
<div class="bg-white rounded-lg shadow-sm border border-gray-200">
|
|
<div class="px-6 py-4 border-b border-gray-200 flex items-center justify-between">
|
|
<h3 class="text-lg font-semibold text-gray-900" x-text="subscription?.platform_name || 'Subscription'"></h3>
|
|
<span class="px-3 py-1 text-sm font-semibold rounded-full"
|
|
:class="{
|
|
'bg-green-100 text-green-800': subscription?.status === 'active',
|
|
'bg-blue-100 text-blue-800': subscription?.status === 'trial',
|
|
'bg-yellow-100 text-yellow-800': subscription?.status === 'past_due',
|
|
'bg-red-100 text-red-800': subscription?.status === 'cancelled',
|
|
'bg-gray-100 text-gray-600': subscription?.status === 'expired'
|
|
}"
|
|
x-text="subscription?.status?.replace('_', ' ').toUpperCase()"></span>
|
|
</div>
|
|
<div class="p-6">
|
|
<dl class="grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Tier</dt>
|
|
<dd class="mt-1 text-lg font-semibold text-gray-900" x-text="capitalize(subscription?.tier)"></dd>
|
|
</div>
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Billing Period</dt>
|
|
<dd class="mt-1 text-lg font-semibold text-gray-900" x-text="subscription?.is_annual ? 'Annual' : 'Monthly'"></dd>
|
|
</div>
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Period End</dt>
|
|
<dd class="mt-1 text-lg font-semibold text-gray-900" x-text="formatDate(subscription?.period_end)"></dd>
|
|
</div>
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Platform</dt>
|
|
<dd class="mt-1 text-sm text-gray-700" x-text="subscription?.platform_name || '-'"></dd>
|
|
</div>
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Created</dt>
|
|
<dd class="mt-1 text-sm text-gray-700" x-text="formatDate(subscription?.created_at)"></dd>
|
|
</div>
|
|
<div>
|
|
<dt class="text-sm font-medium text-gray-500">Auto Renew</dt>
|
|
<dd class="mt-1 text-sm text-gray-700" x-text="subscription?.auto_renew !== false ? 'Yes' : 'No'"></dd>
|
|
</div>
|
|
</dl>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Feature Limits Card -->
|
|
<div class="bg-white rounded-lg shadow-sm border border-gray-200">
|
|
<div class="px-6 py-4 border-b border-gray-200">
|
|
<h3 class="text-lg font-semibold text-gray-900">Plan Features</h3>
|
|
</div>
|
|
<div class="p-6">
|
|
<div class="grid grid-cols-1 gap-4 sm:grid-cols-3">
|
|
<template x-for="fl in (subscription?.tier?.feature_limits || subscription?.feature_limits || [])" :key="fl.feature_code">
|
|
<div class="p-4 bg-gray-50 rounded-lg">
|
|
<p class="text-sm text-gray-500" x-text="fl.feature_code.replace(/_/g, ' ')"></p>
|
|
<p class="text-xl font-bold text-gray-900" x-text="fl.limit_value || 'Unlimited'"></p>
|
|
</div>
|
|
</template>
|
|
<template x-if="!(subscription?.tier?.feature_limits || subscription?.feature_limits || []).length">
|
|
<div class="p-4 bg-gray-50 rounded-lg sm:col-span-3">
|
|
<p class="text-sm text-gray-500 text-center">No feature limits configured for this tier</p>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Change Plan -->
|
|
<div x-show="availableTiers.length > 0 && (subscription?.status === 'active' || subscription?.status === 'trial')"
|
|
class="bg-white rounded-lg shadow-sm border border-gray-200">
|
|
<div class="px-6 py-4 border-b border-gray-200">
|
|
<h3 class="text-lg font-semibold text-gray-900">Change Plan</h3>
|
|
</div>
|
|
<div class="p-6 grid grid-cols-1 sm:grid-cols-3 gap-4">
|
|
<template x-for="t in availableTiers" :key="t.code">
|
|
<div class="p-4 border rounded-lg transition-colors"
|
|
:class="t.is_current ? 'border-indigo-500 bg-indigo-50' : 'border-gray-200 hover:border-gray-300'">
|
|
<h4 class="font-semibold text-gray-900" x-text="t.name"></h4>
|
|
<p class="text-sm text-gray-500 mt-1" x-text="formatCurrency(t.price_monthly_cents) + '/mo'"></p>
|
|
<template x-if="t.is_current">
|
|
<span class="inline-block mt-3 px-3 py-1 text-xs font-semibold text-indigo-700 bg-indigo-100 rounded-full">Current Plan</span>
|
|
</template>
|
|
<template x-if="!t.is_current">
|
|
<button @click="changeTier(t.code)"
|
|
:disabled="changingTier"
|
|
class="mt-3 inline-flex items-center px-4 py-2 text-sm font-medium text-white rounded-lg transition-colors disabled:opacity-50"
|
|
:class="t.can_upgrade ? 'bg-indigo-600 hover:bg-indigo-700' : 'bg-gray-600 hover:bg-gray-700'"
|
|
x-text="changingTier ? 'Processing...' : (t.can_upgrade ? 'Upgrade' : 'Downgrade')">
|
|
</button>
|
|
</template>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
</div>
|
|
{% endblock %}
|
|
|
|
{% block extra_scripts %}
|
|
<script>
|
|
function merchantSubscriptionDetail() {
|
|
return {
|
|
loading: true,
|
|
error: null,
|
|
successMessage: null,
|
|
subscription: null,
|
|
availableTiers: [],
|
|
changingTier: false,
|
|
|
|
init() {
|
|
this.loadSubscription();
|
|
},
|
|
|
|
getToken() {
|
|
const match = document.cookie.match(/(?:^|;\s*)merchant_token=([^;]*)/);
|
|
return match ? decodeURIComponent(match[1]) : null;
|
|
},
|
|
|
|
getPlatformId() {
|
|
// Extract platform_id from URL: /merchants/billing/subscriptions/{platform_id}
|
|
const parts = window.location.pathname.split('/');
|
|
return parts[parts.length - 1];
|
|
},
|
|
|
|
async loadSubscription() {
|
|
const token = this.getToken();
|
|
if (!token) {
|
|
window.location.href = '/merchants/login';
|
|
return;
|
|
}
|
|
|
|
const platformId = this.getPlatformId();
|
|
try {
|
|
const resp = await fetch(`/api/v1/merchants/billing/subscriptions/${platformId}`, {
|
|
headers: { 'Authorization': `Bearer ${token}` }
|
|
});
|
|
if (resp.status === 401) {
|
|
window.location.href = '/merchants/login';
|
|
return;
|
|
}
|
|
if (!resp.ok) throw new Error('Failed to load subscription');
|
|
const data = await resp.json();
|
|
this.subscription = data.subscription || data;
|
|
} catch (err) {
|
|
console.error('Error:', err);
|
|
this.error = 'Failed to load subscription details.';
|
|
} finally {
|
|
this.loading = false;
|
|
}
|
|
|
|
// Load available tiers after subscription is loaded
|
|
await this.loadAvailableTiers(platformId);
|
|
},
|
|
|
|
async loadAvailableTiers(platformId) {
|
|
const token = this.getToken();
|
|
if (!token) return;
|
|
|
|
try {
|
|
const resp = await fetch(`/api/v1/merchants/billing/subscriptions/${platformId}/tiers`, {
|
|
headers: { 'Authorization': `Bearer ${token}` }
|
|
});
|
|
if (!resp.ok) return;
|
|
const data = await resp.json();
|
|
this.availableTiers = data.tiers || [];
|
|
} catch (err) {
|
|
console.error('Failed to load tiers:', err);
|
|
}
|
|
},
|
|
|
|
async changeTier(tierCode) {
|
|
if (!confirm(`Are you sure you want to change your plan to this tier?`)) return;
|
|
|
|
this.changingTier = true;
|
|
this.error = null;
|
|
this.successMessage = null;
|
|
|
|
const token = this.getToken();
|
|
const platformId = this.getPlatformId();
|
|
|
|
try {
|
|
const resp = await fetch(`/api/v1/merchants/billing/subscriptions/${platformId}/change-tier`, {
|
|
method: 'POST',
|
|
headers: {
|
|
'Authorization': `Bearer ${token}`,
|
|
'Content-Type': 'application/json'
|
|
},
|
|
body: JSON.stringify({ tier_code: tierCode, is_annual: this.subscription?.is_annual || false })
|
|
});
|
|
if (!resp.ok) {
|
|
const data = await resp.json();
|
|
throw new Error(data.detail || 'Failed to change tier');
|
|
}
|
|
const result = await resp.json();
|
|
this.successMessage = result.message || 'Plan changed successfully.';
|
|
|
|
// Reload data
|
|
this.loading = true;
|
|
await this.loadSubscription();
|
|
} catch (err) {
|
|
this.error = err.message;
|
|
} finally {
|
|
this.changingTier = false;
|
|
}
|
|
},
|
|
|
|
capitalize(str) {
|
|
if (!str) return '-';
|
|
return str.charAt(0).toUpperCase() + str.slice(1);
|
|
},
|
|
|
|
formatCurrency(cents) {
|
|
if (cents === null || cents === undefined) return '-';
|
|
return new Intl.NumberFormat('de-LU', {
|
|
style: 'currency',
|
|
currency: 'EUR'
|
|
}).format(cents / 100);
|
|
},
|
|
|
|
formatDate(dateStr) {
|
|
if (!dateStr) return '-';
|
|
return new Date(dateStr).toLocaleDateString('en-GB', { day: 'numeric', month: 'short', year: 'numeric' });
|
|
}
|
|
};
|
|
}
|
|
</script>
|
|
{% endblock %}
|