PDP Revisions and Revised

.eslintrc

@@ -86,9 +86,9 @@
     "jsx-quotes": [2, "prefer-double"], // http://eslint.org/docs/rules/jsx-quotes
     "react/no-deprecated": 1,
     "react/display-name": 1,
-    "react/forbid-prop-types": 1,
+    "react/forbid-prop-types": 0,
     "react/jsx-boolean-value": 0,
-    "react/jsx-closing-bracket-location": [1, "after-props"],
+    "react/jsx-closing-bracket-location": 1,
     "react/jsx-curly-spacing": 1,
     "react/jsx-indent-props": [1, 2],
     "react/jsx-max-props-per-line": [1, {

.meteor/packages

@@ -93,3 +93,4 @@ practicalmeteor:sinon
 
 
 # Custom Packages
+johanbrook:publication-collector@1.0.2

.meteor/versions

@@ -78,6 +78,7 @@ htmljs@1.0.11
 http@1.2.9
 id-map@1.0.8
 jeremy:stripe@1.6.0
+johanbrook:publication-collector@1.0.2
 jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
 jparker:gravatar@0.5.1

client/modules/i18n/currency.js

@@ -0,0 +1,124 @@
+import accounting from "accounting-js";
+import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
+import { localeDep, i18nextDep } from  "./main";
+import { Reaction, Logger, i18next } from "/client/api";
+
+/**
+ * formatPriceString
+ * @summary return shop /locale specific formatted price
+ * also accepts a range formatted with " - "
+ * @param {String} currentPrice - currentPrice or "xx.xx - xx.xx" formatted String
+ * @return {String} returns locale formatted and exchange rate converted values
+ */
+export function formatPriceString(formatPrice) {
+  const locale = Reaction.Locale.get();
+
+  if (typeof locale !== "object" || typeof locale.currency !== "object") {
+    // locale not yet loaded, so we don"t need to return anything.
+    return false;
+  }
+
+  if (typeof formatPrice !== "string" && typeof formatPrice !== "number") {
+    return false;
+  }
+
+  // for the cases then we have only one price. It is a number.
+  const currentPrice = formatPrice.toString();
+  let price = 0;
+  const prices = ~currentPrice.indexOf(" - ") ?
+    currentPrice.split(" - ") : [currentPrice];
+
+  // basic "for" is faster then "for ...of" for arrays. We need more speed here
+  const len = prices.length;
+  for (let i = 0; i < len; i++) {
+    const originalPrice = prices[i];
+    try {
+      // we know the locale, but we don"t know exchange rate. In that case we
+      // should return to default shop currency
+      if (typeof locale.currency.rate !== "number") {
+        throw new Meteor.Error("exchangeRateUndefined");
+      }
+      prices[i] *= locale.currency.rate;
+
+      price = _formatPrice(price, originalPrice, prices[i],
+        currentPrice, locale.currency, i, len);
+    } catch (error) {
+      Logger.debug("currency error, fallback to shop currency");
+      price = _formatPrice(price, originalPrice, prices[i],
+        currentPrice, locale.shopCurrency, i, len);
+    }
+  }
+
+  return price;
+}
+
+export function formatNumber(currentPrice) {
+  const locale = Reaction.Locale.get();
+  let price = currentPrice;
+  const format = Object.assign({}, locale.currency, {
+    format: "%v"
+  });
+  const shopFormat = Object.assign({}, locale.shopCurrency, {
+    format: "%v"
+  });
+
+  if (typeof locale.currency === "object" && locale.currency.rate) {
+    price = currentPrice * locale.currency.rate;
+    return accounting.formatMoney(price, format);
+  }
+
+  Logger.debug("currency error, fallback to shop currency");
+  return accounting.formatMoney(currentPrice, shopFormat);
+}
+
+/**
+ * _formatPrice
+ * private function for formatting locale currency
+ * @private
+ * @param  {Number} price         price
+ * @param  {Number} originalPrice originalPrice
+ * @param  {Number} actualPrice   actualPrice
+ * @param  {Number} currentPrice  currentPrice
+ * @param  {Number} currency      currency
+ * @param  {Number} pos           position
+ * @param  {Number} len           length
+ * @return {Number}               formatted price
+ */
+function _formatPrice(price, originalPrice, actualPrice, currentPrice, currency,
+  pos, len) {
+  // this checking for locale.shopCurrency mostly
+  if (typeof currency !== "object") {
+    return false;
+  }
+
+  let adjustedPrice = actualPrice;
+  let formattedPrice;
+
+  // Precision is mis-used in accounting js. Scale is the propery term for number
+  // of decimal places. Let's adjust it here so accounting.js does not break.
+  if (currency.scale !== undefined) {
+    currency.precision = currency.scale;
+  }
+
+  // If there are no decimal places, in the case of the Japanese Yen, we adjust it here.
+  if (currency.scale === 0) {
+    adjustedPrice = actualPrice * 100;
+  }
+
+  // @param {string} currency.where: If it presents - in situation then two
+  // prices in string, currency sign will be placed just outside the right price.
+  // For now it should be manually added to fixtures shop data.
+  if (typeof currency.where === "string" && currency.where === "right" &&
+    len > 1 && pos === 0) {
+    const modifiedCurrency = Object.assign({}, currency, {
+      symbol: ""
+    });
+    formattedPrice = accounting.formatMoney(adjustedPrice, modifiedCurrency);
+  } else {
+    // accounting api: http://openexchangerates.github.io/accounting.js/
+    formattedPrice = accounting.formatMoney(adjustedPrice, currency);
+  }
+
+  return price === 0 ? currentPrice.replace(originalPrice, formattedPrice) : price.replace(originalPrice, formattedPrice);
+}

client/modules/i18n/helpers.js

@@ -1,7 +1,6 @@
-import accounting from "accounting-js";
-import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 import { localeDep, i18nextDep } from  "./main";
+import { formatPriceString } from "./currency";
 import { Reaction, Logger, i18next } from "/client/api";
 
 /**
@@ -49,120 +48,9 @@ Template.registerHelper("currencySymbol", function () {
  */
 Template.registerHelper("formatPrice", function (formatPrice) {
   localeDep.depend();
-
-  const locale = Reaction.Locale.get();
-
-  if (typeof locale !== "object" || typeof locale.currency !== "object") {
-    // locale not yet loaded, so we don"t need to return anything.
-    return false;
-  }
-
-  if (typeof formatPrice !== "string" && typeof formatPrice !== "number") {
-    return false;
-  }
-
-  // for the cases then we have only one price. It is a number.
-  const currentPrice = formatPrice.toString();
-  let price = 0;
-  const prices = ~currentPrice.indexOf(" - ") ?
-    currentPrice.split(" - ") : [currentPrice];
-
-  // basic "for" is faster then "for ...of" for arrays. We need more speed here
-  const len = prices.length;
-  for (let i = 0; i < len; i++) {
-    const originalPrice = prices[i];
-    try {
-      // we know the locale, but we don"t know exchange rate. In that case we
-      // should return to default shop currency
-      if (typeof locale.currency.rate !== "number") {
-        throw new Meteor.Error("exchangeRateUndefined");
-      }
-      prices[i] *= locale.currency.rate;
-
-      price = _formatPrice(price, originalPrice, prices[i],
-        currentPrice, locale.currency, i, len);
-    } catch (error) {
-      Logger.debug("currency error, fallback to shop currency");
-      price = _formatPrice(price, originalPrice, prices[i],
-        currentPrice, locale.shopCurrency, i, len);
-    }
-  }
-
-  return price;
+  return formatPriceString(formatPrice);
 });
 
-Reaction.Currency = {};
-
-Reaction.Currency.formatNumber = function (currentPrice) {
-  const locale = Reaction.Locale.get();
-  let price = currentPrice;
-  const format = Object.assign({}, locale.currency, {
-    format: "%v"
-  });
-  const shopFormat = Object.assign({}, locale.shopCurrency, {
-    format: "%v"
-  });
-
-  if (typeof locale.currency === "object" && locale.currency.rate) {
-    price = currentPrice * locale.currency.rate;
-    return accounting.formatMoney(price, format);
-  }
-
-  Logger.debug("currency error, fallback to shop currency");
-  return accounting.formatMoney(currentPrice, shopFormat);
-};
-
-/**
- * _formatPrice
- * private function for formatting locale currency
- * @private
- * @param  {Number} price         price
- * @param  {Number} originalPrice originalPrice
- * @param  {Number} actualPrice   actualPrice
- * @param  {Number} currentPrice  currentPrice
- * @param  {Number} currency      currency
- * @param  {Number} pos           position
- * @param  {Number} len           length
- * @return {Number}               formatted price
- */
-function _formatPrice(price, originalPrice, actualPrice, currentPrice, currency,
-  pos, len) {
-  // this checking for locale.shopCurrency mostly
-  if (typeof currency !== "object") {
-    return false;
-  }
-
-  let adjustedPrice = actualPrice;
-  let formattedPrice;
-
-  // Precision is mis-used in accounting js. Scale is the propery term for number
-  // of decimal places. Let's adjust it here so accounting.js does not break.
-  if (currency.scale !== undefined) {
-    currency.precision = currency.scale;
-  }
-
-  // If there are no decimal places, in the case of the Japanese Yen, we adjust it here.
-  if (currency.scale === 0) {
-    adjustedPrice = actualPrice * 100;
-  }
-
-  // @param {string} currency.where: If it presents - in situation then two
-  // prices in string, currency sign will be placed just outside the right price.
-  // For now it should be manually added to fixtures shop data.
-  if (typeof currency.where === "string" && currency.where === "right" &&
-    len > 1 && pos === 0) {
-    const modifiedCurrency = Object.assign({}, currency, {
-      symbol: ""
-    });
-    formattedPrice = accounting.formatMoney(adjustedPrice, modifiedCurrency);
-  } else {
-    // accounting api: http://openexchangerates.github.io/accounting.js/
-    formattedPrice = accounting.formatMoney(adjustedPrice, currency);
-  }
-
-  return price === 0 ? currentPrice.replace(originalPrice, formattedPrice) : price.replace(originalPrice, formattedPrice);
-}
-
 Object.assign(Reaction, {
   /**
    * translateRegistry

client/modules/i18n/index.js

@@ -1,4 +1,5 @@
 import i18next, { getBrowserLanguage, i18nextDep, localeDep } from "./main";
+export * from "./currency";
 
 export {
   i18next,

imports/plugins/core/layout/client/templates/layout/alerts/inlineAlerts.js

@@ -143,3 +143,5 @@ Alerts = {
   },
   collection_: new Mongo.Collection(null)
 };
+
+export default Alerts;

imports/plugins/core/orders/client/templates/workflow/shippingInvoice.js

@@ -4,7 +4,7 @@ import accounting from "accounting-js";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 import { ReactiveVar } from "meteor/reactive-var";
-import { Reaction, i18next, Logger } from "/client/api";
+import { i18next, Logger, formatNumber } from "/client/api";
 import { NumericInput } from "/imports/plugins/core/ui/client/components";
 import { Media, Orders, Shops } from "/lib/collections";
 import _ from "lodash";
@@ -248,7 +248,7 @@ Template.coreOrderShippingInvoice.helpers({
   },
 
   money(amount) {
-    return Reaction.Currency.formatNumber(amount);
+    return formatNumber(amount);
   },
 
   disabled() {