Admin Sales Fixed (#3090)

fossasia · Jan 30, 2017 · c7ba812 · c7ba812
1 parent 7b06621
commit c7ba812
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/app/templates/gentelella/admin/super_admin/sales/summary_base.html b/app/templates/gentelella/admin/super_admin/sales/summary_base.html
@@ -132,19 +132,19 @@
                     {{ item.completed.tickets_count }}
                 </td>
                 <td>
-                    {{ display_currency | currency_symbol }}{{ forex(item.payment_currency, display_currency, item.completed.sales) | money }}
+                    {{ display_currency | currency_symbol }}{{ item.completed.sales | money }}
                 </td>
                 <td>
                     {{ item.placed.tickets_count }}
                 </td>
                 <td>
-                    {{ display_currency | currency_symbol }}{{ forex(item.payment_currency, display_currency, item.placed.sales) | money }}
+                    {{ display_currency | currency_symbol }}{{ item.placed.sales | money }}
                 </td>
                 <td>
                     {{ item.pending.tickets_count }}
                 </td>
                 <td>
-                    {{ display_currency | currency_symbol }}{{ forex(item.payment_currency, display_currency, item.pending.sales) | money }}
+                    {{ display_currency | currency_symbol }}{{ item.pending.sales | money }}
                 </td>
             </tr>
         {% endfor %}

diff --git a/app/views/super_admin/sales.py b/app/views/super_admin/sales.py
@@ -375,25 +375,31 @@ def sales_by_events_view(path):
                     if discount and str(ticket.id) in discount.tickets.split(","):
                         if discount.type == "amount":
                             tickets_summary_event_wise[str(order.event_id)][str(order.status)][
-                                'sales'] += order_ticket.quantity * (ticket.price - discount.value)
+                                'sales'] += forex(order.event.payment_currency, display_currency, \
+                                            order_ticket.quantity * (ticket.price - discount.value))
                             tickets_summary_organizer_wise[str(order.event.creator_id)][str(order.status)][
-                                'sales'] += order_ticket.quantity * (ticket.price - discount.value)
+                                'sales'] += forex(order.event.payment_currency, display_currency, \
+                                            order_ticket.quantity * (ticket.price - discount.value))
                             tickets_summary_location_wise[str(order.event.searchable_location_name)][str(order.status)][
-                                'sales'] += order_ticket.quantity * (ticket.price - discount.value)
+                                'sales'] += forex(order.event.payment_currency, display_currency, \
+                                            order_ticket.quantity * (ticket.price - discount.value))
                         else:
                             tickets_summary_event_wise[str(order.event_id)][str(order.status)]['sales'] += \
-                                order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0)
+                                forex(order.event.payment_currency, display_currency, \
+                                    order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0))
                             tickets_summary_organizer_wise[str(order.event.creator_id)][str(order.status)]['sales'] += \
-                                order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0)
+                                forex(order.event.payment_currency, display_currency, \
+                                    order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0))
                             tickets_summary_location_wise[str(order.event.searchable_location_name)][str(order.status)]['sales'] += \
-                                order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0)
+                                forex(order.event.payment_currency, display_currency, \
+                                    order_ticket.quantity * (ticket.price - discount.value * ticket.price / 100.0))
                     else:
                         tickets_summary_event_wise[str(order.event_id)][str(order.status)][
-                            'sales'] += order_ticket.quantity * ticket.price
+                            'sales'] += forex(order.event.payment_currency, display_currency, order_ticket.quantity * ticket.price)
                         tickets_summary_organizer_wise[str(order.event.creator_id)][str(order.status)][
-                            'sales'] += order_ticket.quantity * ticket.price
+                            'sales'] += forex(order.event.payment_currency, display_currency, order_ticket.quantity * ticket.price)
                         tickets_summary_location_wise[str(order.event.searchable_location_name)][str(order.status)][
-                            'sales'] += order_ticket.quantity * ticket.price
+                            'sales'] += forex(order.event.payment_currency, display_currency, order_ticket.quantity * ticket.price)
     if path == 'events' or path == 'discounted-events':
         return render_template('gentelella/admin/super_admin/sales/by_events.html',
                                tickets_summary=tickets_summary_event_wise,