Refactored order invoice & fixed multiple entries bug

fossasia · Jul 2, 2019 · ab7380e · ab7380e
1 parent c856375
commit ab7380e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/app/api/helpers/order.py b/app/api/helpers/order.py
@@ -74,16 +74,10 @@ def create_pdf_tickets_for_holder(order):
             save_to_db(holder)
 
         # create order invoices pdf
-        order_ticket_info_object = OrderTicket.query.filter_by(order_id=order.id)
-        try:
-            order_ticket_info = order_ticket_info_object.one()
-        except MultipleResultsFound:
-            order_ticket_info = order_ticket_info_object.first()
-        except NoResultFound:
-            raise UnprocessableEntity({'pointer': ''}, 'Order Ticket Info missing.')
+        order_tickets = OrderTicket.query.filter_by(order_id=order.id).all()
 
         create_save_pdf(render_template('pdf/order_invoice.html', order=order, event=order.event,
-                        tax=order.event.tax, tickets=order.tickets, order_tickets_info=order_ticket_info),
+                        tax=order.event.tax, tickets=order.tickets, order_tickets=order_tickets),
                         UPLOAD_PATHS['pdf']['order'], dir_path='/static/uploads/pdf/tickets/',
                         identifier=order.identifier, upload_dir='generated/invoices/')
         save_to_db(order)

diff --git a/app/templates/pdf/order_invoice.html b/app/templates/pdf/order_invoice.html
@@ -180,23 +180,27 @@ <h3 style="text-align:center;">{{ ("Order Invoice") }}</h3>
                       </tr>
                     </thead>
                     <tbody>
-                    {% for ticket in tickets %}
+                    {% for order_ticket in order_tickets %}
                       <tr>
-                        <td style="text-align:center">{{ ticket.name }}</td>
-                        <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ ticket.price }}</td>
-                        <td style="text-align:center">{{ order_tickets_info.quantity }}</td>
-                        <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ order_tickets_info.quantity*ticket.price }}</td>
-                        {% if tax %}
-                        <td style="text-align:center">{{ tax.rate }}%</td>
-                        {% else %}
-                        <td style="text-align:center">{{ ("0%") }}</td>
-                        {% endif %}
-                        {% if tax %}
-                        <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ tax.rate*ticket.price/100 }}</td>
-                        {% else %}
-                        <td style="text-align:center">{{ event.payment_currency | currency_symbol }}0</td>
-                        {% endif %}
-                    </tr>
+                        {% for ticket in tickets %}
+                            {% if ticket.id == order_ticket.ticket_id %}
+                              <td style="text-align:center">{{ ticket.name }}</td>
+                              <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ ticket.price }}</td>
+                              <td style="text-align:center">{{ order_ticket.quantity }}</td>
+                              <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ order_ticket.quantity*ticket.price }}</td>
+                              {% if tax %}
+                                <td style="text-align:center">{{ tax.rate }}%</td>
+                              {% else %}
+                                <td style="text-align:center">{{ ("0%") }}</td>
+                              {% endif %}
+                              {% if tax %}
+                                <td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ tax.rate*ticket.price/100 }}</td>
+                              {% else %}
+                                <td style="text-align:center">{{ event.payment_currency | currency_symbol }}0</td>
+                              {% endif %}
+                            {% endif %}
+                        {% endfor %}
+                      </tr>
                     {% endfor %}
                     <tr>
                         <th scope="row"></th>