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

Merge pull request #378 from flokli/shopticket-backoffice-quantity

Browse source 
Show Quantity of ShopTickets in backoffice
This commit is contained in:
Víðir Valberg Guðmundsson 2019-08-09 10:19:26 +02:00 committed by GitHub
parent 9dd6b0b23c aa252c3d11
commit 66c2224806
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/backoffice/templates/info_desk/scan.html
View file

@ -56,6 +56,13 @@
<strong>Product:</strong> <strong>Product:</strong>
<td> <td>
{{ ticket.product }} {{ ticket.product }}
{% if ticket.ticket_type.single_ticket_per_product and ticket.shortname == "shop" %}
<tr>
<td>
<strong>Quantity:</strong>
<td>
{{ ticket.orp.quantity }}
{% endif %}
<tr> <tr>
<td> <td>
<strong>Order:</strong> <strong>Order:</strong>

2
src/profiles/templates/tickets/ticket_list.html
View file

@ -40,7 +40,7 @@
<td> <td>
{{ ticket.product.name }} {{ ticket.product.name }}
<td> <td>
{% if ticket.ticket_type.single_ticket_per_product %}{{ ticket.get_orp.quantity }} &times; {% endif %} {% if ticket.ticket_type.single_ticket_per_product %}{{ ticket.orp.quantity }} &times; {% endif %}
{{ ticket.product.price|currency }} {{ ticket.product.price|currency }}
<td> <td>
{% if ticket.used %} {% if ticket.used %}

6
src/tickets/models.py
View file

@ -93,8 +93,7 @@ class BaseTicket(CampRelatedModel, UUIDModel):
formatdict = {"ticket": self} formatdict = {"ticket": self}
if self.ticket_type.single_ticket_per_product and self.shortname == "shop": if self.ticket_type.single_ticket_per_product and self.shortname == "shop":
orp = self.get_orp() formatdict["quantity"] = self.orp.quantity
formatdict["quantity"] = orp.quantity
return generate_pdf_letter( return generate_pdf_letter(
filename="{}_ticket_{}.pdf".format(self.shortname, self.pk), filename="{}_ticket_{}.pdf".format(self.shortname, self.pk),
@ -165,5 +164,6 @@ class ShopTicket(BaseTicket):
def shortname(self): def shortname(self):
return "shop" return "shop"
def get_orp(self): @property
def orp(self):
return OrderProductRelation.objects.get(product=self.product, order=self.order) return OrderProductRelation.objects.get(product=self.product, order=self.order)