fix - missing names

gfavre · Aug 25, 2021 · 65d6e32 · 65d6e32
1 parent 919b278
commit 65d6e32
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/beyondtheadmin/clients/models.py b/beyondtheadmin/clients/models.py
@@ -41,6 +41,12 @@ class Client(UUIDModel):
     class Meta:
         ordering = ('company_name', 'contact_last_name', 'country')
 
+    @property
+    def name(self):
+        if self.is_company:
+            return self.company_name
+        return self.contact_fullname
+
     @property
     def contact_fullname(self):
         if self.contact_last_name:
@@ -52,13 +58,23 @@ def full_contact_email(self):
         if self.contact_fullname:
             return "{} <{}>".format(self.contact_fullname, self.contact_email)
 
+    @property
+    def is_company(self):
+        return self.client_type == self.TYPES.company
+
+    @property
+    def is_person(self):
+        return self.client_type == self.TYPES.person
+
     @property
     def last_invoice_date(self):
         last_invoice = self.invoices.order_by('displayed_date').last()
         if last_invoice:
             return last_invoice.displayed_date
         return None
 
+
+
     def get_absolute_url(self):
         return reverse_lazy('clients:update', kwargs={'pk': self.pk})
 

diff --git a/beyondtheadmin/invoices/views/api.py b/beyondtheadmin/invoices/views/api.py
@@ -27,8 +27,7 @@ class InvoiceLineViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         if 'invoice_pk' not in self.kwargs:
             raise Http404()
-        return InvoiceLine.objects.filter(company__users=self.request.user,
-                                          invoice_id=self.kwargs['invoice_pk'])
+        return InvoiceLine.objects.filter(invoice_id=self.kwargs['invoice_pk'])
 
     def perform_create(self, serializer):
         serializer.save(invoice_id=self.kwargs['invoice_pk'])
diff --git a/beyondtheadmin/templates/base.html b/beyondtheadmin/templates/base.html
@@ -6,7 +6,7 @@
   <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
 
     <!-- Sidebar - Brand -->
-    <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% comment %}{% url 'dashboard' %}{% endcomment %}">
+    <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'dashboard' %}">
       <div class="sidebar-brand-icon rotate-n-15">
         <i class="bi bi-emoji-laughing"></i>
       </div>