Merge pull request #1834 from OpenBazaar/accountForDisputeMessageCaps

Changes logic to handle both upper and lower case on all dispute mess…

Author: jjeffryes

js/templates/notification.html

@@ -13,7 +13,7 @@
                             <%= polyglot.t('NotificationOrderConfirmed') %>
                         </div>
                         <div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).locale(window.lang).format('MMM D, h:mm A') %></div>
-                    <% } else if(ob.type == "dispute_close") { %>
+                    <% } else if(ob.type == "DISPUTE_CLOSE" || ob.type == "dispute_close") { %>
                         <div class="textSize12px row5">
                             <% if(ob.handle) { %>
                             <%= polyglot.t('NotificationDisputeClosed',{name: ob.handle}) %>
@@ -24,7 +24,7 @@
                             <% } %>
                         </div>
                         <div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).locale(window.lang).format('MMM D, h:mm A') %></div>
-                    <% } else if(ob.type == "dispute_open") { %>
+                    <% } else if(ob.type == "DISPUTE_OPEN" || ob.type == "dispute_open") { %>
                     <div class="textSize12px row5">
                         <% if(ob.handle) { %>
                             <%= polyglot.t('NotificationDispute',{name:ob.handle}) %>

js/views/notificationVw.js

@@ -19,34 +19,34 @@ module.exports = baseVw.extend({
   },
 
   notificationClick: function() {
-    switch (this.model.get('type')) {
-    case "follow":
-      Backbone.history.navigate('#userPage/'+ this.model.get('guid') + '/store', {trigger: true});
-      break;
-    case "new order":
-      Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "dispute_open":
-      Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "dispute_close":
-      Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "refund":
-      Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "payment received":
-      Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "order confirmation":
-      Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "rating received":
-      Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
-      break;
-    case "ORDER":
-      Backbone.history.navigate('#transactions/sales/' + this.model.get('subject') +'/discussion', {trigger: true});
-      break;
+    switch (this.model.get('type').toLowerCase()) {
+      case "follow":
+        Backbone.history.navigate('#userPage/'+ this.model.get('guid') + '/store', {trigger: true});
+        break;
+      case "new order":
+        Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "dispute_open":
+        Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "dispute_close":
+        Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "refund":
+        Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "payment received":
+        Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "order confirmation":
+        Backbone.history.navigate('#transactions/purchases/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "rating received":
+        Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
+        break;
+      case "order":
+        Backbone.history.navigate('#transactions/sales/' + this.model.get('subject') +'/discussion', {trigger: true});
+        break;
     }
 
     this.trigger('notification-click', { view: this });
@@ -61,4 +61,4 @@ module.exports = baseVw.extend({
 
     return this;
   }
-});
+});

js/views/pageNavVw.js

@@ -246,7 +246,7 @@ module.exports = baseVw.extend({
           })
       );
 
-      switch (notif.type) {
+      switch (notif.type.toLowerCase()) {
         case "follow":
           new Notification(window.polyglot.t('NotificationFollow', {name: username}), {
             icon: avatar,
@@ -289,7 +289,7 @@ module.exports = baseVw.extend({
             silent: true
           });
           break;
-        case "ORDER":
+        case "order":
           new Notification(window.polyglot.t('NotificationNewTransactionMessage', {name: username}), {
             icon: avatar,
             silent: true