Marketplace merge development

.meteor/packages

@@ -15,7 +15,6 @@ [email protected]              # 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)
-standard-minifier-js          # a minifier plugin used for Meteor apps by default
 [email protected]                 # ReactiveDict whose contents are preserved across Hot Code Push
 [email protected]                 # Meteor transparent reactive programming library
 [email protected]
@@ -71,7 +70,6 @@ meteorhacks:subs-manager
 natestrauser:select2
 ongoworks:security
 raix:ui-dropped-event
-risul:moment-timezone
 tmeasday:publish-counts
 vsivsi:job-collection@=1.4.0
 react-meteor-data@=0.2.9
@@ -95,3 +93,4 @@ johanbrook:publication-collector
 # meteorhacks:sikka                         # additional ddp, login security
 
 # Custom Packages
+abernix:[email protected]

.meteor/versions

@@ -1,3 +1,5 @@
+abernix:[email protected]
+abernix:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -17,7 +19,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -53,7 +55,7 @@ cfs:[email protected]
 cfs:[email protected]
 cfs:[email protected]
 [email protected]
-[email protected].3_1
+[email protected].6_1
 dburles:[email protected]
 [email protected]
 [email protected]
@@ -65,7 +67,7 @@ [email protected]
 dispatch:[email protected]
 dispatch:[email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
@@ -84,7 +86,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-johanbrook:[email protected].7
+johanbrook:[email protected].8
 jparker:[email protected]
 jparker:[email protected]
 jparker:[email protected]
@@ -106,11 +108,10 @@ [email protected]
 meteorhacks:[email protected]
 meteorhacks:[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 momentjs:[email protected]
 [email protected]
@@ -141,7 +142,6 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-risul:[email protected]
 [email protected]
 [email protected]
 [email protected]

client/modules/accounts/templates/members/memberForm.html

@@ -1,6 +1,7 @@
 <template name="memberForm">
   <div class="panel panel-default">
     <div class="panel-body">
+      {{> inlineAlerts placement="memberform"}}
       <form class="">
         <div class="form-group">
           <label for="member-form-name"><span data-i18n="accountsUI.name">Name</span></label>

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

@@ -2,6 +2,7 @@ import { Reaction, i18next } from "/client/api";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 
+
 /**
  * memberForm events
  *
@@ -19,16 +20,21 @@ Template.memberForm.events({
           let message;
           if (error.reason === "Unable to send invitation email.") {
             message = i18next.t("accountsUI.error.unableToSendInvitationEmail");
+          } else if (error.reason === "A user with this email address already exists") {
+            message = i18next.t("accountsUI.error.userWithEmailAlreadyExists");
           } else if (error.reason !== "") {
             message = error;
           } else {
             message = `${i18next.t("accountsUI.error.errorSendingEmail")
               } ${error}`;
           }
-          Alerts.toast(message, "error", {
-            html: true,
-            timeout: 10000
+
+          Alerts.inline(message, "error", {
+            placement: "memberform"
           });
+
+          template.$("input[type=text], input[type=email]").val("");
+
           return false;
         }
         if (result) {

client/modules/i18n/main.js

@@ -1,4 +1,5 @@
 import i18next from "i18next";
+import moment from "moment";
 import { Meteor } from "meteor/meteor";
 import { Tracker } from "meteor/tracker";
 import { SimpleSchema } from "meteor/aldeed:simple-schema";

imports/plugins/core/i18n/client/containers/localizationSettingsContainer.js

@@ -1,4 +1,5 @@
 import React, { Component } from "react";
+import moment from "moment-timezone";
 import { Meteor } from "meteor/meteor";
 import { Reaction, i18next } from "/client/api";
 import { composeWithTracker } from "/lib/api/compose";

imports/plugins/core/orders/client/templates/list/items.js

@@ -7,20 +7,24 @@ import { Media } from "/lib/collections";
  */
 Template.ordersListItems.helpers({
   media: function () {
-    const variantImage = Media.findOne({
-      "metadata.productId": this.productId,
-      "metadata.variantId": this.variants._id
-    });
-    // variant image
-    if (variantImage) {
-      return variantImage;
-    }
-    // find a default image
-    const productImage = Media.findOne({
-      "metadata.productId": this.productId
-    });
-    if (productImage) {
-      return productImage;
+    const cartImagesSub = Meteor.subscribe("CartItemImage", this);
+    if (cartImagesSub.ready()) {
+      const variantImage = Media.findOne({
+        "metadata.productId": this.productId,
+        "metadata.variantId": this.variants._id
+      });
+      // variant image
+      if (variantImage) {
+        return variantImage;
+      }
+      // find a default image
+      const productImage = Media.findOne({
+        "metadata.productId": this.productId
+      });
+      if (productImage) {
+        return productImage;
+      }
+      return false;
     }
     return false;
   },

imports/plugins/core/ui-navbar/client/components/navbar/navbar.js

@@ -40,10 +40,6 @@ Template.CoreNavigationBar.events({
 });
 
 Template.CoreNavigationBar.helpers({
-  // isMarketplaceOwner() {
-  //   return Reaction.hasMarketplaceAccess("owner");
-  // /* REQUIRES /lib/api version of Reaction */
-  // },
   dropdown() {
     return {
       component: MainDropdown

imports/plugins/core/ui/client/components/menu/dropDownMenu.js

@@ -24,6 +24,12 @@ class DropDownMenu extends Component {
     }
   }
 
+  handleDropdownToggle = () => {
+    this.setState({
+      isOpen: !this.state.isOpen
+    });
+  }
+
   get isOpen() {
     return this.props.isOpen || this.state.isOpen;
   }
@@ -32,12 +38,6 @@ class DropDownMenu extends Component {
     return typeof this.props.isOpen === "boolean";
   }
 
-  handleDropdownToggle = () => {
-    this.setState({
-      isOpen: !this.state.isOpen
-    });
-  }
-
   handleMenuItemChange = (event, value, menuItem) => {
     this.setState({
       label: menuItem.props.label || value,

imports/plugins/core/ui/client/components/tags/tag.jsx

@@ -4,7 +4,6 @@ import classnames from "classnames";
 import Autosuggest from "react-autosuggest";
 import Velocity from "velocity-animate";
 import "velocity-animate/velocity.ui";
-import { Router } from "/client/api";
 import { i18next } from "/client/api";
 import { Button, Handle } from "/imports/plugins/core/ui/client/components";
 import { SortableItem } from "../../containers";
@@ -170,12 +169,6 @@ class Tag extends Component {
    * @return {JSX} simple tag
    */
   renderTag() {
-    const url = Router.pathFor("tag", {
-      hash: {
-        slug: this.props.tag.slug
-      }
-    });
-
     const baseClassName = classnames({
       "rui": true,
       "tag": true,
@@ -186,7 +179,7 @@ class Tag extends Component {
     return (
       <a
         className={baseClassName}
-        href={url}
+        href="#"
         onMouseOut={this.handleTagMouseOut}
         onMouseOver={this.handleTagMouseOver}
         onClick={this.handleClick}

imports/plugins/core/ui/client/components/tags/tags.jsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { PropTypes as ReactionPropTypes } from "/lib/api";
 import { TagItem } from "./";
+import { Router } from "/client/api";
 import classnames from "classnames";
 
 class Tags extends Component {
@@ -63,6 +64,10 @@ class Tags extends Component {
     }
   };
 
+  handleTagClick = (event, tag) => {
+    Router.go("tag", { slug: tag.slug });
+  }
+
   hasDropdownClassName = (tag) => {
     if (this.props.hasDropdownClassName) {
       return this.props.hasDropdownClassName(tag);
@@ -97,6 +102,7 @@ class Tags extends Component {
               tag={tag}
               onMove={this.props.onMoveTag}
               draggable={this.props.draggable}
+              onTagClick={this.handleTagClick}
               onTagInputBlur={this.handleTagSave}
               onTagMouseOut={this.handleTagMouseOut}
               onTagMouseOver={this.handleTagMouseOver}
@@ -181,6 +187,7 @@ Tags.propTypes = {
   onMoveTag: PropTypes.func,
   onNewTagSave: PropTypes.func,
   onNewTagUpdate: PropTypes.func,
+  onTagClick: PropTypes.func,
   onTagMouseOut: PropTypes.func,
   onTagMouseOver: PropTypes.func,
   onTagRemove: PropTypes.func,

imports/plugins/included/payments-braintree/server/methods/braintreeApi.js

@@ -1,6 +1,7 @@
 /* eslint camelcase: 0 */
 import Braintree from "braintree";
 import accounting from "accounting-js";
+import moment from "moment";
 import Future from "fibers/future";
 import { Meteor } from "meteor/meteor";
 import { Packages } from "/lib/collections";

imports/plugins/included/product-variant/client/templates/products/productSettings/productSettings.html

@@ -102,7 +102,7 @@ <h4 class="panel-title" data-i18n="productDetailEdit.size">Size</h4>
 <template name="productSettingsListItem">
   <div class="list-group-item product-settings-list-item {{listItemActiveClassName _id}}" data-id="{{_id}}" id="{{_id}}">
     <a
-      href="{{pdpPath}}"
+      href="#"
       data-event-category="grid"
       data-event-action="product-click"
       data-event-label="grid product click"

imports/plugins/included/product-variant/client/templates/products/productSettings/productSettings.js

@@ -73,27 +73,15 @@ Template.productSettings.helpers({
   }
 });
 
-Template.productSettingsListItem.helpers({
-  pdpPath() {
-    const product = this;
-
-    if (product) {
-      let handle = product.handle;
-
-      if (product.__published) {
-        handle = product.__published.handle;
-      }
-
-      return Reaction.Router.pathFor("product", {
-        hash: {
-          handle
-        }
-      });
-    }
-
-    return "/";
-  },
+Template.productSettingsListItem.events({
+  "click [data-event-action=product-click]": function () {
+    Reaction.Router.go("product", {
+      handle: this.handle
+    });
+  }
+});
 
+Template.productSettingsListItem.helpers({
   displayPrice() {
     if (this._id) {
       return ReactionProduct.getProductPriceRange(this._id).range;

imports/plugins/included/search-mongo/server/methods/searchcollections.js

@@ -1,5 +1,6 @@
 /* eslint camelcase: 0 */
 import _ from "lodash";
+import moment from "moment";
 import { Meteor } from "meteor/meteor";
 import { check, Match } from "meteor/check";
 import { Reaction, Logger } from "/server/api";

package.json

@@ -138,9 +138,9 @@
   },
   "jest": {
     "moduleNameMapper": {
-      "^/lib(.*)": "<rootDir>/lib/$1",
-      "^/imports/plugins(.*)": "<rootDir>/imports/plugins/$1",
-      "^/client/api(.*)": "<rootDir>/imports/test-utils/__mocks__/client/api$1",
+      "^\/lib(.*)": "<rootDir>/lib/$1",
+      "^\/imports\/plugins(.*)": "<rootDir>/imports/plugins/$1",
+      "^\/client\/api(.*)": "<rootDir>/imports/test-utils/__mocks__/client/api$1",
       "^meteor/aldeed:simple-schema": "<rootDir>/imports/test-utils/__mocks__/meteor/aldeed-simple-schema",
       "^meteor/(.*)": "<rootDir>/imports/test-utils/__mocks__/meteor/$1"
     }

private/data/i18n/en.json

@@ -676,6 +676,7 @@
           "emailDoesntMatchTheCriteria": "Email doesn't match the criteria.",
           "errorSendingEmail": "Error sending email, possible configuration issue.",
           "unableToSendInvitationEmail": "Unable to send invitation email.",
+          "userWithEmailAlreadyExists": "A user with this email address already exists",
           "failedToLogout": "Failed to logout.",
           "invalidLoginToken": "Invalid login token",
           "loginForbidden": "Login forbidden",

server/api/core/accounts/password.js

@@ -1,4 +1,5 @@
 import _ from "lodash";
+import moment from "moment";
 import { Meteor } from "meteor/meteor";
 import { Accounts } from "meteor/accounts-base";
 import { SSR } from "meteor/meteorhacks:ssr";