Merge pull request #1772 from OpenBazaar/transactionFixes

Transaction fixes

Author: jjeffryes

css/obBase.css

@@ -3065,6 +3065,11 @@ input[type="number"].fieldItem.fieldItem-withButton {
   padding-left: 50px;
 }
 
+input[type="number"].fieldItem.spinButtons {
+  overflow: hidden;
+  padding-right: 25px;
+}
+
 .numberSpinnerUp,
 .numberSpinnerDown {
   cursor: pointer;

js/templates/buyDetails.html

@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="flexCol-2">
-      <div class="rowItem padding2015">
+      <div class="rowItem padding0 paddingTop20">
         <form id="buyWizardQuantity" class="positionWrapper">
           <input type="number" step="1" min="1" class="fieldItem spinButtons js-buyWizardQuantity border1 custCol-border marginTop4" value="1"/>
           <div class="numberSpinnerUp"></div>
@@ -39,7 +39,7 @@
       </div>
     </div>
     <div class="flexCol-4 overflowHidden">
-      <div class="rowItem padding2015 alignRight marginTop20">
+      <div class="rowItem padding5 paddingTop20 alignRight marginTop20">
         <span class="noOverflow fontSize13 js-buyWizardBTCPrice"></span>
         <span class="noOverflow textOpacity75 fontSize13 js-buyWizardPrice">
           <% if(ob.userCurrencyCode != 'BTC'){ %>
@@ -51,7 +51,7 @@
   </div>
 
   <!-- only display shipping if physical item -->
-  <% if( ob.vendor_offer.listing.metadata.category === "physical good" ) { %>  
+  <% if( ob.vendor_offer.listing.metadata.category === "physical good" ) { %>
   <div class="flexRow custCol-border borderBottom">
     <div class="flexCol-8">
       <div class="rowItem padding2015">

js/views/buyAddressesVw.js

@@ -3,7 +3,7 @@
 var __ = require('underscore'),
     $ = require('jquery'),
     loadTemplate = require('../utils/loadTemplate'),
-    baseVw = require('./baseVw'),    
+    baseVw = require('./baseVw'),
     localize = require('../utils/localize');
 
 module.exports = baseVw.extend({
@@ -36,7 +36,8 @@ module.exports = baseVw.extend({
           )
       );
       //this does not add it to the DOM, that is done by the parent view
-      self.$('.js-buyWizardAddressRadio').eq(selected).prop('checked', true).trigger('click');
+      self.$('.js-buyWizardAddressRadio').eq(selected).prop('checked', true);
+      self.selectAddress(selected);
       //self.setAddress(selected);
     });
     return this;
@@ -46,8 +47,8 @@ module.exports = baseVw.extend({
     $(".js-buyWizardAddressNext").trigger( "click" );
   },
 
-  selectAddress: function(){
-    var index = this.$el.find('.js-buyWizardAddressRadio:checked').val();
+  selectAddress: function(selected){
+    var index = selected || this.$el.find('.js-buyWizardAddressRadio:checked').val();
     this.setAddress(index);
   },
 

js/views/buyWizardVw.js

@@ -230,7 +230,7 @@ module.exports = baseModal.extend({
     } else {
       this.model.set('selectedModerator', "");
     }
-    
+
     this.$el.find('#BuyWizardPaymentType .js-buyWizardModNext').removeClass('disabled');
 
   },
@@ -251,7 +251,7 @@ module.exports = baseModal.extend({
     this.$buyWizardMap.find('iframe').addClass('blurMore');
 
     //set chosen inputs
-    $('.chosen').chosen({ 
+    $('.chosen').chosen({
       search_contains: true,
       no_results_text: window.polyglot.t('chosenJS.noResultsText'),
       placeholder_text_single: window.polyglot.t('chosenJS.placeHolderTextSingle'),
@@ -349,7 +349,7 @@ module.exports = baseModal.extend({
 
     addressData.shipping_addresses = newAddresses;
 
-    saveToAPI(targetForm, this.userModel.toJSON(), self.model.get('serverUrl') + "settings", function(){
+    saveToAPI(targetForm, this.userModel.toJSON(), app.serverConfigs.getActive().getServerBaseUrl() + "/settings", function(){
       self.$el.find('#buyWizardNameInput').val("");
       self.$el.find('#buyWizardStreetInput').val("");
       self.$el.find('#buyWizardCityInput').val("");
@@ -400,23 +400,23 @@ module.exports = baseModal.extend({
       addressString = address.street + ", " + address.city + ", " + address.state + " " + address.postal_code + " " + address.displayCountry;
     } else {
       // if address is invalid, we'll create a dummy address for which google maps will show a map of the world
-      addressString = "123 Street, City, State 12345 Country";      
+      addressString = "123 Street, City, State 12345 Country";
     }
 
     addressString = encodeURIComponent(addressString);
     var $iFrame = $('<iframe class="js-iframe-pending positionTop" width="525" height="250" frameborder="0" style="border:0; margin-top: 0; height: 250px; clip: rect(0,0,0,0)" />');
-       
+
     if ($currentIframe.length) {
       this.$buyWizardMap.find('.js-mapSpinner').removeClass('hide');
       $iFrame.insertBefore($currentIframe);
     } else {
       this.$buyWizardMap.find('.mapWrap')
         .prepend($iFrame);
     }
-    
+
     $iFrame.on('load', () => {
       this.$buyWizardMap.find('.js-mapSpinner').addClass('hide');
-      
+
       $currentIframe.addClass('js-iframe-leaving')
         .fadeOut({
           duration: 'slow',
@@ -439,7 +439,7 @@ module.exports = baseModal.extend({
 
     if (modForm[0].checkValidity()) {
       if (bitCoinReturnAddr != this.userModel.get('refund_address')) {
-        saveToAPI(modForm, this.userModel.toJSON(), this.model.get('serverUrl') + "settings", function () {
+        saveToAPI(modForm, this.userModel.toJSON(), app.serverConfigs.getActive().getServerBaseUrl() + "/settings", function () {
           window.obEventBus.trigger("updateUserModel");
           self.skipAddressCheck();
         },
@@ -490,7 +490,7 @@ module.exports = baseModal.extend({
       app.simpleMessageModal.open({
         title: window.polyglot.t('errorMessages.serverError'),
         message: window.polyglot.t('errorMessages.missingError')
-      });     
+      });
       return;
     }
 
@@ -524,7 +524,7 @@ module.exports = baseModal.extend({
 
     this.buyRequest = $.ajax({
       type: "POST",
-      url: self.model.get('serverUrl') + "purchase_contract",
+      url: app.serverConfigs.getActive().getServerBaseUrl() + "/purchase_contract",
       contentType: false,
       processData: false,
       data: formData,
@@ -579,12 +579,12 @@ module.exports = baseModal.extend({
     totalBTCPrice = data.amount - this.partialPaymentAmount;
     this.$el.find('.js-buyWizardDetailsTotalBTC').text(templateHelpers.intlNumFormat(totalBTCPrice, 8));
     this.payURL = data.payment_address;
-    
+
     payHREF = "bitcoin:"+ data.payment_address+"?amount="+totalBTCPrice;
     if (localStorage.getItem('AdditionalPaymentData') != "false") {
       payHREF += "&label="+storeName+"&message="+message;
     }
-    
+
     this.hideMaps();
     this.$el.find('.js-buyWizardPay').removeClass('hide');
     dataURI = qr(payHREF, {type: 10, size: 10, level: 'M'});
@@ -631,13 +631,12 @@ module.exports = baseModal.extend({
   },
 
   checkPayment: function(){
-    var self = this,
-        formData = new FormData();
+    var formData = new FormData();
 
     formData.append("order_id", this.orderID);
     $.ajax({ //this only triggers the server to send a new socket message
       type: "POST",
-      url: self.model.get('serverUrl') + "check_for_payment",
+      url: app.serverConfigs.getActive().getServerBaseUrl() + "/check_for_payment",
       contentType: false,
       processData: false,
       data: formData,
@@ -653,7 +652,7 @@ module.exports = baseModal.extend({
     new Notification(window.polyglot.t('buyFlow.paymentSent'), {
       silent: true
     });
-    
+
     // play notification sound
     var notificationSound = document.createElement('audio');
     notificationSound.setAttribute('src', './audio/notification.mp3');
@@ -690,4 +689,4 @@ module.exports = baseModal.extend({
 
     this.close();
   }
-});
+});

js/views/transactionModalVw.js

@@ -126,7 +126,7 @@ module.exports = baseModal.extend({
           app.simpleMessageModal.open({
             title: window.polyglot.t('errorMessages.getError'),
             message: '<i>' + window.polyglot.t('errorMessages.serverError') + '</i>'
-          });          
+          });
         } else {
           app.simpleMessageModal.open({
             title: window.polyglot.t('errorMessages.getError'),
@@ -159,7 +159,7 @@ module.exports = baseModal.extend({
       app.simpleMessageModal.open({
         title: window.polyglot.t('errorMessages.serverError'),
         message: self.model.get('error')
-      });      
+      });
       return;
     }
 
@@ -187,7 +187,7 @@ module.exports = baseModal.extend({
           orderDue: orderDue
         })
       ));
-      
+
       baseModal.prototype.render.apply(self);
 
       if (self.status == 0){
@@ -264,14 +264,14 @@ module.exports = baseModal.extend({
       if (localStorage.getItem('AdditionalPaymentData') != "false") {
         payHREF += "&message=" + this.model.get('vendor_offer').listing.item.title.substring(0, 20) + " " + this.orderID;
       }
-      
+
       dataURI = qr(payHREF, {type: 10, size: 10, level: 'M'});
       this.$el.find('.js-transactionPayQRCode').attr('src', dataURI);
     } else {
       app.simpleMessageModal.open({
         title: window.polyglot.t('errorMessages.getError'),
         message: window.polyglot.t('errorMessages.serverError')
-      });    
+      });
     }
   },
 
@@ -311,7 +311,7 @@ module.exports = baseModal.extend({
     this.$el.find('.js-' + state).removeClass('hide');
     this.$el.find('.js-' + state + 'Tab').addClass('active').removeClass('hide');
     this.discussionForm.removeClass('formChecked');
-    
+
     if (state == "discussion"){
       $.post(app.serverConfigs.getActive().getServerBaseUrl() + '/mark_discussion_as_read', {id: this.orderID});
       this.$('.js-unreadBadge').addClass('hide');
@@ -359,7 +359,7 @@ module.exports = baseModal.extend({
     this.$('.js-transactionShowContract').removeClass('hide');
     this.$('.js-transactionsConfirmOrderHolder').removeClass('bottom0');
   },
-  
+
   showConfirmForm: function(){
     this.$('.js-transactionShowContract').addClass('hide');
     this.$('.js-transactionsConfirmOrderHolder').addClass('bottom0');
@@ -469,20 +469,19 @@ module.exports = baseModal.extend({
   },
 
   checkPayment: function(){
-    var self = this,
-        formData = new FormData();
+    var formData = new FormData();
 
     formData.append("order_id", this.orderID);
     $.ajax({ //this only triggers the server to send a new socket message
       type: "POST",
-      url: self.model.get('serverUrl') + "check_for_payment",
+      url: app.serverConfigs.getActive().getServerBaseUrl() + "/check_for_payment",
       contentType: false,
       processData: false,
       data: formData,
       dataType: "json"
     });
   },
-  
+
   getDiscussion: function(){
     var self = this;
     this.discussionCount = 0;
@@ -661,7 +660,7 @@ module.exports = baseModal.extend({
   },
 
   copyTx: function(e){
-    
+
     var tx = $(e.target).data('tx');
     clipboard.writeText(tx);
   },
@@ -743,10 +742,10 @@ module.exports = baseModal.extend({
   acceptResolution: function(e){
     var self = this,
         resData = {};
-    
+
     $(e.target).addClass('loading');
     resData.order_id = this.orderID;
-    
+
     saveToAPI(null, null, this.serverUrl + "release_funds", function(){
       self.status = 6;
       self.tabState = "summary";
@@ -831,8 +830,8 @@ module.exports = baseModal.extend({
   },
 
   close: function() {
-    this.confirmStatus && this.confirmStatus.remove();    
+    this.confirmStatus && this.confirmStatus.remove();
 
     baseModal.prototype.close.apply(this, arguments);
   }
-});
+});