From 8b0cf49d6b3053341aec59a8d4f19652558bab75 Mon Sep 17 00:00:00 2001 From: ismail Date: Mon, 1 Sep 2025 13:21:41 +0300 Subject: [PATCH] update --- car_inventory/asgi.py | 16 ++++++++++++++++ inventory/signals.py | 16 +++++++++++++--- templates/account/signup-wizard.html | 4 ---- templates/purchase_orders/po_upload_cars.html | 1 + 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/car_inventory/asgi.py b/car_inventory/asgi.py index 78e43762..941b6cbf 100644 --- a/car_inventory/asgi.py +++ b/car_inventory/asgi.py @@ -46,3 +46,19 @@ application = ProtocolTypeRouter( ), } ) + + +try: + from django.conf import settings + from django.contrib.sites.models import Site + + if not settings.DEBUG: + site = Site.objects.get(id=settings.SITE_ID) + if site.domain != settings.PRODUCTION_DOMAIN: + site.domain = settings.PRODUCTION_DOMAIN + site.name = settings.SITE_NAME + site.save() +except Exception as e: + # Log error but don't crash the app + if settings.DEBUG: + print(f"Site configuration error in WSGI: {e}") \ No newline at end of file diff --git a/inventory/signals.py b/inventory/signals.py index 99b70213..0420e045 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -1001,15 +1001,25 @@ def car_created_notification(sender, instance, created, **kwargs): if created: accountants = ( models.CustomGroup.objects.filter( - dealer=instance.dealer, name__in=["Manager", "Accountant"] + dealer=instance.dealer, name__in=["Accountant"] ) .first() .group.user_set.all() .distinct() ) - for accountant in accountants: + managers = ( + models.CustomGroup.objects.filter( + dealer=instance.dealer, name__in=["Manager"] + ) + .first() + .group.user_set.all() + .distinct() + ) + + recipients = accountants.union(managers) + for recipient in recipients: models.Notification.objects.create( - user=accountant, + user=recipient, message=_( """ New Car {car_make}-{car_model}-{year}-{vin} has been added to the inventory. diff --git a/templates/account/signup-wizard.html b/templates/account/signup-wizard.html index 4ab3304c..7c72c260 100644 --- a/templates/account/signup-wizard.html +++ b/templates/account/signup-wizard.html @@ -372,11 +372,7 @@ hideLoading(); const data = await response.json(); if (response.ok) { -<<<<<<< HEAD - notify("success","{% trans 'Account created successfully'%}"); -======= notify("success","Account created successfully"); ->>>>>>> d3dcb85fa378e156b77550e8ab833ad10ffad51f setTimeout(() => { window.location.href = "{% url 'account_login' %}"; }, 1000); diff --git a/templates/purchase_orders/po_upload_cars.html b/templates/purchase_orders/po_upload_cars.html index 2e3a82f8..4e52cb40 100644 --- a/templates/purchase_orders/po_upload_cars.html +++ b/templates/purchase_orders/po_upload_cars.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load i18n %} {% block content %}