Merge remote-tracking branch 'refs/remotes/origin/master' into tweekIndexes

Author: jjeffryes

css/obBase.css

@@ -198,14 +198,10 @@ form {
   transition: width 0.5s ease;
 }
 
-#ov1 .chatOpen #obContainer {
+#ov1.chatOpen #obContainer {
   width: calc(100% - 230px);
 }
 
-/*#ov1 .chatOpen #obContainer::-webkit-scrollbar {
-  width: 0;
-}
-*/
 #pageNav {
   position: fixed;
   top: 0;
@@ -985,7 +981,7 @@ label.fieldItem {
   transition: right 0.5s ease;
 }
 
-#ov1 .chatOpen .modal-child {
+#ov1.chatOpen .modal-child {
   right: 230px;
 }
 
@@ -1131,7 +1127,7 @@ label.fieldItem {
   transition: margin-left 0.5s ease;
 }
 
-#ov1 .chatOpen #colorbox {
+#ov1.chatOpen #colorbox {
   margin-left: -115px;
 }
 
@@ -3525,7 +3521,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   opacity: .90;
 }
 
-#ov1 .chatOpen .spinner-with-logo {
+#ov1.chatOpen .spinner-with-logo {
   left: calc(50% - 115.5px);
 }
 
@@ -3807,6 +3803,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   line-height: 16px;
   opacity: 1;
   white-space: nowrap;
+  pointer-events: none;
 }
 
 .tooltip.tooltip-left:hover:after{
@@ -4188,7 +4185,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   transition: transform 0.5s ease;
 }
 
-#ov1 .chatOpen .page-connect-modal .content {
+#ov1.chatOpen .page-connect-modal .content {
   transform: translateX(-115.5px);
 }
 

js/languages/en-US.json

@@ -189,6 +189,7 @@
   "AboutPlaceholder": "Full description",
   "BackgroundColor": "Background Color",
   "NotificationPaymentSent": "Payment was sent to",
+  "NotificationPaymentReceived": "Payment was received from",
   "NotificationOrderFor": "placed an order for",
   "NotificationOrderConfirmed": "Your order has been confirmed/shipped",
   "NotificationFollow": "is now following you",

js/templates/notification.html

@@ -48,6 +48,18 @@
                             </span>
                         </div>
                         <div class="textSize11px  txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
+                    <% } else if(ob.type == "rating received") { %>
+                    <div class="textSize12px">
+                        <%= polyglot.t('NotificationPaymentReceived') %>
+                            <span>
+                            <% if(ob.handle) { %>
+                                <%= ob.handle %>.
+                            <% }else{ %>
+                                <span class="noOverflow width91 inlineBlock top3 tooltip" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
+                            <% } %>
+                            </span>
+                    </div>
+                    <div class="textSize11px  txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
                     <% } else if(ob.type == "new order") { %>
                         <div class="textSize12px clearFix">
                             <span>

js/views/homeVw.js

@@ -439,7 +439,6 @@ module.exports = baseVw.extend({
   },
 
   searchItems: function(searchItemsText){
-    console.log("search items "+searchItemsText)
     if(searchItemsText){
       this.searchItemsText = searchItemsText;
       this.clearItems();

js/views/notificationVw.js

@@ -31,6 +31,9 @@ module.exports = baseVw.extend({
         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 "rating received":
         Backbone.history.navigate('#transactions/sales/' + this.model.get('order_id'), {trigger: true});
         break;
       case "order confirmation":

js/views/pageNavVw.js

@@ -479,7 +479,9 @@ module.exports = baseVw.extend({
 
   untrimAddressBar: function(){
     this.addressInput.val(function (i, value) {
-      value = value.startsWith('ob://') ? value : 'ob://' + value;
+      if(value) {
+        value = value.startsWith('ob://') ? value : 'ob://' + value;
+      }
       return value;
     });
   },

js/views/transactionModalVw.js

@@ -310,7 +310,8 @@ module.exports = baseVw.extend({
     var self = this,
         targetForm = this.$el.find('#transactionConfirmForm'),
         confirmData = {},
-        confirmStatus;
+        confirmStatus,
+        targBtn = $(e.target);
 
     confirmData.id = this.orderID;
     confirmStatus = app.statusBar.pushMessage({
@@ -319,37 +320,47 @@ module.exports = baseVw.extend({
       duration: false
     });
 
-    saveToAPI(targetForm, '', this.serverUrl + "confirm_order", function(data){
-      confirmStatus.updateMessage({
-        type: 'confirmed',
-        msg: '<i>' + window.polyglot.t('transactions.UpdateComplete') + '</i>'
-      });
-      setTimeout(function(){
-        confirmStatus && confirmStatus.remove();
-      },3000);
-      }, function(data){
-      //onFail
-      confirmStatus.updateMessage({
-        type: 'warning',
-        msg: '<i>' + window.polyglot.t('transactions.UpdateFailed') + '</i>',
-        duration: 3000
-      });
-      setTimeout(function(){
-        confirmStatus && confirmStatus.remove();
-      },3000);
-    }, confirmData, '', function(){
-      //onInvalid
-      confirmStatus.updateMessage({
-        type: 'warning',
-        msg: '<i>' + window.polyglot.t('transactions.UpdateInvalid') + '</i>',
-        duration: 3000
-      });
-      setTimeout(function(){
-        confirmStatus && confirmStatus.remove();
-      },3000);
-    }, e);
-
-    this.closeModal();
+    targBtn.addClass("loading");
+
+    saveToAPI(targetForm, '', this.serverUrl + "confirm_order",
+        function(data){
+          self.closeModal();
+          confirmStatus.updateMessage({
+            type: 'confirmed',
+            msg: '<i>' + window.polyglot.t('transactions.UpdateComplete') + '</i>'
+          });
+          setTimeout(function(){
+            confirmStatus && confirmStatus.remove();
+          },3000);
+          },
+        /*(function(data){
+          //onFail
+          confirmStatus.updateMessage({
+            type: 'warning',
+            msg: '<i>' + window.polyglot.t('transactions.UpdateFailed') + '</i>',
+            duration: 3000
+          });
+          setTimeout(function(){
+            confirmStatus && confirmStatus.remove();
+          },3000);
+        }*/'',
+        confirmData, '',
+        /*function(){
+          //onInvalid
+          confirmStatus.updateMessage({
+            type: 'warning',
+            msg: '<i>' + window.polyglot.t('transactions.UpdateInvalid') + '</i>',
+            duration: 3000
+          });
+          setTimeout(function(){
+            confirmStatus && confirmStatus.remove();
+          },3000);
+        }*/'')
+        .always(function(){
+          targBtn.removeClass("loading");
+        });
+
+   // this.closeModal();
   },
 
   completeOrder: function(e){