final

fossasia · Nov 1, 2020 · 18a1215 · 18a1215
1 parent bb2ee2e
commit 18a1215
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/templates/components/orders/order-summary.hbs b/app/templates/components/orders/order-summary.hbs
@@ -91,7 +91,8 @@
               <td>
                 <Orders::TicketPrice
                   @ticket={{ticket}}
-                  @currency={{this.eventCurrency}} />
+                  @currency={{this.eventCurrency}}
+                  @amount={{ticket.price}} />
               </td>
               {{#if this.data.discountCode}}
                 <td>{{currency-symbol this.eventCurrency}} {{format-money ticket.discount}}</td>

diff --git a/app/templates/components/orders/ticket-price.hbs b/app/templates/components/orders/ticket-price.hbs
@@ -1,5 +1,5 @@
 {{#if (eq @ticket.type 'free')}}
     {{t "Free"}}
 {{else}}
-    {{currency-symbol @currency}} {{format-money (or @amount @ticket.price)}}
+    {{currency-symbol @currency}} {{format-money @amount}}
 {{/if}}
diff --git a/app/templates/components/public/ticket-list.hbs b/app/templates/components/public/ticket-list.hbs
@@ -51,7 +51,8 @@
                 <div class="{{if ticket.discount 'strike text'}}">
                   <Orders::TicketPrice
                     @ticket={{ticket}}
-                    @currency={{this.eventCurrency}} />
+                    @currency={{this.eventCurrency}}
+                    @amount={{ticket.price}} />
                 </div>
                 {{#if ticket.discount}}
                   <div>