Code to add notifications of new transaction chats

Author: jjeffryes

js/languages/en-US.json

@@ -32,6 +32,7 @@
   "GoToOneName": "Go to Onename.com",
   "GoToOneNameTooltip": "Create an ID at Onename.com, and under App Accounts enter openbazaar as the app name and your guid as the account identifier (your guid is on your page, in the About tab). Verification can take up to several days.",
   "ChangeCurrency": "Change currency",
+  "ChangeCurrencyHelp": "Clicking this will take you to the settings view and will lose any changes you have made.",
   "SKU": "SKU",
   "Refurbished": "Refurbished",
   "Physical": "Physical",
@@ -220,6 +221,7 @@
   "NotificationRefund": "%{name} has refunded your order.",
   "NoticationOrderStatus": "Order status updated, buyer notified.",
   "NotificationNewOrder": "%{name} has made a purchase.",
+  "NotificationNewTransactionMessage": "%{name} has sent you a new message about a transaction.",
   "NotificationTitle": "Title: %{title}",
   "NotificationFrom": "From: %{name}",
   "NotificationType": "Type: %{type}",

js/templates/itemEdit.html

@@ -95,7 +95,7 @@ <h5><%= polyglot.t('Listing') %></h5>
                   <%= polyglot.t('Price') %> (<%= ob.userCurrencyCode %>)
                 </label>
                 <div class="underline note rowTop5">
-                  <a href="#settings"><%= polyglot.t('ChangeCurrency') %></a>
+                  <a href="#settings" class="tooltip tooltip-box" data-tooltip="<%= polyglot.t('ChangeCurrencyHelp') %>"><%= polyglot.t('ChangeCurrency') %></a>
                 </div>
               </div>
             </div>

js/templates/notification.html

@@ -4,6 +4,7 @@
     <% } %>
     <div class="table">
         <div>
+            <% console.log(ob.type) %>
             <div class="thumbnail clickable custcol-border"
                  style="background-image: <%= ob.cssImageUrl(ob.image_hash, ob.guid, 'imgs/defaultUser.png') %>; height: 50px; width: 50px"></div>
             <div class="txt-lowleading">
@@ -35,6 +36,17 @@
                         <% } %>
                     </div>
                     <div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
+                    <% } else if(ob.type == "ORDER") { %>
+                    <div class="textSize12px row5">
+                        <% if(ob.handle) { %>
+                        <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.handle}) %>
+                        <% }else{ %>
+                            <span class="inlineBlock top3">
+                                <%= polyglot.t('NotificationNewTransactionMessage',{name:ob.guid}) %>
+                            </span>
+                        <% } %>
+                    </div>
+                    <div class="textSize11px floatLeft txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
                     <% } else if(ob.type == "payment received") { %>
                         <div class="textSize12px row5">
                             <% if(ob.handle) { %>

js/views/notificationVw.js

@@ -45,6 +45,9 @@ module.exports = baseVw.extend({
       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'), {trigger: true});
+        break;
     }
 
     this.trigger('notification-click', { view: this });

js/views/pageNavVw.js

@@ -156,15 +156,18 @@ module.exports = baseVw.extend({
         username,
         avatar,
         notif,
+        message,
         notifStamp;
 
-    if (data.hasOwnProperty('notification')) {
-      notif = data.notification;
+    if (data.hasOwnProperty('notification') || data.hasOwnProperty('message') && data.message.subject) {
+      notif = data.notification || data.message;
       username = notif.handle ? notif.handle : notif.guid.substring(0,10) + '...';
-      avatar = notif.image_hash ? app.serverConfig.getServerBaseUrl + '/get_image?hash=' +
-        notif.image_hash + '&guid=' + notif.guid : 'imgs/defaultUser.png';
+      avatar = notif.image_hash || notif.avatar_hash;
+      avatar = avatar ? app.serverConfig.getServerBaseUrl + '/get_image?hash=' +
+        avatar + '&guid=' + notif.guid : 'imgs/defaultUser.png';
+      notif.type = notif.type || notif.message_type;
       notifStamp = Date.now();
-
+      
       this.unreadNotifsViaSocket++;
 
       this.notificationsCl.add(
@@ -193,6 +196,12 @@ module.exports = baseVw.extend({
             silent: true
           });
           break;
+        case "dispute_close":
+          new Notification(window.polyglot.t('NotificationDisputeClosed', {name: username}), {
+            icon: avatar,
+            silent: true
+          });
+          break;
         case "new order":
           new Notification(window.polyglot.t('NotificationNewOrder', {name: username}), {
             icon: avatar,
@@ -217,6 +226,12 @@ module.exports = baseVw.extend({
             silent: true
           });
           break;
+        case "ORDER":
+          new Notification(window.polyglot.t('NotificationNewTransactionMessage', {name: username}), {
+            icon: avatar,
+            silent: true
+          });
+          break;
       }
 
       app.playNotificationSound();