From 8024a5bd71000dba99bccf7d45cec08134914fc6 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Mon, 26 Oct 2015 18:00:33 -0700
Subject: [PATCH] Clear discount on transition

---
 common/app/routes/Jobs/components/GoToPayPal.jsx |  4 ++--
 common/app/routes/Jobs/components/Preview.jsx    |  8 ++++++++
 common/app/routes/Jobs/flux/Actions.js           | 10 ++++++++++
 common/app/routes/Jobs/flux/Store.js             |  4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/common/app/routes/Jobs/components/GoToPayPal.jsx b/common/app/routes/Jobs/components/GoToPayPal.jsx
index 5f0453cb92..c50b52df92 100644
--- a/common/app/routes/Jobs/components/GoToPayPal.jsx
+++ b/common/app/routes/Jobs/components/GoToPayPal.jsx
@@ -188,11 +188,11 @@ export default contain(
                     </Col>
                     <Col
                       md={ 6 }>
-                        <h4>+{ price }</h4>
+                        <h4>+ { price }</h4>
                     </Col>
                   </Row>
-                  { this.renderDiscount(discountAmount) }
                   { this.renderHighlightPrice(isHighlighted) }
+                  { this.renderDiscount(discountAmount) }
                   <Row>
                     <Col
                       md={ 3 }
diff --git a/common/app/routes/Jobs/components/Preview.jsx b/common/app/routes/Jobs/components/Preview.jsx
index aadd4dd4e4..b0c75a5b7c 100644
--- a/common/app/routes/Jobs/components/Preview.jsx
+++ b/common/app/routes/Jobs/components/Preview.jsx
@@ -1,4 +1,5 @@
 import React, { PropTypes } from 'react';
+import { Lifecycle } from 'react-router';
 import { Panel, Button, Row, Col } from 'react-bootstrap';
 import { contain } from 'thundercats-react';
 
@@ -25,6 +26,8 @@ export default contain(
       jobActions: PropTypes.object
     },
 
+    mixins: [Lifecycle],
+
     componentDidMount() {
       const { appActions, job } = this.props;
       // redirect user in client
@@ -33,6 +36,11 @@ export default contain(
       }
     },
 
+    routerWillLeave() {
+      const { jobActions } = this.props;
+      jobActions.clearPromo();
+    },
+
     render() {
       const { appActions, job, jobActions } = this.props;
 
diff --git a/common/app/routes/Jobs/flux/Actions.js b/common/app/routes/Jobs/flux/Actions.js
index 13c9f41145..72bad3ed2a 100644
--- a/common/app/routes/Jobs/flux/Actions.js
+++ b/common/app/routes/Jobs/flux/Actions.js
@@ -71,6 +71,16 @@ export default Actions({
     return { promoCode: value.replace(/[^\d\w\s]/, '') };
   },
   applyCode: null,
+  clearPromo(foo, undef) {
+    return {
+      price: undef,
+      buttonId: undef,
+      discountAmount: undef,
+      promoCode: undef,
+      promoApplied: false,
+      promoName: undef
+    };
+  },
   applyPromo({
     fullPrice: price,
     buttonId,
diff --git a/common/app/routes/Jobs/flux/Store.js b/common/app/routes/Jobs/flux/Store.js
index 90e7e26598..b7aa5cda3d 100644
--- a/common/app/routes/Jobs/flux/Store.js
+++ b/common/app/routes/Jobs/flux/Store.js
@@ -22,7 +22,8 @@ export default Store({
       setForm,
       setFollowersCount,
       setPromoCode,
-      applyPromo
+      applyPromo,
+      clearPromo
     } = cat.getActions('JobActions');
     const register = createRegistrar(jobsStore);
     register(setter(setJobs));
@@ -32,6 +33,7 @@ export default Store({
     register(setter(setForm));
     register(setter(setPromoCode));
     register(setter(applyPromo));
+    register(setter(clearPromo));
     register(setter(setFollowersCount));
 
     register(transformer(findJob));