Merge pull request #1414 from OpenBazaar/fixPurchaseStuckOnAPIFail

Fix purchase stuck on api fail

Author: jjeffryes

js/views/buyDetailsVw.js

@@ -97,12 +97,12 @@ module.exports = Backbone.View.extend({
         moderatorPriceString = this.model.get('userCurrencyCode') == 'BTC' ?
                                moderatorPriceBTC.toFixed(8) + " BTC" : moderatorPriceBTC.toFixed(8) + " BTC (" + newDisplayModeratorPrice + ")";
 
-    this.$el.find('.js-buyWizardBTCPrice').html(newBTCDisplayPrice+"BTC");
-    this.$el.find('.js-buyWizardBTCShippingPrice').html(newBTCShippingDisplayPrice+"BTC");
+    this.$('.js-buyWizardBTCPrice').html(newBTCDisplayPrice+"BTC");
+    this.$('.js-buyWizardBTCShippingPrice').html(newBTCShippingDisplayPrice+"BTC");
 
     if(userCurrency != 'BTC'){
-      this.$el.find('.js-buyWizardPrice').html("("+newDisplayPrice+")");
-      this.$el.find('.js-buyWizardShippingPrice').html("("+newDisplayShippingPrice+")");
+      this.$('.js-buyWizardPrice').html("("+newDisplayPrice+")");
+      this.$('.js-buyWizardShippingPrice').html("("+newDisplayShippingPrice+")");
     }
     this.$('.js-buyWizardModeratorPrice').attr('data-tooltip', moderatorPriceString);
     newAttributes.quantity = quantity;
@@ -113,8 +113,8 @@ module.exports = Backbone.View.extend({
 
   lockForm: function(){
     "use strict";
-    this.$el.find('.js-buyWizardQuantity').prop('disabled', true);
-    this.$el.find('#buyWizardQuantity .numberSpinnerUp, #buyWizardQuantity .numberSpinnerDown').addClass('hide');
+    this.$('.js-buyWizardQuantity').prop('disabled', true);
+    this.$('#buyWizardQuantity .numberSpinnerUp, #buyWizardQuantity .numberSpinnerDown').addClass('hide');
   },
 
   goToPurchases: function(){

js/views/buyWizardVw.js

@@ -36,7 +36,7 @@ module.exports = baseVw.extend({
     'click .js-closeBuyWizardModal': 'closeWizard',
     'click .js-buyWizardNewAddressBtn': 'createNewAddress',
     'click .js-buyWizardModeratorRadio': 'modSelected',
-    'click .js-buyWizardModNext': 'accNext',
+    'click .js-buyWizardModNext': 'modNext',
     'click .js-buyWizardModBack': 'modBack',
     'click .js-buyWizardReturnNext': 'returnNext',
     'click .js-buyWizardAddressBack': 'addressPrev',
@@ -265,6 +265,11 @@ module.exports = baseVw.extend({
     this.accGoToID("#BuyWizardPaymentType");
   },
 
+  modNext: function(){
+    this.accNext();
+    this.setTotalPrice(); //in case it isn't set yet
+  },
+
   modBack: function(){
     this.accGoToID('#BuyWizardBitcoinWallet');
   },
@@ -445,16 +450,16 @@ module.exports = baseVw.extend({
         formData = new FormData(),
         moderatorID = this.model.get('selectedModerator').guid || "",
         selectedAddress = this.model.get('selectedAddress'),
-        bitCoinReturnAddr = this.$el.find('#buyWizardBitcoinAddressInput').val();
+        bitCoinReturnAddr = this.$('#buyWizardBitcoinAddressInput').val();
 
-    if (!this.$el.find('#buyWizardQuantity')[0].checkValidity()){
+    if (!this.$('#buyWizardQuantity')[0].checkValidity()){
       messageModal.show(window.polyglot.t('errorMessages.saveError'), window.polyglot.t('errorMessages.missingError'));
       return;
     }
 
-    this.$el.find('.js-buyWizardSendPurchase').addClass('hide');
-    this.$el.find('.js-buyWizardPendingMsg').removeClass('hide');
-    this.$el.find('.js-buyWizardPurchaseBack').addClass('disabled');
+    this.$('.js-buyWizardSendPurchase').addClass('hide');
+    this.$('.js-buyWizardPendingMsg').removeClass('hide');
+    this.$('.js-buyWizardPurchaseBack').addClass('disabled');
 
     formData.append("id", this.model.get('id'));
 
@@ -472,7 +477,7 @@ module.exports = baseVw.extend({
       formData.append("moderator", moderatorID);
     }
 
-    this.$el.find('.js-buyWizardSpinner').removeClass('hide');
+    this.$('.js-buyWizardSpinner').removeClass('hide');
 
     formData.append("refund_address", bitCoinReturnAddr);
 
@@ -494,7 +499,11 @@ module.exports = baseVw.extend({
         } else {
           messageModal.show(window.polyglot.t('errorMessages.contractError'), window.polyglot.t('errorMessages.sellerError') +" " +
               window.polyglot.t('errorMessages.checkPurchaseData') + "\n\n Reason: " + data.reason);
-          self.$el.find('.js-buyWizardSpinner').addClass('hide');
+          self.$('.js-buyWizardSpinner').addClass('hide');
+          //re-enable form so they can try again
+          self.$('.js-buyWizardSendPurchase').removeClass('hide');
+          self.$('.js-buyWizardPendingMsg').addClass('hide');
+          self.$('.js-buyWizardPurchaseBack').removeClass('disabled');
         }
       },
       error: function (jqXHR, status, errorThrown) {
@@ -562,8 +571,8 @@ module.exports = baseVw.extend({
           maximumFractionDigits: 2,
           currency: userCurrency
         }).format(totalPrice);
-    this.$el.find('.js-buyWizardDetailsTotal').text(totalDisplayPrice);
-    this.$el.find('.js-buyWizardDetailsBTCTotal').text(Number(totalBTCPrice.toFixed(8)));
+    this.$('.js-buyWizardDetailsTotal').text(totalDisplayPrice);
+    this.$('.js-buyWizardDetailsBTCTotal').text(Number(totalBTCPrice.toFixed(8)));
   },
 
   copyPayAddress: function(){