ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

bill detail ui change

Browse Source
This commit is contained in:
Faheedkhan 2025-07-09 12:04:01 +03:00
parent a01704f891
commit a4cb25cfbd
2 changed files with 235 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
templates/bill/bill_detail.html
View File

@ -36,17 +36,17 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container-fluid py-4"> <div class="row mt-3 mb-2">
<div class="row g-4" >
<!-- Left Sidebar --> <div class="col-12 col-md-3">
<div class="col-lg-4"> <div class="row">
<div class="col-12 mb-3">
<div class="card shadow-sm"> <div class="card shadow-sm">
<div class="card-body"> <div class="card-body">
{% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %} {% include 'bill/includes/card_bill.html' with dealer_slug=request.dealer.slug bill=bill entity_slug=view.kwargs.entity_slug style='bill-detail' %}
<div class="d-grid mt-4"> <div class="d-grid mt-4">
<a href="{% url 'bill_list' request.dealer.slug %}" <a href="{% url 'bill_list' request.dealer.slug %}" class="btn btn-phoenix-primary">
class="btn btn-phoenix-primary">
<i class="fas fa-arrow-left me-1"></i> {% trans 'Bill List' %} <i class="fas fa-arrow-left me-1"></i> {% trans 'Bill List' %}
</a> </a>
</div> </div>
@ -54,13 +54,35 @@
</div> </div>
</div> </div>
<!-- Main Content --> </div>
<div class="col-lg-8 "> <div class="col-12">
<div class="card shadow-sm ">
<div class="card-header pb-0">
<div class="d-flex align-items-center mb-2">
<i class="fas fa-sticky-note me-3 text-primary"></i>
<h5 class="mb-0">{% trans 'Bill Notes' %}</h5>
</div>
</div>
{% if perms.django_ledger.change_billmodel%}
<div class="card-body">
{% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %}
</div>
{% endif %}
</div>
</div>
</div>
<div class="col-12 col-md-9">
<div class="row">
<div class="col-12">
{% if bill.is_configured %} {% if bill.is_configured %}
<div class="card mb-4 shadow-sm"> <div class="card mb-3 shadow-sm">
<div class="card-body"> <div class="card-body">
<div class="row text-center g-3"> <div class="row text-center g-3">
<div class="col-md-3"> <div class="col-12 col-md-3">
<div class="border rounded p-3"> <div class="border rounded p-3">
<h6 class="text-uppercase text-xs text-muted mb-2"> <h6 class="text-uppercase text-xs text-muted mb-2">
{% trans 'Cash Account' %}: {% trans 'Cash Account' %}:
@ -75,7 +97,7 @@
</div> </div>
</div> </div>
{% if bill.accrue %} {% if bill.accrue %}
<div class="col-md-3"> <div class="col-12 col-md-3">
<div class="border rounded p-3"> <div class="border rounded p-3">
<h6 class="text-uppercase text-xs text-muted mb-2"> <h6 class="text-uppercase text-xs text-muted mb-2">
{% trans 'Prepaid Account' %}: {% trans 'Prepaid Account' %}:
@ -89,7 +111,7 @@
</h4> </h4>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-12 col-md-3">
<div class="border rounded p-3"> <div class="border rounded p-3">
<h6 class="text-uppercase text-xs text-muted mb-2"> <h6 class="text-uppercase text-xs text-muted mb-2">
{% trans 'Accounts Payable' %}: {% trans 'Accounts Payable' %}:
@ -103,7 +125,7 @@
</h4> </h4>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-12 col-md-3">
<div class="border rounded p-3"> <div class="border rounded p-3">
<h6 class="text-uppercase text-xs text-muted mb-2"> <h6 class="text-uppercase text-xs text-muted mb-2">
{% trans 'Accrued' %} {{ bill.get_progress | percentage }} {% trans 'Accrued' %} {{ bill.get_progress | percentage }}
@ -114,7 +136,7 @@
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="col-md-3 offset-md-6"> <div class="col-12 col-md-3 offset-md-6">
<div class="border rounded p-3"> <div class="border rounded p-3">
<h6 class="text-uppercase text-xs text-muted mb-2"> <h6 class="text-uppercase text-xs text-muted mb-2">
{% trans 'You Still Owe' %} {% trans 'You Still Owe' %}
@ -130,8 +152,12 @@
</div> </div>
{% endif %} {% endif %}
<!-- Bill Items Card -->
<div class="card mb-4 shadow-sm"> </div>
<div class="col-12">
<div class="card mb-3 shadow-sm">
<div class="card-header pb-0"> <div class="card-header pb-0">
<div class="d-flex align-items-center mb-2"> <div class="d-flex align-items-center mb-2">
<i class="fas fa-receipt me-3 text-primary"></i> <i class="fas fa-receipt me-3 text-primary"></i>
@ -211,8 +237,12 @@
</div> </div>
</div> </div>
<!-- Bill Transactions Card -->
<div class="card mb-4 shadow-sm"> </div>
<div class="col-12">
<div class="card mb-3 shadow-sm">
<div class="card-header pb-0"> <div class="card-header pb-0">
<div class="d-flex align-items-center mb-2"> <div class="d-flex align-items-center mb-2">
<i class="fas fa-exchange-alt me-3 text-primary"></i> <i class="fas fa-exchange-alt me-3 text-primary"></i>
@ -224,22 +254,14 @@
</div> </div>
</div> </div>
<!-- Bill Notes Card -->
<div class="card shadow-sm ">
<div class="card-header pb-0">
<div class="d-flex align-items-center mb-2">
<i class="fas fa-sticky-note me-3 text-primary"></i>
<h5 class="mb-0">{% trans 'Bill Notes' %}</h5>
</div>
</div>
{% if perms.django_ledger.change_billmodel%}
<div class="card-body">
{% include 'bill/includes/card_markdown.html' with style='card_1' title='' notes_html=bill.notes_html %}
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% include "bill/includes/mark_as.html" %} {% include "bill/includes/mark_as.html" %}
{% endblock %} {% endblock %}

15
templates/bill/bill_update.html
View File

@ -23,6 +23,21 @@
<i class="fas fa-arrow-left me-2"></i>{% trans 'Back to Bill Detail' %} <i class="fas fa-arrow-left me-2"></i>{% trans 'Back to Bill Detail' %}
</a> </a>
<form action="{% url 'bill-update' dealer_slug=request.dealer.slug entity_slug=view.kwargs.entity_slug bill_pk=bill_model.uuid %}" method="post">
{% csrf_token %}
<div class="mb-3">
{{ form|crispy }}
</div>
<button type="submit" class="btn btn-phoenix-primary w-100 mb-2">
<i class="fas fa-save me-2"></i>{% trans 'Save Bill' %}
</button>
</form>
<a href="{% url 'bill_list' request.dealer.slug %}" <a href="{% url 'bill_list' request.dealer.slug %}"
class="btn btn-phoenix-info w-100 mb-2"> class="btn btn-phoenix-info w-100 mb-2">
<i class="fas fa-list me-2"></i>{% trans 'Bill List' %} <i class="fas fa-list me-2"></i>{% trans 'Bill List' %}