Merge to Master

.github/issue_template.md

@@ -10,6 +10,9 @@ to our [Gitter](https://gitter.im/reactioncommerce/reaction) channel instead.
 
 ### Steps to Reproduce the Behavior
 
+### Versions
+(run `reaction -v` from your reaction directory)
+
 For enhancements or other issues, please describe in as much detail as
 possible how the app should be changed and how this would benefit
 users/developers

.gitmodules

@@ -4,3 +4,9 @@
 [submodule "imports/plugins/custom"]
 	path = imports/plugins/custom
 	url = [email protected]:evereveofficial/eePlugins.git
+# [submodule "private/settings"]
+# 	path = private/settings
+# 	url = [email protected]:evereveofficial/ReactionPrivateSettings.git
+[submodule "private/settings"]
+	path = private/settings
+	url = [email protected]:evereveofficial/ReactionPrivateSettings.git

.meteor/packages

@@ -11,7 +11,7 @@ [email protected]             # Packages every Meteor app needs to have
 [email protected]       # Packages for a great mobile UX
 [email protected]    # Compile .html files into Meteor Blaze views
 [email protected]               # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.6.3              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.7.2              # Enable ECMAScript2015+ syntax in app code
 [email protected]   # ensure meteor method argument validation
 [email protected]          # security-related policies enforced by newer browsers
 juliancwirko:postcss          # CSS post-processing plugin (replaces standard-minifier-css)
@@ -36,10 +36,10 @@ mdg:validated-method
 [email protected]
 
 # Meteor Auth Packages
-[email protected].15
-[email protected].4
+[email protected].16
+[email protected].5
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 # accounts-github
@@ -96,6 +96,6 @@ johanbrook:publication-collector
 # meteorhacks:sikka                         # additional ddp, login security
 
 # Custom Packages
-facebook-config-ui
-google-config-ui
-twitter-config-ui
+facebook-config-ui@1.0.0
+google-config-ui@1.0.0
+twitter-config-ui@1.0.0

.meteor/release

@@ -1 +1 @@
-[email protected].3.2
+[email protected].4.1

.meteor/versions

@@ -1,10 +1,10 @@
 abernix:[email protected]
 abernix:[email protected]
-[email protected].15
+[email protected].16
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
-[email protected].4
+[email protected].5
 [email protected]
 alanning:[email protected]
 aldeed:[email protected]
@@ -19,7 +19,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-babel-compiler@6.14.1
+babel-compiler@6.18.2
 [email protected]
 [email protected]
 [email protected]
@@ -59,26 +59,26 @@ chuangbo:[email protected]
 [email protected]_4
 dburles:[email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
-[email protected].13
+[email protected].14
 [email protected]
 [email protected]
-dispatch:mocha@0.2.0
+dispatch:mocha@0.3.0
 dispatch:[email protected]
-ecmascript@0.6.3
+ecmascript@0.7.3
 [email protected]
 [email protected]
-email@1.1.18
+email@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 gadicc:[email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -116,8 +116,8 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-modules@0.7.9
-[email protected].9
+modules@0.8.2
+[email protected].10
 momentjs:[email protected]
 [email protected]
 [email protected]
@@ -141,7 +141,7 @@ [email protected]
 raix:[email protected]
 raix:[email protected]
 [email protected]
-[email protected].7
+[email protected].8
 [email protected]
 [email protected]
 [email protected]
@@ -169,5 +169,5 @@ [email protected]
 [email protected]
 [email protected]
 vsivsi:[email protected]
-[email protected].14
+[email protected].15
 [email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM reactioncommerce/base:v1.2.2
+FROM reactioncommerce/base:v1.3.0
 
 # Default environment variables
 ENV ROOT_URL "http://localhost"

README.md

@@ -32,6 +32,8 @@ cd reaction
 reaction
 ```
 
+_Reaction requires Meteor, Git, MongoDB, OS Specific Build Tools, and (optionally) ImageMagick. See our [Requirements Docs](https://docs.reactioncommerce.com/reaction-docs/master/requirements) for requirements installation information._
+
 For more information on setup and configuration, check out the [installation](https://docs.reactioncommerce.com/reaction-docs/development/installation) and [configuration](https://docs.reactioncommerce.com/reaction-docs/development/configuration) docs.
 
 ## Participation
@@ -70,7 +72,7 @@ Docker images are pushed when Reaction sucessfully builds and passes all tests o
 
 ### Contributing
 
-Want to contribute? That's great! [Here's you can get started](https://guides.github.com/activities/contributing-to-open-source/#contributing).
+Want to contribute? That's great! [Here's how you can get started](https://guides.github.com/activities/contributing-to-open-source/#contributing).
 
 Check out our Issues page, and if you find something you want to work on, let us know in the comments. If you're interested in a particular [project](https://github.com/reactioncommerce/reaction/projects) and you aren’t sure where to begin, feel free to ask. Start small!
 

client/modules/accounts/templates/members/member.js

@@ -20,6 +20,8 @@ const getPermissionMap = (permissions) => {
  */
 Template.member.events({
   "click [data-event-action=showMemberSettings]": function () {
+    $(".customerUsageType input").val(""); // form reset
+    $(".customerUsageType").addClass("hide"); // form reset
     Reaction.setActionViewDetail({
       label: "Permissions",
       i18nKeyLabel: "admin.settings.permissionsSettingsLabel",

client/modules/core/startup.js

@@ -2,23 +2,6 @@ import { Meteor } from "meteor/meteor";
 import { Tracker } from "meteor/tracker";
 import Reaction from "./main";
 
-// @see https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
-let hidden;
-// let visibilityState; // keep this for a some case
-if (typeof document.hidden !== "undefined") {
-  hidden = "hidden";
-  // visibilityState = "visibilityState";
-} else if (typeof document.mozHidden !== "undefined") {
-  hidden = "mozHidden";
-  // visibilityState = "mozVisibilityState";
-} else if (typeof document.msHidden !== "undefined") {
-  hidden = "msHidden";
-  // visibilityState = "msVisibilityState";
-} else if (typeof document.webkitHidden !== "undefined") {
-  hidden = "webkitHidden";
-  // visibilityState = "webkitVisibilityState";
-}
-
 /**
  *  Startup Reaction
  *  Init Reaction client
@@ -30,16 +13,14 @@ Meteor.startup(function () {
   return Tracker.autorun(function () {
     const userId = Meteor.userId();
     // TODO: maybe `visibilityState` will be better here
-    let isHidden;
     let loggingIn;
     let sessionId;
     Tracker.nonreactive(function () {
-      isHidden = document[hidden];
       loggingIn = Accounts.loggingIn();
       sessionId = amplify.store("Reaction.session");
     });
     if (!userId) {
-      if (!isHidden && !loggingIn || typeof sessionId !== "string") {
+      if (!loggingIn || typeof sessionId !== "string") {
         Accounts.loginWithAnonymous();
       }
     }

client/modules/router/main.js

@@ -121,7 +121,9 @@ export function ReactionLayout(options = {}) {
     if (Reaction.Subscriptions.Shops.ready()) {
       const shop = Shops.findOne(Reaction.getShopId());
       if (shop) {
-        const newLayout = shop.layout.find((x) => selectLayout(x, layout, workflow));
+        const sortedLayout = shop.layout.sort((prev, next) => prev.priority - next.priority);
+        const newLayout = sortedLayout.find((x) => selectLayout(x, layout, workflow));
+
         // oops this layout wasn't found. render notFound
         if (!newLayout) {
           BlazeLayout.render("notFound");

client/templates/index.html

@@ -2,4 +2,5 @@
   <meta name="fragment" content="!">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <noscript><div style="padding: 40px; font-size: 200%; text-align: center;">This site requires JavaScript. Please enable it in your browser settings.</div></noscript>
+  <script type="text/javascript">window.prerenderReady = false;</script>
 </head>

imports/plugins/core/checkout/register.js

@@ -42,39 +42,34 @@ Reaction.registerPackage({
     workflow: "coreCartWorkflow",
     container: "checkout-steps-main",
     audience: ["guest", "anonymous"],
-    priority: 1,
     position: "1"
   }, {
     template: "checkoutAddressBook",
     label: "Shipping Billing",
     workflow: "coreCartWorkflow",
     container: "checkout-steps-main",
     audience: ["guest", "anonymous"],
-    priority: 2,
     position: "2"
   }, {
     template: "coreCheckoutShipping",
     label: "Shipping Options",
     workflow: "coreCartWorkflow",
     container: "checkout-steps-main",
     audience: ["guest", "anonymous"],
-    priority: 3,
     position: "3"
   }, {
     template: "checkoutReview",
     label: "Review Payment",
     workflow: "coreCartWorkflow",
     container: "checkout-steps-side",
     audience: ["guest", "anonymous"],
-    priority: 4,
     position: "4"
   }, {
     template: "checkoutPayment",
     label: "Complete",
     workflow: "coreCartWorkflow",
     container: "checkout-steps-side",
     audience: ["guest", "anonymous"],
-    priority: 5,
     position: "5"
   }]
 });

imports/plugins/core/email/client/components/emailTableColumn.js

@@ -1,10 +1,14 @@
 import React, { Component, PropTypes } from "react";
 import moment from "moment";
 import { Icon } from "/imports/plugins/core/ui/client/components";
+import { i18next } from "/client/api";
 
 class EmailTableColumn extends Component {
   static propTypes = {
-    data: PropTypes.object,
+    data: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.instanceOf(Date)
+    ]),
     metadata: PropTypes.object,
     rowData: PropTypes.object
   }

imports/plugins/core/orders/client/components/lineItems.js

@@ -22,7 +22,7 @@ class LineItems extends Component {
       <div className="order-items">
         <div
           className="invoice order-item form-group order-summary-form-group"
-          onClick={() => handleClick(uniqueItem.cartItemId)}
+          onClick={() => handleClick(uniqueItem._id)}
           style={{ height: 70 }}
         >
 
@@ -42,7 +42,7 @@ class LineItems extends Component {
           </div>
 
           <div className="order-detail-quantity">
-            {quantity || 1}
+           {quantity || uniqueItem.quantity}
           </div>
 
           <div className="order-detail-price">
@@ -56,7 +56,7 @@ class LineItems extends Component {
     );
   }
 
-  renderLineItemInvoice(uniqueItem, shippingRate, quantity) {
+  renderLineItemInvoice(uniqueItem) {
     return (
       <div>
         <div className="order-summary-form-group">
@@ -69,14 +69,14 @@ class LineItems extends Component {
         <div className="order-summary-form-group">
           <strong><Translation defaultValue="Shipping" i18nKey="cartSubTotals.shipping"/></strong>
           <div className="invoice-details">
-            {formatPriceString(shippingRate)}
+            {formatPriceString(uniqueItem.shipping.rate)}
           </div>
         </div>
 
         <div className="order-summary-form-group">
           <strong>Item tax</strong>
           <div className="invoice-details">
-            {uniqueItem.taxDetail ? formatPriceString(uniqueItem.taxDetail.tax / quantity) : formatPriceString(0)}
+            {uniqueItem.taxDetail ? formatPriceString(uniqueItem.taxDetail.tax / uniqueItem.quantity) : formatPriceString(0)}
           </div>
         </div>
 
@@ -92,10 +92,10 @@ class LineItems extends Component {
           <div className="invoice-details">
             {uniqueItem.taxDetail ?
               <strong>
-                {this.calculateTotal(uniqueItem.variants.price, shippingRate, uniqueItem.taxDetail.tax)}
+                {this.calculateTotal(uniqueItem.variants.price, uniqueItem.shipping.rate, uniqueItem.taxDetail.tax)}
               </strong> :
                <strong>
-                {this.calculateTotal(uniqueItem.variants.price, shippingRate, 0)}
+                {this.calculateTotal(uniqueItem.variants.price, uniqueItem.shipping.rate, 0)}
               </strong>
             }
           </div>
@@ -107,22 +107,21 @@ class LineItems extends Component {
 
   render() {
     const { uniqueItems, isExpanded, onClose } = this.props;
-
     return (
       <div>
         {uniqueItems.map((uniqueItem) => {
-          if (!isExpanded(uniqueItem.cartItemId)) {
+          if (!isExpanded(uniqueItem._id)) {
             return (
-              <div key={uniqueItem.cartItemId}> { this.renderLineItem(uniqueItem.items[0], uniqueItem.items.length) } </div>
+              <div key={uniqueItem._id}> { this.renderLineItem(uniqueItem) } </div>
             );
           }
 
           return (
-            <div className="roll-up-invoice-list" key={uniqueItem.cartItemId}>
+            <div className="roll-up-invoice-list" key={uniqueItem._id}>
               <div className="roll-up-content">
 
                 <div style={{ float: "right" }}>
-                  <button className="rui btn btn-default flat icon-only" onClick={() => onClose(uniqueItem.cartItemId)}>
+                  <button className="rui btn btn-default flat icon-only" onClick={() => onClose(uniqueItem._id)}>
                     <i
                       className="rui font-icon fa-lg fa fa-times"
                     />
@@ -131,12 +130,12 @@ class LineItems extends Component {
 
                 <br/><br/>
 
-                {uniqueItem.items.map((item) => (
-                  <div key={item._id}>
-                    { this.renderLineItem(item) }
-                    { this.renderLineItemInvoice(item, uniqueItem.shippingRate, uniqueItem.items.length) }
+                {[...Array(uniqueItem.quantity)].map((v, i) =>
+                  <div key={i}>
+                    { this.renderLineItem(uniqueItem, 1) }
+                    { this.renderLineItemInvoice(uniqueItem) }
                   </div>
-                ))}
+                )}
 
               </div>
           </div>

imports/plugins/core/orders/client/containers/lineItemsContainer.js

@@ -73,7 +73,6 @@ class LineItemsContainer extends Component {
 
   render() {
     const { invoice, uniqueItems } = this.props;
-
     return (
       <TranslationProvider>
         <LineItems