some updates

This commit is contained in:
gitea 2024-12-25 15:33:36 +00:00
parent 35454ec8a1
commit 3a6d2408ff
6 changed files with 56 additions and 6 deletions

View File

@ -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 = [
]

View File

@ -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',
),
]

View File

@ -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,
),
]

View File

@ -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")

View File

@ -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,

View File

@ -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>