item and order

Author: jjeffryes

css/obBase.css

@@ -707,7 +707,7 @@ label.fieldItem {
 }
 
 [class |= "flexCol"] > .fieldItem {
-  margin: 0 -1px -1px 0;
+  margin: 0 -2px -2px 0; /* prevent collum overflows */
 }
 
 .table {

js/languages/en-US.json

@@ -95,7 +95,8 @@
   "ReturnPolicyPlaceholder": "Enter return policy...",
   "CategoryPlaceholder": "Enter category",
   "CategoryHelperText": "Categories are used to group and organize listing within your store.",
-  "KeywordsHelperText": "Adding tags helps your listing to be discovered in the market. You can only have one of each tag, and a maximum of 10 tags",
+  "KeywordsPlaceholder": "Enter One or More Tags",
+  "KeywordsHelperText": "Adding tags helps your listing to be discovered in the market. You can only have one of each tag, and a maximum of 10 tags, separated by commas or the enter key.",
   "ExpirationDateHelperText": "Set a date for the listing to automatically be pulled from your store.",
   "ClearExpirationDate": "Clear Expiration Date",
   "ReturnPolicy": "Return Policy",

js/models/itemMd.js

@@ -1,6 +1,7 @@
 var __ = require('underscore'),
     Backbone = require('backbone'),
     getBTPrice = require('../utils/getBitcoinPrice'),
+    app = require('../App').getApp(),
     countriesMd = require('./countriesMd'),
     autolinker = require( '../utils/customLinker');
 
@@ -246,21 +247,21 @@ module.exports = window.Backbone.Model.extend({
         newAttributes.internationalShippingBTC = vendorInternationalShippingInBitCoin;
 
         if(userCCode != 'BTC'){
-          newAttributes.price = (vendorPrice*vendToUserBTCRatio).toFixed(2);
+          newAttributes.price = vendorPrice*vendToUserBTCRatio;
           newAttributes.displayPrice = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
             currency: userCCode
           }).format(newAttributes.price);
-          newAttributes.domesticShipping = (vendorDomesticShipping*vendToUserBTCRatio).toFixed(2);
+          newAttributes.domesticShipping = vendorDomesticShipping*vendToUserBTCRatio;
           newAttributes.displayDomesticShipping = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
             currency: userCCode
           }).format(newAttributes.domesticShipping);
-          newAttributes.internationalShipping = (vendorInternationalShipping*vendToUserBTCRatio).toFixed(2);
+          newAttributes.internationalShipping = vendorInternationalShipping*vendToUserBTCRatio;
           newAttributes.displayInternationalShipping = new Intl.NumberFormat(window.lang, {
             style: 'currency',
             minimumFractionDigits: 2,
@@ -269,11 +270,11 @@ module.exports = window.Backbone.Model.extend({
           }).format(newAttributes.internationalShipping);
         } else {
           newAttributes.price = vendorPriceInBitCoin;
-          newAttributes.displayPrice = vendorPriceInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayPrice = app.intlNumFormat(vendorPriceInBitCoin, 4) + " BTC";
           newAttributes.domesticShipping = vendorDomesticShippingInBitCoin;
-          newAttributes.displayDomesticShipping = vendorDomesticShippingInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayDomesticShipping = app.intlNumFormat(vendorDomesticShippingInBitCoin, 4) + " BTC";
           newAttributes.internationalShipping = vendorInternationalShippingInBitCoin;
-          newAttributes.displayInternationalShipping = vendorInternationalShippingInBitCoin.toFixed(4) + " BTC";
+          newAttributes.displayInternationalShipping = app.intlNumFormat(vendorInternationalShippingInBitCoin, 4) + " BTC";
         }
         //set to random so a change event is always fired
         newAttributes.priceSet = Math.random();

js/models/itemShortMd.js

@@ -1,5 +1,6 @@
 var __ = require('underscore'),
     Backbone = require('backbone'),
+    app = require('../App').getApp(),
     getBTPrice = require('../utils/getBitcoinPrice');
 
 module.exports = Backbone.Model.extend({
@@ -50,7 +51,7 @@ module.exports = Backbone.Model.extend({
         vendorBitCoinPrice = Number(vendorPrice / btAve);
         //if vendor and user currency codes are the same, multiply by one to avoid rounding errors
         vendToUserBTCRatio = (userCCode == vendorCCode) ? 1 : window.currentBitcoin/vendorCurrencyInBitcoin;
-        newAttributes.vendorBTCPrice = vendorBitCoinPrice.toFixed(4);
+        newAttributes.vendorBTCPrice = vendorBitCoinPrice;
 
         if(userCCode != 'BTC'){
           newAttributes.displayPrice = new Intl.NumberFormat(window.lang, {
@@ -60,7 +61,7 @@ module.exports = Backbone.Model.extend({
             currency: userCCode
           }).format(vendorPrice*vendToUserBTCRatio);
         } else {
-          newAttributes.displayPrice = vendorBitCoinPrice.toFixed(4) + " BTC";
+          newAttributes.displayPrice = app.intlNumFormat(vendorBitCoinPrice, 4) + " BTC";
         }
         //set to random so a change event is always fired
         newAttributes.priceSet = Math.random();

js/models/orderShortMd.js

@@ -1,5 +1,6 @@
 var __ = require('underscore'),
-    Backbone = require('backbone');
+    Backbone = require('backbone'),
+    app = require('../App').getApp();
 
 module.exports = window.Backbone.Model.extend({
   defaults: {
@@ -25,10 +26,7 @@ module.exports = window.Backbone.Model.extend({
         maximumFractionDigits: 2,
         currency: response.cCode
       }).format(response.btc_total*response.btAve);
-    } else {
-      response.displayPrice = response.btc_total.toFixed(4) + " BTC";
     }
-
     return response;
   }
 });

js/views/buyDetailsVw.js

@@ -29,7 +29,6 @@ module.exports = Backbone.View.extend({
         currentShippingBTCPrice = 0,
         shippingType = "",
         templJSON = {};
-    console.log(this.model)
 
     //set prices before each render
     if(this.model.get('vendor_offer').listing.shipping.free !== true && this.model.get('selectedAddress')) {

js/views/itemEditVw.js

@@ -193,7 +193,8 @@ module.exports = baseVw.extend({
       self.inputKeyword = new Taggle('inputKeyword', {
         tags: keywordTags,
         preserveCase: true,
-        saveOnBlur: true
+        saveOnBlur: true,
+        placeholder: polyglot.t('KeywordsPlaceholder')
       });
     },0);