Merge pull request #1619 from OpenBazaar/fixInternationalPrices

Fix international prices

Author: jjeffryes

css/obBase.css

@@ -202,7 +202,7 @@ h1,h2,h3,
   line-height: 1.2;
 }
 
-h4,h5,h6
+h4,h5,h6,
 .h4,.h5,.h6 {
   margin-bottom: 10px;
   line-height: 1;
@@ -3466,7 +3466,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 }
 
 .onboardingIntroDiscover:before {
-  background: #252525 url('../imgs/onboarding-discover-callout.png') 100% 0%;
+  background: #252525 url('../imgs/onboarding-discover-callout.png') 100% 0;
   background-size: 233px 196px;
   content: " ";
   width: 32px;
@@ -4138,7 +4138,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 }
 
 .tooltip:hover:after{
-  max-width: 400px;
   background: rgba(37,37,37,.95);
   border-radius: 3px;
   bottom: -32px;

js/templates/itemEdit.html

@@ -111,7 +111,7 @@ <h5><%= polyglot.t('Listing') %></h5>
               >
             </div>
             <div class="flexCol-4">
-              <span class="fieldItem txt-placeholder"><%= polyglot.t('MinimumIs', { amount: ob.userCurrencyCode == "BTC" ? 0.0015 : (window.currentBitcoin * 0.002).toFixed(2) }) %> <span class="ion-help-circled fontSize12 tooltip" data-tooltip="<%= polyglot.t('MinimumPrice') %>"></span></span>
+              <span class="fieldItem txt-placeholder"><%= polyglot.t('MinimumIs', { amount: ob.userCurrencyCode == "BTC" ? ob.intlNumFormat(0.0015) : ob.intlNumFormat(window.currentBitcoin * 0.002) }) %> <span class="ion-help-circled fontSize12 tooltip" data-tooltip="<%= polyglot.t('MinimumPrice') %>"></span></span>
             </div>
           </div>
           <div class="flexRow custCol-border js-shippingRow">

js/templates/userShort.html

@@ -85,7 +85,7 @@
           </div>
           <% if(ob.isModerator){ %>
           <div class="pull-right rowTop10 fontSize12 txt-fade">
-            <%= polyglot.t('ModeratorFee') %> <%= ob.fee.toFixed(2) %>%
+            <%= polyglot.t('ModeratorFee') %> <%= ob.intlNumFormat(ob.fee, 2) %>%
           </div>
           <% } %>
         </div>

js/views/blockedUsersVw.js

@@ -32,7 +32,7 @@ module.exports = baseVw.extend({
     this.listenTo(this.collection, 'remove', function(md) {
       var view;
 
-      if (view == __.find(this.subViews, function(subView) {
+      if (view = __.find(this.subViews, function(subView) { // eslint-disable-line no-cond-assign
         return subView.model.get('guid') === md.get('guid');
       })) {
         self.removeSubView(view);

js/views/buyWizardVw.js

@@ -78,7 +78,7 @@ module.exports = baseVw.extend({
     this.userModel = this.options.userModel;
     this.worldwide = this.options.worldwide;
     this.shippingRegions = this.options.shippingRegions;
-    this.hideMap = true;
+    //this.hideMap = true;
     this.orderID = "";
     this.model.set('selectedModerator', "");
     this.model.updateAttributes();
@@ -300,7 +300,7 @@ module.exports = baseVw.extend({
   },
 
   doesntHaveWallet: function(){
-    this.hasWallet = false;
+    //this.hasWallet = false;
     this.accNext();
   },
 
@@ -568,7 +568,7 @@ module.exports = baseVw.extend({
     this.$el.find('.js-buyWizardSpinner').addClass('hide');
     this.orderID = data.order_id;
     totalBTCPrice = data.amount - this.partialPaymentAmount;
-    this.$el.find('.js-buyWizardDetailsTotalBTC').text(totalBTCPrice);
+    this.$el.find('.js-buyWizardDetailsTotalBTC').text(templateHelpers.intlNumFormat(totalBTCPrice));
     this.payURL = data.payment_address;
 
     payHREF = "bitcoin:"+ data.payment_address+"?amount="+totalBTCPrice;

js/views/transactionModalVw.js

@@ -360,9 +360,11 @@ module.exports = baseVw.extend({
     this.$('.js-transactionFeedback').removeClass('bottom0');
   },
 
+  /*
   showRefundOrder: function(){
     this.setState("refund");
   },
+   */
 
   showCompleteForm: function(){
     this.$('.js-transactionShowContract').addClass('hide');