From 394546dc674680b757213868c69400297de26ee9 Mon Sep 17 00:00:00 2001 From: aminhashemi92 Date: Tue, 9 Sep 2025 16:42:22 +0330 Subject: [PATCH] fix final step --- certificates/models.py | 4 + .../templates/certificates/print.html | 89 +++++++++++++----- certificates/templates/certificates/step.html | 46 +++++---- certificates/views.py | 17 +++- db.sqlite3 | Bin 3088384 -> 3133440 bytes .../invoices/final_settlement_step.html | 4 +- invoices/views.py | 29 +----- processes/admin.py | 4 +- .../templates/processes/instance_summary.html | 26 +++-- 9 files changed, 137 insertions(+), 82 deletions(-) diff --git a/certificates/models.py b/certificates/models.py index 64d53f9..1b3dcaf 100644 --- a/certificates/models.py +++ b/certificates/models.py @@ -1,6 +1,7 @@ from django.db import models from django.contrib.auth import get_user_model from common.models import BaseModel +from _helpers.utils import jalali_converter2 User = get_user_model() @@ -35,4 +36,7 @@ class CertificateInstance(BaseModel): def __str__(self): return f"گواهی {self.process_instance.code}" + def jissued_at(self): + return jalali_converter2(self.issued_at) + diff --git a/certificates/templates/certificates/print.html b/certificates/templates/certificates/print.html index 5bd26c2..d5ef11f 100644 --- a/certificates/templates/certificates/print.html +++ b/certificates/templates/certificates/print.html @@ -1,28 +1,71 @@ -{% extends '_base.html' %} + + + + + + تاییدیه - {{ instance.code }} + {% load static %} -{% block content %} -
-
- {% if template.company and template.company.logo %} - logo - {% endif %} -

{{ cert.rendered_title }}

- {% if template.company %}
{{ template.company.name }}
{% endif %} -
-
- {{ cert.rendered_body|safe }} -
-
-
تاریخ: {{ cert.issued_at }}
-
- {% if template.company and template.company.signature %} - seal + + + + + + + + + + + + + + +
+ +
+
+
شماره درخواست: {{ instance.code }}
+
تاریخ: {{ cert.jissued_at }}
+
+
+ + +
+ {% if template.company and template.company.logo %} + logo {% endif %} -
مهر و امضای شرکت
+

{{ cert.rendered_title }}

+ {% if template.company %} +
{{ template.company.name }}
+ {% endif %} +
+ + +
+ {{ cert.rendered_body|safe }} +
+ + +
+
+
مهر و امضای تایید کننده
+
{{ template.company.name }}
+ {% if template.company and template.company.signature %} + seal + {% endif %} +
-
- -{% endblock %} - + + + diff --git a/certificates/templates/certificates/step.html b/certificates/templates/certificates/step.html index b8923c2..0027d18 100644 --- a/certificates/templates/certificates/step.html +++ b/certificates/templates/certificates/step.html @@ -18,40 +18,49 @@ - {% endblock %} {% block content %} {% include '_toasts.html' %} + + + {% instance_info_modal instance %} + {% csrf_token %}
-
+

{{ step.name }}: {{ instance.process.name }}

- اشتراک آب: {{ instance.well.water_subscription_number|default:"-" }} - | نماینده: {{ instance.representative.profile.national_code|default:"-" }} + {% instance_info instance %}
- پرینت + + پرینت + - بازگشت + + + بازگشت +
-
+
{% stepper_header instance step %}
+
+
+
شماره درخواست: {{ instance.code }}
+
تاریخ: {{ cert.jissued_at }}
+
+
{% if template.company and template.company.logo %} logo @@ -62,21 +71,22 @@
{{ cert.rendered_body|safe }}
-
-
-
تاریخ صدور: {{ cert.issued_at }}
-
+
+
مهر و امضای تایید کننده
+
{{ template.company.name }}
{% if template.company and template.company.signature %} - seal + seal {% endif %} -
مهر و امضای شرکت
{% if previous_step %} - قبلی + + + قبلی + {% else %}{% endif %}
{% csrf_token %} diff --git a/certificates/views.py b/certificates/views.py index 761ee83..8cfb704 100644 --- a/certificates/views.py +++ b/certificates/views.py @@ -33,13 +33,14 @@ def _render_template(template: CertificateTemplate, instance: ProcessInstance): 'company_name': (template.company.name if template.company else '') or '', 'customer_full_name': rep.get_full_name() if rep else '', 'water_subscription_number': getattr(well, 'water_subscription_number', '') or '', - 'address': getattr(well, 'address', '') or '', + 'address': getattr(well, 'county', '') or '', 'visit_date_jalali': _to_jalali(getattr(latest_report, 'visited_date', None)) if latest_report else '', } title = (template.title or '').format(**ctx) body = (template.body or '') + # Render body placeholders with bold values for k, v in ctx.items(): - body = body.replace(f"{{{{ {k} }}}}", str(v)) + body = body.replace(f"{{{{ {k} }}}}", f"{str(v)}") return title, body @@ -50,6 +51,7 @@ def certificate_step(request, instance_id, step_id): # Ensure all previous steps are completed and invoice settled prior_steps = instance.process.steps.filter(order__lt=instance.current_step.order if instance.current_step else 9999) incomplete = StepInstance.objects.filter(process_instance=instance, step__in=prior_steps).exclude(status='completed').exists() + if incomplete: messages.error(request, 'ابتدا همه مراحل قبلی را تکمیل کنید') return redirect('processes:request_list') @@ -87,6 +89,17 @@ def certificate_step(request, instance_id, step_id): except Exception: messages.error(request, 'شما مجوز تایید این مرحله را ندارید') return redirect('processes:step_detail', instance_id=instance.id, step_id=step.id) + # Safety check: ensure ALL previous steps are completed before approval + try: + prev_steps_qs = instance.process.steps.filter(order__lt=step.order) + has_incomplete = StepInstance.objects.filter(process_instance=instance, step__in=prev_steps_qs).exclude(status='completed').exists() + if has_incomplete: + messages.error(request, 'ابتدا همه مراحل قبلی را تکمیل کنید') + return redirect('processes:step_detail', instance_id=instance.id, step_id=step.id) + except Exception: + messages.error(request, 'خطا در بررسی مراحل قبلی') + return redirect('processes:step_detail', instance_id=instance.id, step_id=step.id) + cert.approved = True cert.approved_at = timezone.now() cert.save() diff --git a/db.sqlite3 b/db.sqlite3 index 1bba24daf5d5ee25fb7162099b11379bebd678bd..2808c83c43ecd3107913cfbc223f6ce5d7ceabdd 100644 GIT binary patch delta 23017 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 {% if invoice.remaining_amount != 0 %} {% else %} آیا از تایید این مرحله اطمینان دارید؟ diff --git a/invoices/views.py b/invoices/views.py index b8a1eb2..8820598 100644 --- a/invoices/views.py +++ b/invoices/views.py @@ -1105,7 +1105,7 @@ def delete_final_payment(request, instance_id, step_id, payment_id): return JsonResponse({'success': False, 'message': 'شما مجوز حذف تراکنش تسویه را ندارید'}, status=403) payment.delete() invoice.refresh_from_db() - + # On delete, return to awaiting approval try: si, _ = StepInstance.objects.get_or_create(process_instance=instance, step=step) @@ -1149,30 +1149,3 @@ def delete_final_payment(request, instance_id, step_id, payment_id): 'remaining_amount': str(invoice.remaining_amount), }}) - -@require_POST -@login_required -def approve_final_settlement(request, instance_id, step_id): - instance = get_object_or_404(ProcessInstance, id=instance_id) - step = get_object_or_404(instance.process.steps, id=step_id) - invoice = get_object_or_404(Invoice, process_instance=instance) - # Block approval if any remaining exists (positive or negative) - invoice.calculate_totals() - if invoice.remaining_amount != 0: - return JsonResponse({ - 'success': False, - 'message': f"تا زمانی که مانده فاکتور صفر نشده امکان تایید نیست (مانده فعلی: {invoice.remaining_amount})" - }) - # complete step - step_instance, _ = StepInstance.objects.get_or_create(process_instance=instance, step=step) - step_instance.status = 'completed' - step_instance.completed_at = timezone.now() - step_instance.save() - # move next - next_step = instance.process.steps.filter(order__gt=step.order).first() - redirect_url = reverse('processes:request_list') - if next_step: - instance.current_step = next_step - instance.save() - redirect_url = reverse('processes:step_detail', args=[instance.id, next_step.id]) - return JsonResponse({'success': True, 'message': 'تسویه حساب نهایی ثبت شد', 'redirect': redirect_url}) diff --git a/processes/admin.py b/processes/admin.py index a23a341..0da4cf5 100644 --- a/processes/admin.py +++ b/processes/admin.py @@ -143,9 +143,9 @@ class ProcessInstanceAdmin(SimpleHistoryAdmin): @admin.register(StepInstance) class StepInstanceAdmin(SimpleHistoryAdmin): - list_display = ['process_instance', 'step', 'assigned_to', 'status_display', 'rejection_count', 'edit_count', 'started_at', 'completed_at'] + list_display = ['process_instance', 'process_instance__code', 'step', 'assigned_to', 'status_display', 'rejection_count', 'edit_count', 'started_at', 'completed_at'] list_filter = ['status', 'step__process', 'started_at'] - search_fields = ['process_instance__name', 'step__name', 'assigned_to__username'] + search_fields = ['process_instance__name', 'process_instance__code', 'step__name', 'assigned_to__username'] readonly_fields = ['started_at', 'completed_at'] ordering = ['process_instance', 'step__order'] diff --git a/processes/templates/processes/instance_summary.html b/processes/templates/processes/instance_summary.html index cb5171e..ad84b59 100644 --- a/processes/templates/processes/instance_summary.html +++ b/processes/templates/processes/instance_summary.html @@ -1,7 +1,8 @@ - {% extends '_base.html' %} +{% extends '_base.html' %} {% load static %} {% load humanize %} {% load common_tags %} +{% load processes_tags %} {% block sidebar %} {% include 'sidebars/admin.html' %} @@ -15,23 +16,34 @@ {% block content %} {% include '_toasts.html' %} + + +{% instance_info_modal instance %} + +

گزارش نهایی درخواست {{ instance.code }}

- - اشتراک آب: {{ instance.well.water_subscription_number|default:"-" }} - | نماینده: {{ instance.representative.profile.national_code|default:"-" }} + + {% instance_info instance %}
{% if invoice %} - پرینت فاکتور + + پرینت فاکتور + {% endif %} - پرینت گواهی - بازگشت + + پرینت گواهی + + + + بازگشت +