diff options
Diffstat (limited to 'app/dispatch/views.py')
| -rw-r--r-- | app/dispatch/views.py | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/app/dispatch/views.py b/app/dispatch/views.py index 75e7a06..32be26c 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -262,7 +262,7 @@ def PaperworkDownload(request, load_id, pk): if os.path.exists(paperwork.document.path): with open(paperwork.document.path, 'rb') as fh: - try: + try: exp = re.compile('\.[^.]*$', re.IGNORECASE) ext = exp.findall(paperwork.document.path) ext = ext[0] @@ -272,7 +272,7 @@ def PaperworkDownload(request, load_id, pk): desc = load.description.replace('"', '') - response = HttpResponse(fh.read(), content_type='application/force-download') + response = HttpResponse(fh.read(), content_type='application/force-download') response['Content-Disposition'] = 'attachment; filename="{}"'.format(smart_str(desc + ext)) response['X-Sendfile'] = smart_str(paperwork.document.path) return response @@ -281,7 +281,7 @@ def PaperworkDownload(request, load_id, pk): -# Invoice +# Invoice class InvoiceList(FilteredListView): template_name = "dispatch/invoice/list.html" model = Invoice @@ -301,10 +301,7 @@ def InvoiceGenerateForDates(request, pk): wk = get_week_dates(datetime.datetime.strftime(start_date, "%m/%d/%Y")) inv = Invoice(user=driver, invoice_date=start_date, due_date=due_date) - - inv.populate_bill_to() - inv.populate_owner() - inv.set_invoice_id() + inv.setup() inv.save() @@ -312,11 +309,6 @@ def InvoiceGenerateForDates(request, pk): return redirect(reverse('invoice_list')) - # print(start_date) - # print(wk) - # print(driver) - # print(inv) - @@ -324,22 +316,22 @@ def InvoiceGenerateForDates(request, pk): # template_name = "dispatch/invoice/edit.html" # model = Invoice # fields = ['invoice_date','due_date'] -# +# # def test_func(self): # # Seems a little hacky at first but it works! # return self.request.user.is_superuser or \ # self.get_object().user.pk is self.request.user.pk -# +# # class InvoiceCreate(CreateView): # template_name = "dispatch/invoice/create.html" # model = Invoice # fields = ['invoice_date', 'due_date'] -# +# # def get(self,request): # if request.user.is_superuser: # self.fields.insert(1,'user') # return super(LoadCreate, self).get(request) -# +# # def form_valid(self, form): # if not self.request.user.is_superuser: # load = form.save(commit=False) |