From 3a6d2408ff6038b51f45a5e1eea82db961c3e679 Mon Sep 17 00:00:00 2001
From: gitea <ismail.mosa.ibrahim@gmail.com>
Date: Wed, 25 Dec 2024 15:33:36 +0000
Subject: [PATCH] some updates

---
 .../migrations/0022_merge_20241225_1754.py    | 14 ++++++++++++++
 .../migrations/0023_remove_dealer_email.py    | 17 +++++++++++++++++
 inventory/migrations/0024_dealer_email.py     | 19 +++++++++++++++++++
 inventory/models.py                           |  3 +--
 inventory/signals.py                          |  3 +--
 templates/base.html                           |  6 ++++--
 6 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 inventory/migrations/0022_merge_20241225_1754.py
 create mode 100644 inventory/migrations/0023_remove_dealer_email.py
 create mode 100644 inventory/migrations/0024_dealer_email.py

diff --git a/inventory/migrations/0022_merge_20241225_1754.py b/inventory/migrations/0022_merge_20241225_1754.py
new file mode 100644
index 00000000..b69fff19
--- /dev/null
+++ b/inventory/migrations/0022_merge_20241225_1754.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.2.17 on 2024-12-25 14:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0017_dealer_email'),
+        ('inventory', '0021_remove_additionalservices_vatable_and_more'),
+    ]
+
+    operations = [
+    ]
diff --git a/inventory/migrations/0023_remove_dealer_email.py b/inventory/migrations/0023_remove_dealer_email.py
new file mode 100644
index 00000000..42c5ffd4
--- /dev/null
+++ b/inventory/migrations/0023_remove_dealer_email.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.17 on 2024-12-25 15:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0022_merge_20241225_1754'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dealer',
+            name='email',
+        ),
+    ]
diff --git a/inventory/migrations/0024_dealer_email.py b/inventory/migrations/0024_dealer_email.py
new file mode 100644
index 00000000..524efd73
--- /dev/null
+++ b/inventory/migrations/0024_dealer_email.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.17 on 2024-12-25 15:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0023_remove_dealer_email'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dealer',
+            name='email',
+            field=models.EmailField(default='ismail@tenhal.com', max_length=254, unique=True, verbose_name='Email'),
+            preserve_default=False,
+        ),
+    ]
diff --git a/inventory/models.py b/inventory/models.py
index ed06a68f..cbba93d3 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -499,6 +499,7 @@ class Dealer(models.Model, LocalizedNameMixin):
         upload_to="logos/users", blank=True, null=True, verbose_name=_("Logo")
     )
     joined_at = models.DateTimeField(auto_now_add=True, verbose_name=_("Joined At"))
+    # entity = models.ForeignKey(EntityModel,on_delete=models.CASCADE,null=True,blank=True)
     email = models.EmailField(unique=True, verbose_name=_("Email"))
     parent_dealer = models.ForeignKey(
         "self",
@@ -535,8 +536,6 @@ class Dealer(models.Model, LocalizedNameMixin):
         return None
 
 
-
-
     class Meta:
         verbose_name = _("Dealer")
         verbose_name_plural = _("Dealers")        
diff --git a/inventory/signals.py b/inventory/signals.py
index f5adbeed..437e9510 100644
--- a/inventory/signals.py
+++ b/inventory/signals.py
@@ -66,8 +66,7 @@ def create_ledger_entity(sender, instance, created, **kwargs):
     if created:
         entity, created = EntityModel.objects.get_or_create(
             name=instance.get_root_dealer.name,
-            admin=instance.get_root_dealer.user,
-            # address_1=instance.address,
+            admin=instance.get_root_dealer.user,            
             accrual_method=False,
             fy_start_month=1,
             depth=0,
diff --git a/templates/base.html b/templates/base.html
index 3e595344..db0b2cbc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -418,8 +418,9 @@
               {% if user.is_authenticated and user.dealer or user.subdealer%}
             <li class="nav-item dropdown"><a class="nav-link lh-1 pe-0" id="navbarDropdownUser" role="button" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-haspopup="true" aria-expanded="false">
                 <div class="avatar avatar-l ">
+                  {% if user.dealer.logo %}
                   <img class="rounded-circle " src="{{ user.dealer.logo.url }}" alt="" />
-
+                  {% endif %}
                 </div>
               </a>
               <div class="dropdown-menu dropdown-menu-end navbar-dropdown-caret py-0 dropdown-profile shadow border" aria-labelledby="navbarDropdownUser">
@@ -427,8 +428,9 @@
                   <div class="card-body p-0">
                     <div class="text-center pt-4 pb-3">
                       <div class="avatar avatar-xl ">
+                        {% if user.dealer.logo %}
                         <img class="rounded-circle " src="{{ user.dealer.logo.url }}" alt="" />
-
+                        {% endif %}
                       </div>
                       <h6 class="mt-2 text-body-emphasis">{{ user.dealer.get_local_name }}</h6>
                     </div>