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 1bba24d..2808c83 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/invoices/templates/invoices/final_settlement_step.html b/invoices/templates/invoices/final_settlement_step.html index 350d5b7..08a5793 100644 --- a/invoices/templates/invoices/final_settlement_step.html +++ b/invoices/templates/invoices/final_settlement_step.html @@ -278,8 +278,8 @@
{% 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 %} - پرینت گواهی - بازگشت + + پرینت گواهی + + + + بازگشت +