nngo/MyPOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

05/06 Phase 2: fixed issues 3rd

Browse Source
This commit is contained in:
nngo
2026-05-07 11:44:05 -04:00
parent 50347e95c6
commit 33010fd71b
19 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/tenant/auth/account_locked.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Account Suspended{% endblock %}
{% block content %}
app/templates/tenant/auth/cancelled.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "tenant/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Account Cancelled{% endblock %}
{% block content %}
<div class="row justify-content-center mt-5">
app/templates/tenant/auth/login.html
+2 -4
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Sign In{% endblock %}
{% block content %}
@@ -44,9 +44,7 @@
<a href="{{ url_for('tenant_auth.password_reset_request') }}" class="text-muted small d-block mt-2">
Forgot password?
</a>
<a href="{{ url_for('tenant_auth.demo_login') }}" class="text-muted small d-block mt-1">
View demo account
</a>
</div>
</div>
</div>
app/templates/tenant/auth/password_reset_confirm.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Set New Password{% endblock %}
{% block content %}
app/templates/tenant/auth/password_reset_request.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Reset Password{% endblock %}
{% block content %}
app/templates/tenant/auth/suspended.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "tenant/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Account Suspended{% endblock %}
{% block content %}
<div class="row justify-content-center mt-5">
app/templates/tenant/dashboard/index.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "tenant/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Dashboard{% endblock %}
{% block content %}
<h4 class="mb-4">Dashboard
app/templates/tenant/feature_unavailable.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Feature Unavailable{% endblock %}
{% block content %}
app/templates/tenant/layouts/base.html
+13 -13
View File
@@ -37,7 +37,7 @@
{% for loc in locations %}
<li>
<a class="dropdown-item {% if g.location and g.location.id == loc.id %}active{% endif %}"
href="{{ url_for('locations.switch', location_id=loc.id) }}">
href="{{ '#' }}">
{{ loc.name }}
{% if loc.is_primary %}<span class="badge bg-secondary ms-1">Primary</span>{% endif %}
</a>
@@ -86,74 +86,74 @@
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'appointments' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('appointments.index') }}">
href="{{ '#' }}">
<i class="bi bi-calendar3 me-2"></i>Appointments
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'pos' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('pos.checkout') }}">
href="{{ '#' }}">
<i class="bi bi-cash-register me-2"></i>POS / Checkout
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'customers' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('customers.index') }}">
href="{{ '#' }}">
<i class="bi bi-people me-2"></i>Customers
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'staff' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('staff.index') }}">
href="{{ '#' }}">
<i class="bi bi-person-badge me-2"></i>Staff
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'services' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('services.index') }}">
href="{{ '#' }}">
<i class="bi bi-card-list me-2"></i>Services & Products
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'inventory' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('inventory.index') }}">
href="{{ '#' }}">
<i class="bi bi-box-seam me-2"></i>Inventory
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'gift_cards' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('gift_cards.index') }}">
href="{{ '#' }}">
<i class="bi bi-gift me-2"></i>Gift Cards
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'reconciliation' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('reconciliation.index') }}">
href="{{ '#' }}">
<i class="bi bi-calculator me-2"></i>Reconciliation
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'reports' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('reports.index') }}">
href="{{ '#' }}">
<i class="bi bi-bar-chart-line me-2"></i>Reports
</a>
</li>
{% if current_user.role == 'tenant_admin' %}
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'marketing' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('marketing.index') }}">
href="{{ '#' }}">
<i class="bi bi-megaphone me-2"></i>Marketing
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'locations' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('locations.index') }}">
href="{{ '#' }}">
<i class="bi bi-geo-alt me-2"></i>Locations
</a>
</li>
<li class="nav-item">
<a class="nav-link {% if request.endpoint and 'settings' in request.endpoint %}active fw-bold{% endif %}"
href="{{ url_for('settings.index') }}">
href="{{ '#' }}">
<i class="bi bi-gear me-2"></i>Settings
</a>
</li>
app/templates/tenant/staff_auth/login.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "tenant/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Staff Login{% endblock %}
{% block content %}
<div class="row justify-content-center">
app/templates/tenant/staff_auth/staff_login.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "layouts/base.html" %}
{% extends "tenant/layouts/base.html" %}
{% block title %}Staff Login{% endblock %}
{% block content %}