symposion_app Changeset - 613667aa30e9

Changeset - 613667aa30e9

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Christopher Neugebauer - 8 years ago 2016-09-14 22:31:35
chrisjrn@gmail.com

Re-arranges invoice generation code.

- Reduces number of db queries
- Localises the code that interrogates the cart and the code that generates the invoice itself.

1 file changed with 31 insertions and 28 deletions:

registrasion/controllers/invoice.py

0 comments (0 inline, 0 general)

registrasion/controllers/invoice.py

➞

Show inline comments

@@ ... / @@ -79,26 +79,7 @@ class InvoiceController(ForId, object): @@
         cart.refresh_from_db()
         issued = timezone.now()
         reservation_limit = cart.reservation_duration + cart.time_last_updated
         # Never generate a due time that is before the issue time
         due = max(issued, reservation_limit)
         # Get the invoice recipient
         profile = people.AttendeeProfileBase.objects.get_subclass(
             id=cart.user.attendee.attendeeprofilebase.id,
+        )
         recipient = profile.invoice_recipient()
         invoice = commerce.Invoice.objects.create(
             user=cart.user,
             cart=cart,
             cart_revision=cart.revision,
             status=commerce.Invoice.STATUS_UNPAID,
             value=Decimal(),
             issue_time=issued,
             due_time=due,
             recipient=recipient,
+        )
         # Generate the line items from the cart.
         product_items = commerce.ProductItem.objects.filter(cart=cart)
         product_items = product_items.select_related(
@@ ... / @@ -129,34 +110,56 @@ class InvoiceController(ForId, object): @@
             description = discount.description
             return "%s (%s)" % (description, format_product(product))
         invoice_value = Decimal()
         for item in product_items:
             product = item.product
             line_item = commerce.LineItem(
                 invoice=invoice,
                 description=format_product(product),
                 quantity=item.quantity,
                 price=product.price,
                 product=product,
+            )
             line_items.append(line_item)
             invoice_value += line_item.quantity * line_item.price
         for item in discount_items:
             line_item = commerce.LineItem(
                 invoice=invoice,
                 description=format_discount(item.discount, item.product),
                 quantity=item.quantity,
                 price=cls.resolve_discount_value(item) * -1,
                 product=item.product,
+            )
             line_items.append(line_item)
             invoice_value += line_item.quantity * line_item.price
-        commerce.LineItem.objects.bulk_create(line_items)
+        # Generate the invoice
         invoice.value = invoice_value
         user = cart.user
         reservation_limit = cart.reservation_duration + cart.time_last_updated
         # Never generate a due time that is before the issue time
         issued = timezone.now()
         due = max(issued, reservation_limit)
         # Get the invoice recipient
         profile = people.AttendeeProfileBase.objects.get_subclass(
             id=user.attendee.attendeeprofilebase.id,
+        )
         recipient = profile.invoice_recipient()
         invoice_value = sum(item.quantity * item.price for item in line_items)
         invoice.save()
         invoice = commerce.Invoice.objects.create(
             user=user,
             cart=cart,
             cart_revision=cart.revision,
             status=commerce.Invoice.STATUS_UNPAID,
             value=invoice_value,
             issue_time=issued,
             due_time=due,
             recipient=recipient,
+        )
         # Associate the line items with the invoice
         for line_item in line_items:
             line_item.invoice = invoice
         commerce.LineItem.objects.bulk_create(line_items)
         cls.email_on_invoice_creation(invoice)

0 comments (0 inline, 0 general)