Ability to edit your Invoice Number. Clean up some of the forms for non-admins

1 files changed, 3 insertions, 38 deletions

diff --git a/app/dispatch/models.py b/app/dispatch/models.py
index dd088c4..a1e06d7 100644
--- a/app/dispatch/models.py
+++ b/app/dispatch/models.py
@@ -82,6 +82,9 @@ class UserInvoiceNumber(models.Model):
     user        = models.OneToOneField(User, on_delete=models.CASCADE)
     number      = models.IntegerField(default=1200)
 
+    def get_absolute_url(self):
+        return '/drivers/view/{:d}'.format(self.user.pk)
+
 class Invoice(models.Model):
     user            = models.ForeignKey(User, on_delete=models.CASCADE)
     owner           = models.ForeignKey(Identity, on_delete=models.CASCADE, related_name="owner")
@@ -97,8 +100,6 @@ class Invoice(models.Model):
                 self.owner.name,
                 self.total())
 
-    # def __init__(self, user, invoice_date, due_date):
-    #     super(Invoice, self).__init__()
     def setup(self):
         try:
             uinv = UserInvoiceNumber.objects.get(user=self.user.pk)
@@ -174,42 +175,6 @@ class InvoiceItem(models.Model):
 
 
 
-# class Invoice():
-#     load_ids = []
-#     total = 0.00
-#
-#     def __init__(self, **kwargs):
-#         # self.args = kwargs
-#         if isinstance(kwargs['driver'], User):
-#             self.driver = kwargs['driver']
-#         else:
-#             raise Exception("'driver' must be a Django User instance")
-#
-#         if isinstance(kwargs.get('start_date'), datetime) and isinstance(kwargs.get('end_date'), datetime):
-#             self.start_date = kwargs.get('start_date')
-#             self.end_date = kwargs.get('end_date')
-#         else:
-#             dates = get_week_dates()
-#             self.start_date = dates['start_date']
-#             self.end_date = dates['end_date']
-#
-#         self.loads = Load.objects.filter(user__exact=self.driver.id,
-#                 date__range=(self.start_date, self.end_date))
-#
-#         for l in self.loads:
-#             self.load_ids.append(l.pk)
-#             self.total += float(l.amount)
-#
-#         if isinstance(kwargs.get('bill_to'), Owner):
-#             self.bill_to = kwargs.get('bill_to')
-#         else:
-#             self.bill_to = Owner.objects.get(pk=Settings.objects.get(key='default_owner').value)
-#
-#
-#     def __str__(self):
-#         return "Invoice for {} from {} for: {}".format(self.end_date, self.driver, self.total)
-
-
 
 
 auditlog.register(Customer)