reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

also generate for instances where pdf is None (happens after instantiating a new)

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2019-07-09 11:46:25 +02:00
parent fa855fb69e
commit 928ab96437
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/shop/invoiceworker.py
View file

@ -1,5 +1,6 @@
from django.conf import settings from django.conf import settings
from django.core.files import File from django.core.files import File
from django.db.models import Q
from utils.pdf import generate_pdf_letter from utils.pdf import generate_pdf_letter
from shop.email import add_invoice_email, add_creditnote_email from shop.email import add_invoice_email, add_creditnote_email
from shop.models import Order, CustomOrder, Invoice, CreditNote from shop.models import Order, CustomOrder, Invoice, CreditNote
@ -18,7 +19,7 @@ def do_work():
""" """
# check if we need to generate any proforma invoices for shop orders # check if we need to generate any proforma invoices for shop orders
for order in Order.objects.filter(pdf="", open__isnull=True): for order in Order.objects.filter(Q(pdf="") | Q(pdf__isnull=True), open__isnull=True):
# generate proforma invoice for this Order # generate proforma invoice for this Order
pdffile = generate_pdf_letter( pdffile = generate_pdf_letter(
filename=order.filename, filename=order.filename,
@ -51,7 +52,7 @@ def do_work():
logger.info("Generated Invoice object for %s" % customorder) logger.info("Generated Invoice object for %s" % customorder)
# check if we need to generate any pdf invoices # check if we need to generate any pdf invoices
for invoice in Invoice.objects.filter(pdf=""): for invoice in Invoice.objects.filter(Q(pdf="") | Q(pdf__isnull=True)):
# generate the pdf # generate the pdf
try: try:
if invoice.customorder: if invoice.customorder:
@ -104,7 +105,7 @@ def do_work():
) )
# check if we need to generate any pdf creditnotes? # check if we need to generate any pdf creditnotes?
for creditnote in CreditNote.objects.filter(pdf=""): for creditnote in CreditNote.objects.filter(Q(pdf="") | Q(pdf__isnull=True)):
# generate the pdf # generate the pdf
try: try:
pdffile = generate_pdf_letter( pdffile = generate_pdf_letter(
@ -140,3 +141,4 @@ def do_work():
"Unable to add creditnote email for creditnote %s to %s" "Unable to add creditnote email for creditnote %s to %s"
% (creditnote.pk, creditnote.user.email) % (creditnote.pk, creditnote.user.email)
) )