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

Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend

Browse Source
This commit is contained in:
Faheedkhan 2025-07-01 14:14:48 +03:00
commit bf4a3ea3bd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -16,7 +16,7 @@ car_inventory/settings.py
car_inventory/__pycache__ car_inventory/__pycache__
haikalbot/temp_files_not_included haikalbot/temp_files_not_included
scripts/dsrpipe.py scripts/dsrpipe.py
def_venv dev_venv
# Backup files # # Backup files #
*.bak *.bak
play.sh play.sh

12
templates/sales/estimates/estimate_detail.html
View File

@ -54,6 +54,7 @@
</div> </div>
<!-- ============================================--> <!-- ============================================-->
<!-- <section> begin ============================--> <!-- <section> begin ============================-->
<section class="pt-5 pb-9 bg-body-emphasis dark__bg-gray-1200 border-top"> <section class="pt-5 pb-9 bg-body-emphasis dark__bg-gray-1200 border-top">
<div class="row-small mt-3"> <div class="row-small mt-3">
<div class="d-flex justify-content-between align-items-end mb-4 mx-3"> <div class="d-flex justify-content-between align-items-end mb-4 mx-3">
@ -65,9 +66,7 @@
{% elif estimate.status == 'in_review' %} {% elif estimate.status == 'in_review' %}
<span class="badge text-bg-info">{% trans "In Review" %}</span> <span class="badge text-bg-info">{% trans "In Review" %}</span>
{% elif estimate.status == 'approved' %} {% elif estimate.status == 'approved' %}
{% if perms.django_ledger.change_estimatemodel %} <span class="badge text-bg-success">{% trans "Approved" %}</span>
<span class="badge text-bg-success">{% trans "Approved" %}</span>
{% endif %}
{% elif estimate.status == 'completed' %} {% elif estimate.status == 'completed' %}
<span class="badge text-bg-success">{% trans "Completed" %}</span> <span class="badge text-bg-success">{% trans "Completed" %}</span>
{% elif estimate.status == 'canceled' %} {% elif estimate.status == 'canceled' %}
@ -76,12 +75,15 @@
</div> </div>
</div> </div>
<div class="d-flex align-items-center gap-2"> <div class="d-flex align-items-center gap-2">
{% if estimate.status == 'draft' %} {% if estimate.status == 'draft' %}
<a href="{% url 'send_email' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary me-2"><span class="fa-regular fa-paper-plane me-sm-2"></span><span class="d-none d-sm-inline-block">{% trans 'Send Quotation' %}</span></a> <a href="{% url 'send_email' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary me-2"><span class="fa-regular fa-paper-plane me-sm-2"></span><span class="d-none d-sm-inline-block">{% trans 'Send Quotation' %}</span></a>
<button id="mark_as_sent_estimate" class="btn btn-phoenix-secondary" onclick="setFormAction('review')" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Sent' %}</span></button> <button id="mark_as_sent_estimate" class="btn btn-phoenix-secondary" onclick="setFormAction('review')" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Sent' %}</span></button>
{% elif estimate.status == 'in_review' %} {% elif estimate.status == 'in_review' %}
<button id="accept_estimate" onclick="setFormAction('approved')" class="btn btn-phoenix-secondary" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Accept' %}</span></button> {% if perms.django_ledger.can_approve_estimatemodel %}
{% elif estimate.status == 'approved' %} <button id="accept_estimate" onclick="setFormAction('approved')" class="btn btn-phoenix-secondary" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Accept' %}</span></button>
{% endif %}
{% elif estimate.status == 'approved' %}
{% if estimate.sale_orders.first %} {% if estimate.sale_orders.first %}
<!--if sale order exist--> <!--if sale order exist-->