From abc64aa7a08ac39e2973a8b798ce277e22ed2729 Mon Sep 17 00:00:00 2001 From: bcomsugi Date: Sun, 31 Dec 2023 03:42:00 +0700 Subject: [PATCH] messages fixed --- .../templates/Invoice/show-customers.html | 15 ++-------- .../templates/Invoice/so_details_form.html | 4 ++- .../templates/Invoice/so_list_form.html | 2 +- django/Invoice/views.py | 15 ++++++---- django/templates/base.html | 30 ++++++++++--------- 5 files changed, 32 insertions(+), 34 deletions(-) diff --git a/django/Invoice/templates/Invoice/show-customers.html b/django/Invoice/templates/Invoice/show-customers.html index 62379c1..ea66135 100644 --- a/django/Invoice/templates/Invoice/show-customers.html +++ b/django/Invoice/templates/Invoice/show-customers.html @@ -4,18 +4,7 @@ {% block title %}Invoice{% endblock title %} {% block body %} - {% comment %} {% if messages %} - - {% endif %} {% endcomment %} - {% if messages %} - - {% endif %} +
@@ -23,7 +12,7 @@
- + diff --git a/django/Invoice/templates/Invoice/so_details_form.html b/django/Invoice/templates/Invoice/so_details_form.html index e06d20b..3f7955b 100644 --- a/django/Invoice/templates/Invoice/so_details_form.html +++ b/django/Invoice/templates/Invoice/so_details_form.html @@ -5,11 +5,13 @@ {% csrf_token %}
-

Choose Items

+ +

{{ customer_fullname }}

+ diff --git a/django/Invoice/templates/Invoice/so_list_form.html b/django/Invoice/templates/Invoice/so_list_form.html index 7e28919..8bb5d21 100644 --- a/django/Invoice/templates/Invoice/so_list_form.html +++ b/django/Invoice/templates/Invoice/so_list_form.html @@ -5,7 +5,7 @@ {% csrf_token %}
-

Choose SO

+

Select SO Customer: {{ customer_fullname }}

diff --git a/django/Invoice/views.py b/django/Invoice/views.py index 8540818..363f2a0 100644 --- a/django/Invoice/views.py +++ b/django/Invoice/views.py @@ -59,7 +59,7 @@ def show_customer(request): if request.method =="POST": customer_name = request.POST.get("customerreffullname") print(f'customer_name: {customer_name}') - context['objects'] = [['abc', 'def', 'ghi', 'jkl']] + # context['objects'] = [['abc', 'def', 'ghi', 'jkl']] context['objects'] = [] if customer_name: @@ -73,8 +73,11 @@ def show_customer(request): open_sales_orders = ini.get_open_so() print(f'open sales orders:{open_sales_orders}') ini=None - if open_sales_orders: - context['objects'] = open_sales_orders + if not open_sales_orders: + messages.info(request, f"There is No open SO for {customer_name}") + return redirect("Invoice:show_customer") + # if open_sales_orders: + context['objects'] = open_sales_orders context['customer_fullname'] = customer_name @@ -331,9 +334,11 @@ def save_inv(request): print(result) if result and ini.status_ok(result): pass - - messages.success(request, 'Invoice Has Been SAVED') + # context['messages']=[{"alert":"info", "message": "invoice Is Good"}] + messages.success(request, f"Invoice No: Has Been SAVED with link SO No. : {unique(df['RefNumber'].to_list())}") + # messages.info(request, 'Invoice Has Been SAVED2') return redirect('Invoice:show_customer') + return render(request, "Invoice/show-customers.html", context) return render(request, "Invoice/so_details_form.html", context) else: return HttpResponse(f"You cannot Save, because There Is No Open Sales Order for Customer: {customer_fullname}") diff --git a/django/templates/base.html b/django/templates/base.html index 4b510de..bbd81bf 100644 --- a/django/templates/base.html +++ b/django/templates/base.html @@ -8,8 +8,8 @@ - - +