Compare commits

..

No commits in common. "1f7b466bb0498b78418bd5bd78040c667bd6eb1d" and "5cfe6d609320f623fb3839e83fa8a37eedde59d1" have entirely different histories.

16 changed files with 4 additions and 9595164 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2732,14 +2732,14 @@ class Vendor(models.Model, LocalizedNameMixin):
) )
arabic_name = models.CharField(max_length=255, verbose_name=_("Arabic Name")) arabic_name = models.CharField(max_length=255, verbose_name=_("Arabic Name"))
name = models.CharField(max_length=255, verbose_name=_("English Name")) name = models.CharField(max_length=255, verbose_name=_("English Name"))
contact_person = models.CharField(max_length=100, verbose_name=_("Contact Person"),null=True, blank=True) contact_person = models.CharField(max_length=100, verbose_name=_("Contact Person"))
phone_number = models.CharField( phone_number = models.CharField(
max_length=255, max_length=255,
verbose_name=_("Phone Number"), verbose_name=_("Phone Number"),
validators=[SaudiPhoneNumberValidator()], validators=[SaudiPhoneNumberValidator()],
) )
email = models.EmailField(max_length=255, verbose_name=_("Email Address")) email = models.EmailField(max_length=255, verbose_name=_("Email Address"))
address = models.CharField(max_length=255, verbose_name=_("Address"),null=True, blank=True) address = models.CharField(max_length=200, verbose_name=_("Address"))
logo = models.ImageField( logo = models.ImageField(
upload_to="logos/vendors", upload_to="logos/vendors",
blank=True, blank=True,

View File

@ -764,7 +764,6 @@
</div> </div>
{% if perms.inventory.change_opportunity %}<div class="col-auto"></div>{% endif %} {% if perms.inventory.change_opportunity %}<div class="col-auto"></div>{% endif %}
</div> </div>
<div id="timeline">
{% for activity in opportunity.get_activities %} {% for activity in opportunity.get_activities %}
<div class="border-bottom border-translucent py-4"> <div class="border-bottom border-translucent py-4">
<div class="d-flex"> <div class="d-flex">
@ -814,7 +813,6 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -445,8 +445,10 @@
<a class="nav-link ps-2" href="{% if request.is_dealer%}{% url 'ticket_list' request.dealer.slug %} {% else %}#{%endif%}"> <a class="nav-link ps-2" href="{% if request.is_dealer%}{% url 'ticket_list' request.dealer.slug %} {% else %}#{%endif%}">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
{% if user.is_authenticated%} {% if user.is_authenticated%}
<span class="nav-link-icon"><span class="fa-solid fa-gear me-1 fs-7"></span></span> <span class="nav-link-icon"><span class="fa-solid fa-gear me-1 fs-7"></span></span>
<span class="nav-link-text">{{ request.dealer.user.username }}</span> <span class="nav-link-text">{{ request.dealer.user.username }}</span>
{% endif %} {% endif %}
</div> </div>
</a> </a>