Display selected currency on the Sales page (fixes #50)

7 files changed, 16 insertions, 6 deletions

diff --git a/routes/sessions.js b/routes/sessions.js
index d01dc4f1..5d22e459 100644
--- a/routes/sessions.js
+++ b/routes/sessions.js
@@ -29,6 +29,7 @@
               badpw: true
             });
           }
+          req.session.user = user;
           return req.login(user, function(err) {
             var re, url;
             if (err) {
diff --git a/routes/transactions.js b/routes/transactions.js
index 8737a2c3..ea7d3771 100644
--- a/routes/transactions.js
+++ b/routes/transactions.js
@@ -11,6 +11,7 @@
     index: function(req, res) {
       return res.render('transactions/index', {
         user: req.params.user,
+        currency: req.session.user.currency,
         layout: 'layout',
         navigation: true,
         js: (function() {
diff --git a/routes/users.js b/routes/users.js
index eddd928c..04574c18 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -207,6 +207,8 @@
           delete req.body.password;
         }
         db.hmset("user:" + req.params.user.toLowerCase(), req.body, function() {
+          req.session.user = req.body;
+          delete req.session.user.password;
           if (req.body.password != null) {
             return bcrypt.hash(req.body.password, 12, function(err, hash) {
               return db.hmset("user:" + (req.params.user.toLowerCase()), {
diff --git a/src/routes/sessions.coffee b/src/routes/sessions.coffee
index 5b1d9f06..6a441c75 100644
--- a/src/routes/sessions.coffee
+++ b/src/routes/sessions.coffee
@@ -17,6 +17,7 @@ module.exports = (passport) ->
           css: (-> global.css),
           badpw: true
         )
+      req.session.user = user
       req.login(user, (err) ->
         if (err) 
           return next(err)
diff --git a/src/routes/transactions.coffee b/src/routes/transactions.coffee
index 794d30d5..445bbc83 100644
--- a/src/routes/transactions.coffee
+++ b/src/routes/transactions.coffee
@@ -4,11 +4,13 @@ moment = require('moment')
 
 module.exports =
   index: (req, res) ->
-    res.render('transactions/index',  
-      user: req.params.user,
-      layout: 'layout',
-      navigation: true,
-      js: (-> global.js), 
+    res.render(
+      'transactions/index'  
+      user: req.params.user
+      currency: req.session.user.currency
+      layout: 'layout'
+      navigation: true
+      js: (-> global.js)
       css: (-> global.css)
     )
 
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index ef295d3c..87fd0f51 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -159,6 +159,9 @@ module.exports = (sessions) ->
       delete req.body.password
 
     db.hmset("user:"+req.params.user.toLowerCase(), req.body, ->
+      req.session.user = req.body
+      delete req.session.user.password
+
       if req.body.password?
         bcrypt.hash(req.body.password, 12, (err, hash) ->
           db.hmset("user:#{req.params.user.toLowerCase()}", password: hash, ->
diff --git a/views/transactions/index.html b/views/transactions/index.html
index a8a07f82..89d58b79 100644
--- a/views/transactions/index.html
+++ b/views/transactions/index.html
@@ -21,7 +21,7 @@
       <th>Time</th>
       <th>Rate</th>
       <th>&nbsp;&nbsp;&nbsp;BTC</th>
-      <th>&nbsp;&nbsp;&nbsp;CAD</th>
+      <th>&nbsp;&nbsp;&nbsp;{{currency}}</th>
     </tr>
   </thead>
   <tbody>