Merge pull request #1001 from OpenBazaar/fixPurchaseNoMods

Fix purchase no mods

js/languages/en-US.json

@@ -1642,7 +1642,8 @@
     "noItems": "You must make at least one purchase.",
     "missingAddress": "Please choose a valid shipping address.",
     "missingShippingOption": "Please choose a valid shipping option.",
-    "needsModerator": "You must select a moderator to make a Moderated Payment."
+    "needsModerator": "You must select a moderator to make a Moderated Payment.",
+    "removeModerator": "An unmoderated purchase cannot have a moderator."
   },
   "orderFulfillmentModelErrors": {
     "provideShipper": "Please provide a shipping carrier.",

js/models/purchase/Order.js

@@ -64,6 +64,11 @@ export default class extends BaseModel {
       addError('moderated', app.polyglot.t('orderModelErrors.needsModerator'));
     }
 
+    if (!this.moderated && attrs.moderator) {
+      // this should only happen if there is a developer error
+      addError('moderated', app.polyglot.t('orderModelErrors.removeModerator'));
+    }
+
     if (Object.keys(errObj).length) return errObj;
 
     return undefined;

js/templates/modals/purchase/purchase.html

@@ -86,7 +86,6 @@ <h2 class="h4 required"><%= ob.polyT('purchase.paymentTypeTitle') %></h2>
                   <input
                       type="checkbox"
                       name="moderated"
-                      checked
                       id="purchaseModerated">
                   <label for="purchaseModerated"><%= ob.polyT('purchase.moderatedPayment') %></label>
                   <p class="clrT2 tx6">

js/views/modals/purchase/Purchase.js

@@ -260,6 +260,7 @@ export default class extends BaseModal {
     this.getCachedEl('.js-moderatorNote').toggleClass('hide', !bool);
     if (!bool) this.disableModerators();
     this.order.moderated = bool;
+    this.getCachedEl('#purchaseModerated').prop('checked', bool);
     this.moderators.noneSelected = !bool;
   }
 
@@ -346,9 +347,10 @@ export default class extends BaseModal {
     }
 
     // set the moderator
-    if (this.order.moderated) {
-      this.order.set({ moderator: this.moderators.selectedIDs[0] }, { validate: true });
-    }
+    const moderator = this.order.moderated ? this.moderators.selectedIDs[0] : '';
+    this.order.set({ moderator });
+    this.order.set({}, { validate: true });
+
 
     // cancel any existing order
     if (this.orderSubmit) this.orderSubmit.abort();
@@ -475,7 +477,7 @@ export default class extends BaseModal {
     if (cur !== 'BTC') {
       btcTotal = convertCurrency(btcTotal, cur, 'BTC');
     }
-    const allowModeration = btcTotal >= this.minModPrice;
+    const allowModeration = btcTotal >= this.minModPrice && this.moderatorIDs.length;
     this.moderationOn(allowModeration);
     this.getCachedEl('.js-modsNotAllowed').toggleClass('hide', allowModeration);
   }
@@ -536,7 +538,7 @@ export default class extends BaseModal {
         prices: this.prices,
         minModPrice: this.minModPrice,
         displayCurrency: app.settings.get('localCurrency'),
-        hasModerators: this.moderatorIDs.length,
+        hasModerators: !!this.moderatorIDs.length,
       }));
 
       super.render();