working toggle

Author: jjeffryes

js/templates/buyWizard.html

@@ -34,7 +34,8 @@ <h3 class="txt-bright padding30"><%= polyglot.t('CheckExchanges') %> </h3>
             <a class="textSize16px js-buyWizardPayLink"><span class="js-buyWizardPayURL"></span></a>
           </div>
           <div class="txt-center row10">
-            <input type="checkbox" class="textSize11px fieldItem thin" id="BuyWizardQRDetailsInput"><label for="BuyWizardQRDetailsInput"> <%= polyglot.t('AdditionalPaymentDataInfo') %></label></input>
+            <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-buyWizardPayCopy"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
           <a class="btn btn-txt btn-wide row10 js-buyWizardPayLink"><i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %></a>

js/templates/pageNav.html

@@ -126,7 +126,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
   <a class="js-navRestart">
     <span class="ion-refresh fontSize11 marginRight2 textOpacity1"></span>
     <%= polyglot.t('nav.restart') %>
-    <span class="pull-right txt-muted"><%= ob.ctrlCmdKey + config.keyShortcuts.restart.toUpperCase() %></span>
+    <span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.restart.toUpperCase() %></span>
   </a>
   <hr/>
   <a class="js-showAboutModal">

js/utils/setTheme.js

@@ -56,7 +56,7 @@ module.exports = function(primaryColor, secondaryColor, backgroundColor, textCol
       "#ov1 #userPage input[type='radio'].fieldItem.starRating + label:before { color: " + textColor + "; background: none; box-shadow: none;}" +
       "#ov1 #userPage input[type='radio'].fieldItem.starRating:checked + label:before { background: none; box-shadow: none;}" +
       "#ov1 #userPage .starRating:before { color: " + textColor + ";}" +
-      "#ov1 #userPage input[type='checkbox'].fieldItem:checked + label:before { color: " + textColor + "; box-shadow: inset 0 0 0 4px " + primaryColor + ";}" +
+      //"#ov1 #userPage input[type='checkbox'].fieldItem:checked + label:before { color: " + textColor + "; box-shadow: inset 0 0 0 4px " + primaryColor + ";}" +
       "#ov1 #userPage input[type='number'].fieldItem { color: " + textColor + ";}" +
       "#ov1 #userPage input[type='number'].spinButtons::-webkit-inner-spin-button:before { color: " + textColor + ";}" +
       "#ov1 #userPage input[type='number'].spinButtons::-webkit-inner-spin-button:after { color: " + textColor + ";}" +

js/views/buyWizardVw.js

@@ -56,6 +56,7 @@ module.exports = baseVw.extend({
     'click .js-buyWizardCloseSummary': 'closeWizard',
     'click input[name="radioPaymentType"]': 'changePaymentType',
     'blur .js-buyWizardPostalInput': 'updateMap',
+    'click #BuyWizardQRDetailsInput': 'toggleQRDetails',
     'blur input': 'validateInput'
   },
 
@@ -73,6 +74,7 @@ module.exports = baseVw.extend({
     this.orderID = "";
     this.model.set('selectedModerator', "");
     this.model.updateAttributes();
+    this.cachePayData = "";
 
     //create the country select list
     this.countryList = countries.get('countries');
@@ -197,6 +199,9 @@ module.exports = baseVw.extend({
         $(".js-BuyWizardWallets").randomize();
       }
 
+      //set the QR details checkbox
+      var QRtoggleVal = localStorage.getItem('AdditionalPaymentData') != "false" ? true : false;
+      this.$('#BuyWizardQRDetailsInput').prop('checked', QRtoggleVal);
     });
     return this;
   },
@@ -485,6 +490,7 @@ module.exports = baseVw.extend({
       success: function(data){
         if(data.success == true){
           self.showPayAddress(data);
+          self.cachePayData = data; //cache the data for the QR Details toggle
         } else {
           messageModal.show(window.polyglot.t('errorMessages.contractError'), window.polyglot.t('errorMessages.sellerError') +" " +
               window.polyglot.t('errorMessages.checkPurchaseData') + "\n\n Reason: " + data.reason);
@@ -499,8 +505,21 @@ module.exports = baseVw.extend({
     });
   },
 
+  toggleQRDetails: function(){
+    var toggleInput = this.$('#BuyWizardQRDetailsInput'),
+        toggleVal = toggleInput.prop('checked');
+    localStorage.setItem('AdditionalPaymentData',  toggleVal);
+    this.showPayAddress();
+  },
+
   showPayAddress: function(data){
-    "use strict";
+    data = data || this.cachePayData;
+
+    if(!data) {
+      throw new Error('Data must be provided to the showPayAddress function');
+      return;
+    }
+
     var totalBTCPrice = 0,
         storeName = encodeURI(this.model.get('page').profile.name),
         message = encodeURI(this.model.get('vendor_offer').listing.item.title.substring(0, 20) + " "+data.order_id),
@@ -515,7 +534,9 @@ module.exports = baseVw.extend({
     payHREF = "bitcoin://"+ data.payment_address+"?amount="+totalBTCPrice;
     if(localStorage.getItem('AdditionalPaymentData') != "false") {
         payHREF += "&label="+storeName+"&message="+message;
-    }    
+    }
+
+    console.log(payHREF)
 
     this.hideMaps();
     this.$el.find('.js-buyWizardPay').removeClass('hide');