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

Author: jjeffryes

js/templates/orderShort.html

@@ -59,31 +59,32 @@
             </tr>
           </table>
           <div class="floatRight width200">
-            <div class="btn btn-txt height36 custCol-secondary js-orderShort marginBottom5 width100">
-              <%= polyglot.t('transactions.OrderDetails') %>
-            </div>
-            <div class="btn btn-txt height36 custCol-secondary marginBottom5 width100 positionWrapper js-orderShortDiscusson <% if(!ob.unread){ %> hide <% } %>"
-                 data-order="<%= ob.order_id %>">
-              <i class="ion-chatbubbles"></i> <%= polyglot.t('Discussion') %>
-              <div class="badge js-unreadBadge" data-count="<%= ob.unread || 0 %>"></div>
-            </div>
             <% if(ob.transactionType == "purchases" && ob.status == 0){ %>
-              <div class="btn btn-txt height36 custCol-secondary marginBottom5 width100 js-orderShort">
-                <%= polyglot.t('transactions.PayPurchase') %>
-              </div>
+            <div class="btn btn-txt height36 custCol-secondary marginBottom5 width100 js-orderShort">
+              <%= polyglot.t('transactions.PayPurchase') %>
+            </div>
             <% } else if(ob.transactionType == "sales" && ob.status == 1){ %>
-              <div class="btn btn-txt height36 custCol-secondary js-orderShortConfirm marginBottom5 width100">
+            <div class="btn btn-txt height36 custCol-secondary js-orderShortConfirm marginBottom5 width100">
               <% if (ob.contract_type == "digital good" || ob.contract_type == "service") { %>
-                <%= polyglot.t('transactions.ConfirmOrder') %>
+              <%= polyglot.t('transactions.ConfirmOrder') %>
               <% } else { %>
-                <%= polyglot.t('transactions.MarkAsShipped') %>
-              <% } %>                
-              </div>
+              <%= polyglot.t('transactions.MarkAsShipped') %>
+              <% } %>
+            </div>
             <% } else if(ob.transactionType == "purchases" && ob.status == 2){ %>
-              <div class="btn btn-txt height36 custCol-secondary js-orderShortComplete marginBottom5 width100">
-                <%= polyglot.t('transactions.CompleteOrder') %>
+            <div class="btn btn-txt height36 custCol-secondary js-orderShortComplete marginBottom5 width100">
+              <%= polyglot.t('transactions.CompleteOrder') %>
+            </div>
+            <% } else { %>
+              <div class="btn btn-txt height36 custCol-secondary js-orderShort marginBottom5 width100">
+                <%= polyglot.t('transactions.OrderDetails') %>
               </div>
             <% } %>
+            <div class="btn btn-txt height36 custCol-secondary marginBottom5 width100 positionWrapper js-orderShortDiscusson <% if(!ob.unread){ %> hide <% } %>"
+                 data-order="<%= ob.order_id %>">
+              <i class="ion-chatbubbles"></i> <%= polyglot.t('Discussion') %>
+              <div class="badge js-unreadBadge" data-count="<%= ob.unread || 0 %>"></div>
+            </div>
           </div>
         </div>
       </div>

js/templates/transactionModal.html

@@ -53,7 +53,9 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
               <input type="checkbox" class="textSize11px fieldItem thin" id="BuyWizardQRDetailsInput">
               <label for="BuyWizardQRDetailsInput" class="textSize11px"> <%= polyglot.t('AdditionalPaymentDataInfo') %></label>
             </div>
-            <a class="btn btn-txt btn-wide row10 js-transactionPayCopy"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
+            <a class="btn btn-txt btn-wide row10 js-transactionPayCopy" data-url="<%= ob.buyer_order.order.payment.address %>">
+              <i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %>
+            </a>
             <a class="btn btn-txt btn-wide row10 js-externalLink"
                href="bitcoin:<%= ob.buyer_order.order.payment.address %>?amount=<%= ob.buyer_order.order.payment.amount %>&message=<%= ob.vendor_offer.listing.item.title %>">
               <i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %>

js/views/transactionModalVw.js

@@ -41,6 +41,7 @@ module.exports = baseVw.extend({
     'click .js-copyOutgoingTx': 'copyTx',
     'click .js-closeOrderForm': 'closeOrderForm',
     'click .js-showFundOrder': 'showFundOrder',
+    'click .js-transactionPayCopy': 'copyTransactionPay',
     'click .js-transactionPayCheck':'checkPayment',
     'click .js-startDispute': 'startDispute',
     'click .js-startDisputeResend': 'confirmDisputeResend',
@@ -426,6 +427,11 @@ module.exports = baseVw.extend({
         });
   },
 
+  copyTransactionPay: function(e){
+    "use strict";
+    clipboard.writeText($(e.target).data('url'));
+  },
+
   checkPayment: function(){
     var self = this,
         formData = new FormData();