Merge pull request #1381 from programmerpeter/issue1158

Resolved #1158

Author: jjeffryes

js/languages/en-US.json

@@ -324,6 +324,8 @@
   "ModeratorFee": "Fee:",
   "PriceForOne": "Price per single item, file, or service.",
   "Avatar": "Avatar",
+  "AdditionalPaymentData": "Additional payment data",
+  "AdditionalPaymentDataInfo": "Include message and label in payment QR code.",
   "firewall": {
     "Open": "Open",
     "Restricted": "Restricted",

js/languages/pl.json

@@ -324,6 +324,8 @@
     "ModeratorFee": "Prowizja:",
     "PriceForOne": "Cena za pojedynczy przedmiot, plik lub usługę.",
     "Avatar": "Awatar",
+    "AdditionalPaymentData": "Dodatkowe informacje o płatności",
+    "AdditionalPaymentDataInfo": "Umieszczaj wiadomość i etykietę w kodzie QR płatności.",
     "firewall": {
         "Open": "Otwarty",
         "Restricted": "Ograniczony",

js/templates/settings.html

@@ -1190,6 +1190,24 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
               </div>
 
             </div>
+            
+            <div class="flexRow">
+              <div class="flexCol-3  borderRight custCol-border">
+                <div class="fieldItem">
+                  <label>
+                    <%= polyglot.t('AdditionalPaymentData') %>
+                    <i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('AdditionalPaymentDataInfo') %>"></i>
+                  </label>
+                </div>
+              </div>
+
+              <div class="flexCol-9 borderRight0 custCol-border">
+                <div class="fieldItem">
+                  <input type="radio" class="fieldItem" id="additional_payment_data_yes" name="additionalPaymentData" value="true" checked /><label for="additional_payment_data_yes" class="radioLabel"><%= polyglot.t('Yes') %></label>
+                  <input type="radio" class="fieldItem" id="additional_payment_data_no" name="additionalPaymentData" value="false" /><label for="additional_payment_data_no" class="radioLabel"><%= polyglot.t('No') %></label>
+                </div>
+              </div>
+            </div>
 
             <div class="flexRow">
 

js/views/buyWizardVw.js

@@ -511,7 +511,12 @@ module.exports = baseVw.extend({
     totalBTCPrice = data.amount;
     this.$el.find('.js-buyWizardDetailsTotalBTC').text(totalBTCPrice);
     this.payURL = data.payment_address;
-    payHREF = "bitcoin://"+ data.payment_address+"?amount="+totalBTCPrice+"&label="+storeName+"&message="+message;
+    
+    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'});

js/views/settingsVw.js

@@ -394,6 +394,7 @@ module.exports = Backbone.View.extend({
     this.$("#generalForm input[name=notifications][value=" + notifications + "]").prop('checked', true);
     this.$("#storeForm input[name=vendor][value=" + vendorStatus + "]").prop('checked', true);
     this.$("#advancedForm input[name=notFancy][value=" + fancyStatus + "]").prop('checked', true);
+    this.$("#advancedForm input[name=additionalPaymentData][value=" + localStorage.getItem('AdditionalPaymentData') + "]").prop('checked', true);
 
     currecyList = __.uniq(currecyList, function(item){return item.code;});
     currecyList = currecyList.sort(function(a,b){
@@ -929,6 +930,8 @@ module.exports = Backbone.View.extend({
 
     $saveBtn.addClass('loading');
 
+    localStorage.setItem('AdditionalPaymentData',  this.$('#advancedForm input[name=additionalPaymentData]:checked').val());
+    
     saveToAPI(form, this.userModel.toJSON(), self.serverUrl + "settings", function(){
       app.statusBar.pushMessage({
         type: 'confirmed',