From f59318e61302e6f2562f534adfa12ad1e1cbb127 Mon Sep 17 00:00:00 2001
From: Shreyansh Dwivedi <shreyanshdwivedi1997@gmail.com>
Date: Wed, 14 Aug 2019 18:00:56 +0530
Subject: [PATCH] fix: event invoice fetched correctly in review route

---
 app/routes/event-invoice/paid.js       |  3 +--
 app/routes/event-invoice/review.js     | 31 +++++++++++++-------------
 app/templates/event-invoice/review.hbs |  6 ++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/routes/event-invoice/paid.js b/app/routes/event-invoice/paid.js
index 9acc9659cd9..c8215096b91 100644
--- a/app/routes/event-invoice/paid.js
+++ b/app/routes/event-invoice/paid.js
@@ -3,8 +3,7 @@ import Route from '@ember/routing/route';
 export default class extends Route {
 
   titleToken(model) {
-    let invoice_identifier = model.get('identifier');
-    return this.l10n.t(`Paid Event Invoice -${invoice_identifier}`);
+    return this.l10n.tVar(`Paid Event Invoice - ${model.get('identifier')}`);
   }
 
   model(params) {
diff --git a/app/routes/event-invoice/review.js b/app/routes/event-invoice/review.js
index 4387c38aaf6..441775756b2 100644
--- a/app/routes/event-invoice/review.js
+++ b/app/routes/event-invoice/review.js
@@ -1,21 +1,22 @@
 import Route from '@ember/routing/route';
 
 export default class extends Route {
-  async model(params) {
-    let filterOptions = [
-      {
-        name : 'identifier',
-        op   : 'eq',
-        val  : params.invoice_identifier
-      }
-    ];
-    return {
-      'user' : await this.authManager.currentUser,
-      'data' : await this.store.query('event-invoice', {
-        include : 'event',
-        filter  : filterOptions
-      })
-    };
+  titleToken(model) {
+    return this.l10n.tVar(`Review Event Invoice - ${model.get('identifier')}`);
   }
 
+  model(params) {
+    return this.store.findRecord('event-invoice', params.invoice_identifier, {
+      include : 'event,user',
+      reload  : true
+    });
+  }
+
+  afterModel(model) {
+    if (model.get('status') === 'due') {
+      this.transitionTo('event-invoice.review', model.get('identifier'));
+    } else if (model.get('status') === 'paid') {
+      this.transitionTo('event-invoice.paid', model.get('identifier'));
+    }
+  }
 }
diff --git a/app/templates/event-invoice/review.hbs b/app/templates/event-invoice/review.hbs
index a459c3ed552..e1da718aeb9 100644
--- a/app/templates/event-invoice/review.hbs
+++ b/app/templates/event-invoice/review.hbs
@@ -59,13 +59,13 @@
           <div class="ui padded segment">
             <div class="ui list">
               <div class="item">
-                <strong>{{t 'Event Name'}}:</strong> {{model.data.event.name}}
+                <strong>{{t 'Event Name'}}:</strong> {{model.event.name}}
               </div>
               <div class="item">
-                <strong>{{t 'Date Issued'}}:</strong> {{moment-format model.data.createdAt 'MM/DD/YYYY'}} 
+                <strong>{{t 'Date Issued'}}:</strong> {{moment-format model.createdAt 'MM/DD/YYYY'}} 
               </div>
               <div class="item">
-                <strong>{{t 'Total Invoice Amount'}}:</strong> {{format-number model.data.amount}}
+                <strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol model.event.paymentCurrency}} {{format-number model.amount}}
               </div>
             </div>
           </div>