05/06 Phase 2: fixed issues
This commit is contained in:
@@ -0,0 +1,128 @@
|
||||
{% extends "admin/layouts/base.html" %}
|
||||
{% block title %}{{ tenant.name }}{% endblock %}
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<div>
|
||||
<h4 class="fw-bold mb-0">{{ tenant.name }}
|
||||
<code class="fs-6 ms-2">{{ tenant.slug }}</code>
|
||||
{% if tenant.is_demo %}<span class="badge bg-info ms-2">Demo</span>{% endif %}
|
||||
</h4>
|
||||
<span class="badge bg-{{ {'active':'success','trial':'primary','suspended':'warning','cancelled':'danger'}.get(tenant.status,'secondary') }} mt-1">
|
||||
{{ tenant.status }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="d-flex gap-2">
|
||||
<a href="{{ url_for('tenants.edit', tenant_id=tenant.id) }}" class="btn btn-outline-secondary btn-sm">
|
||||
<i class="bi bi-pencil me-1"></i>Edit
|
||||
</a>
|
||||
<a href="{{ url_for('billing.add_entry', tenant_id=tenant.id) }}" class="btn btn-outline-primary btn-sm">
|
||||
<i class="bi bi-receipt me-1"></i>Add Billing Entry
|
||||
</a>
|
||||
<a href="{{ url_for('settings_override.set_override', tenant_id=tenant.id) }}" class="btn btn-outline-warning btn-sm">
|
||||
<i class="bi bi-sliders me-1"></i>Set Override
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-3">
|
||||
<div class="card shadow-sm text-center py-3">
|
||||
<div class="fs-4 fw-bold">{{ tenant.plan.name if tenant.plan else '—' }}</div>
|
||||
<div class="text-muted small">Plan</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card shadow-sm text-center py-3">
|
||||
<div class="fs-4 fw-bold">{{ locations|length }}</div>
|
||||
<div class="text-muted small">Locations</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card shadow-sm text-center py-3">
|
||||
<div class="fs-4 fw-bold">{{ users|length }}</div>
|
||||
<div class="text-muted small">Portal Users</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card shadow-sm text-center py-3">
|
||||
<div class="fs-4 fw-bold">{{ overrides|length }}</div>
|
||||
<div class="text-muted small">Active Overrides</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Status change -->
|
||||
<div class="card shadow-sm mb-3">
|
||||
<div class="card-header fw-semibold">Change Status</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ url_for('tenants.set_status', tenant_id=tenant.id) }}"
|
||||
class="d-flex gap-2" onsubmit="return confirm('Change tenant status?')">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<select class="form-select form-select-sm w-auto" name="status">
|
||||
{% for s in ['active', 'trial', 'suspended', 'cancelled'] %}
|
||||
<option value="{{ s }}" {{ 'selected' if tenant.status == s }}>{{ s.capitalize() }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button class="btn btn-dark btn-sm">Apply</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Active overrides -->
|
||||
{% if overrides %}
|
||||
<div class="card shadow-sm mb-3 border-warning">
|
||||
<div class="card-header fw-semibold text-warning-emphasis bg-warning-subtle">
|
||||
<i class="bi bi-sliders me-1"></i>Active Setting Overrides
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm mb-0">
|
||||
<thead><tr><th>Key</th><th>Value</th><th>Set by</th><th>Note</th><th></th></tr></thead>
|
||||
<tbody>
|
||||
{% for ov in overrides %}
|
||||
<tr>
|
||||
<td><code>{{ ov.setting_key }}</code></td>
|
||||
<td>{{ ov.setting_value }}</td>
|
||||
<td class="text-muted small">{{ ov.admin.name if ov.admin else ov.overridden_by }}</td>
|
||||
<td class="text-muted small">{{ ov.note or '—' }}</td>
|
||||
<td>
|
||||
<form method="POST" action="{{ url_for('settings_override.lift_override', override_id=ov.id) }}"
|
||||
onsubmit="return confirm('Lift this override?')">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<button class="btn btn-outline-warning btn-sm">Lift</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Billing history -->
|
||||
{% if billing %}
|
||||
<div class="card shadow-sm mb-3">
|
||||
<div class="card-header fw-semibold">Recent Billing</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm mb-0">
|
||||
<thead><tr><th>Date</th><th>Amount</th><th>Description</th><th>Invoice Ref</th><th>Paid</th></tr></thead>
|
||||
<tbody>
|
||||
{% for b in billing %}
|
||||
<tr>
|
||||
<td class="small">{{ b.created_at.strftime('%Y-%m-%d') }}</td>
|
||||
<td>${{ "%.2f"|format(b.amount) }}</td>
|
||||
<td>{{ b.description }}</td>
|
||||
<td class="text-muted small">{{ b.invoice_ref or '—' }}</td>
|
||||
<td>{{ b.paid_at.strftime('%Y-%m-%d') if b.paid_at else '—' }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<a href="{{ url_for('tenants.index') }}" class="btn btn-outline-secondary btn-sm">
|
||||
<i class="bi bi-arrow-left me-1"></i>Back to Tenants
|
||||
</a>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,77 @@
|
||||
{% extends "admin/layouts/base.html" %}
|
||||
{% block title %}{{ 'Edit' if mode == 'edit' else 'New Tenant' }}{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-7">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header"><h5 class="mb-0">{{ 'Edit Tenant' if mode == 'edit' else 'New Tenant' }}</h5></div>
|
||||
<div class="card-body">
|
||||
{% if error %}<div class="alert alert-danger py-2">{{ error }}</div>{% endif %}
|
||||
<form method="POST" novalidate>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Business Name</label>
|
||||
<input type="text" class="form-control" name="name"
|
||||
value="{{ tenant.name if tenant else '' }}" required>
|
||||
</div>
|
||||
{% if mode == 'create' %}
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Slug <small class="text-muted">(URL-friendly, e.g. my-salon)</small></label>
|
||||
<input type="text" class="form-control" name="slug" pattern="[a-z0-9\-]+"
|
||||
placeholder="lowercase-letters-and-hyphens" required>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Owner Email</label>
|
||||
<input type="email" class="form-control" name="owner_email"
|
||||
value="{{ tenant.owner_email if tenant else '' }}" required>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Plan</label>
|
||||
<select class="form-select" name="plan_id" required>
|
||||
<option value="">— Select a plan —</option>
|
||||
{% for p in plans %}
|
||||
<option value="{{ p.id }}" {{ 'selected' if tenant and tenant.plan_id == p.id }}>
|
||||
{{ p.name }} (${{ "%.2f"|format(p.price_monthly) }}/mo)
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
{% if mode == 'create' %}
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Trial Duration (days)</label>
|
||||
<input type="number" class="form-control" name="trial_days" value="14" min="0" max="90">
|
||||
</div>
|
||||
<hr>
|
||||
<h6 class="fw-semibold mb-3">Owner Account Password</h6>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Password</label>
|
||||
<input type="password" class="form-control" name="owner_password" autocomplete="new-password" required>
|
||||
<div class="form-text">Min 10 chars, uppercase, lowercase, digit.</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Confirm Password</label>
|
||||
<input type="password" class="form-control" name="confirm_password" autocomplete="new-password" required>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Subscription Expires At</label>
|
||||
<input type="datetime-local" class="form-control" name="subscription_expires_at"
|
||||
value="{{ tenant.subscription_expires_at.strftime('%Y-%m-%dT%H:%M') if tenant and tenant.subscription_expires_at else '' }}">
|
||||
</div>
|
||||
<div class="form-check form-switch mb-3">
|
||||
<input class="form-check-input" type="checkbox" name="is_demo" value="1" id="is_demo"
|
||||
{{ 'checked' if tenant and tenant.is_demo }}>
|
||||
<label class="form-check-label" for="is_demo">Demo tenant (read-only)</label>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="d-flex gap-2">
|
||||
<button type="submit" class="btn btn-dark">Save</button>
|
||||
<a href="{{ url_for('tenants.index') }}" class="btn btn-outline-secondary">Cancel</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,58 @@
|
||||
{% extends "admin/layouts/base.html" %}
|
||||
{% block title %}Tenants{% endblock %}
|
||||
{% block content %}
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h4 class="fw-bold mb-0"><i class="bi bi-building me-2"></i>Tenants</h4>
|
||||
<a href="{{ url_for('tenants.create') }}" class="btn btn-dark btn-sm">
|
||||
<i class="bi bi-plus-lg me-1"></i>New Tenant
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm mb-3">
|
||||
<div class="card-body py-2">
|
||||
<form method="GET" class="d-flex gap-2 align-items-center">
|
||||
<label class="text-muted small me-1">Filter by status:</label>
|
||||
{% for s in ['', 'active', 'trial', 'suspended', 'cancelled'] %}
|
||||
<a href="{{ url_for('tenants.index', status=s) }}"
|
||||
class="btn btn-sm {{ 'btn-dark' if status_filter == s else 'btn-outline-secondary' }}">
|
||||
{{ s.capitalize() if s else 'All' }}
|
||||
</a>
|
||||
{% endfor %}
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card shadow-sm">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover mb-0">
|
||||
<thead class="table-dark">
|
||||
<tr>
|
||||
<th>Slug</th><th>Name</th><th>Plan</th><th>Status</th>
|
||||
<th>Owner</th><th>Created</th><th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for t in tenants %}
|
||||
<tr>
|
||||
<td><code>{{ t.slug }}</code>{% if t.is_demo %}<span class="badge bg-info ms-1">Demo</span>{% endif %}</td>
|
||||
<td>{{ t.name }}</td>
|
||||
<td>{{ t.plan.name if t.plan else '—' }}</td>
|
||||
<td>
|
||||
<span class="badge bg-{{ {'active':'success','trial':'primary','suspended':'warning','cancelled':'danger'}.get(t.status,'secondary') }}">
|
||||
{{ t.status }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-muted small">{{ t.owner_email }}</td>
|
||||
<td class="text-muted small">{{ t.created_at.strftime('%Y-%m-%d') }}</td>
|
||||
<td>
|
||||
<a href="{{ url_for('tenants.detail', tenant_id=t.id) }}" class="btn btn-outline-secondary btn-sm">View</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td colspan="7" class="text-center text-muted py-4">No tenants found.</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user