From 39afe6cc298bba14db608d08b117e2ea8f904539 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Mon, 2 Oct 2017 13:42:00 -0700
Subject: [PATCH 1/6] cascade inventory policy toggle functionality

---
 .../ui/client/components/switch/switch.js     | 60 +++++++++++++++----
 .../default-theme/client/styles/forms.less    | 11 ++++
 .../product-variant/components/variantForm.js | 54 +++++++++++++----
 .../containers/variantFormContainer.js        | 44 ++++++++++++++
 .../product-variant/server/i18n/en.json       |  1 +
 5 files changed, 147 insertions(+), 23 deletions(-)

diff --git a/imports/plugins/core/ui/client/components/switch/switch.js b/imports/plugins/core/ui/client/components/switch/switch.js
index 3f64495d26f..038e6c2cd61 100644
--- a/imports/plugins/core/ui/client/components/switch/switch.js
+++ b/imports/plugins/core/ui/client/components/switch/switch.js
@@ -10,6 +10,9 @@ class Switch extends Component {
 
   static propTypes = {
     checked: PropTypes.bool,
+    disabled: PropTypes.bool,
+    helpText: PropTypes.string,
+    i18nKeyHelpText: PropTypes.string,
     i18nKeyLabel: PropTypes.string,
     i18nKeyOnLabel: PropTypes.string,
     label: PropTypes.string,
@@ -26,6 +29,16 @@ class Switch extends Component {
     };
   }
 
+  get isHelpMode() {
+    // TODO: add functionality to toggle helpMode on / off.
+    // When on, helpText will always show.
+    // When off, only validation messages will show.
+    // For now, all helpText will show, meaning this doesn't affect how the app currently works.
+    // This is here just to lay the foundation for when we add the toggle.
+
+    return true;
+  }
+
   handleChange = (event) => {
     if (this.props.onChange) {
       const isInputChecked = !this.props.checked;
@@ -61,6 +74,27 @@ class Switch extends Component {
     return null;
   }
 
+  /**
+   * Render help text or validation message
+   * @return {ReactNode|null} react node or null
+   */
+  renderHelpText() {
+    const helpMode = this.isHelpMode;
+    const helpText = this.props.helpText;
+    const i18nKey = this.props.i18nKeyHelpText;
+
+    // Show if helpMode is true
+    if (helpText && helpMode) {
+      return (
+        <span className="help-block">
+          <Components.Translation defaultValue={helpText} i18nKey={i18nKey} />
+        </span>
+      );
+    }
+
+    return null;
+  }
+
   checkboxRef = (ref) => {
     this._checkbox = ref;
   }
@@ -68,7 +102,8 @@ class Switch extends Component {
   render() {
     const baseClassName = classnames({
       rui: true,
-      switch: true
+      switch: true,
+      disabled: this.props.disabled
     });
 
     const switchControlClassName = classnames({
@@ -77,16 +112,19 @@ class Switch extends Component {
     });
 
     return (
-      <label className={baseClassName}>
-        <input
-          checked={this.props.checked}
-          onChange={this.handleChange}
-          ref={this.checkboxRef}
-          type="checkbox"
-        />
-        <div className={switchControlClassName} />
-        {this.renderLabel()}
-      </label>
+      <span>
+        <label className={baseClassName}>
+          <input
+            checked={this.props.checked}
+            onChange={this.handleChange}
+            ref={this.checkboxRef}
+            type="checkbox"
+          />
+          <div className={switchControlClassName} />
+          {this.renderLabel()}
+        </label>
+        {this.renderHelpText()}
+      </span>
     );
   }
 }
diff --git a/imports/plugins/included/default-theme/client/styles/forms.less b/imports/plugins/included/default-theme/client/styles/forms.less
index 40316b423b4..b4116a1bedc 100644
--- a/imports/plugins/included/default-theme/client/styles/forms.less
+++ b/imports/plugins/included/default-theme/client/styles/forms.less
@@ -72,6 +72,12 @@
   input, label {
     display: none;
   }
+
+  &.disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+    pointer-events: none;
+  }
 }
 
 .rui.switch .switch-control {
@@ -137,6 +143,11 @@
   padding: 0;
 }
 
+// Original style is inherited from Bootstrap
+.rui.switch .help-block {
+  color: @black30;
+}
+
 .checkbox-large {
   -webkit-appearance: none;
   // background-color: #fafafa;
diff --git a/imports/plugins/included/product-variant/components/variantForm.js b/imports/plugins/included/product-variant/components/variantForm.js
index 5bb4649e8ab..fd606fd256a 100644
--- a/imports/plugins/included/product-variant/components/variantForm.js
+++ b/imports/plugins/included/product-variant/components/variantForm.js
@@ -6,6 +6,7 @@ import Velocity from "velocity-animate";
 import "velocity-animate/velocity.ui";
 import { Components } from "@reactioncommerce/reaction-components";
 import { formatPriceString } from "/client/api";
+import { Reaction } from "/lib/api";
 
 const fieldNames = [
   "title",
@@ -129,6 +130,7 @@ class VariantForm extends Component {
   }
 
   handleFieldBlur = (event, value, field) => {
+    console.log("field", field);
     if (this.props.onVariantFieldSave) {
       this.props.onVariantFieldSave(this.variant._id, field, value, this.state.variant);
     }
@@ -261,6 +263,44 @@ class VariantForm extends Component {
     }
   }
 
+  renderInventoryPolicyField() {
+    if (this.props.hasChildVariants(this.variant)) {
+      return (
+        <div className="col-sm-12">
+          <Components.Switch
+            i18nKeyLabel="productVariant.inventoryPolicy"
+            i18nKeyOnLabel="productVariant.inventoryPolicy"
+            name="inventoryPolicy"
+            label={"Allow backorder"}
+            onLabel={"Allow backorder"}
+            checked={!this.state.inventoryPolicy}
+            onChange={this.handleInventoryPolicyChange}
+            validation={this.props.validation}
+            disabled={true}
+            helpText={"Backorder allowance is now controlled by options"}
+            i18nKeyHelpText={"admin.helpText.variantBackorderToggle"}
+            style={{ backgroundColor: "lightgrey", cursor: "not-allowed" }}
+          />
+        </div>
+      );
+    }
+
+    return (
+      <div className="col-sm-12">
+        <Components.Switch
+          i18nKeyLabel="productVariant.inventoryPolicy"
+          i18nKeyOnLabel="productVariant.inventoryPolicy"
+          name="inventoryPolicy"
+          label={"Allow backorder"}
+          onLabel={"Allow backorder"}
+          checked={!this.state.inventoryPolicy}
+          onChange={this.handleInventoryPolicyChange}
+          validation={this.props.validation}
+        />
+      </div>
+    );
+  }
+
   renderQuantityField() {
     if (this.props.hasChildVariants(this.variant)) {
       return (
@@ -526,18 +566,7 @@ class VariantForm extends Component {
             </div>
           </div>
           <div className="row">
-            <div className="col-sm-6">
-              <Components.Switch
-                i18nKeyLabel="productVariant.inventoryPolicy"
-                i18nKeyOnLabel="productVariant.inventoryPolicy"
-                name="inventoryPolicy"
-                label={"Allow backorder"}
-                onLabel={"Allow backorder"}
-                checked={!this.state.inventoryPolicy}
-                onChange={this.handleInventoryPolicyChange}
-                validation={this.props.validation}
-              />
-            </div>
+            {this.renderInventoryPolicyField()}
           </div>
         </Components.SettingsCard>
       </Components.CardGroup>
@@ -654,6 +683,7 @@ class VariantForm extends Component {
 
             <div className="row">
               {this.renderQuantityField()}
+              {this.renderInventoryPolicyField()}
             </div>
           </Components.CardBody>
         </Components.Card>
diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index 626da82716c..728bd581225 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -178,11 +178,18 @@ const wrapComponent = (Comp) => (
     handleVariantFieldSave = (variantId, fieldName, value, variant) => {
       const validationStatus = this.runVariantValidation(variant);
 
+      console.log("fieldName", fieldName);
+
+
       if (validationStatus.isFieldValid(fieldName)) {
         Meteor.call("products/updateProductField", variantId, fieldName, value, (error) => {
           if (error) {
             Alerts.toast(error.message, "error");
           }
+
+          if (fieldName === "inventoryPolicy") {
+            this.updateInventoryPolicyIfChildVariants(variant);
+          }
         });
       }
     }
@@ -195,6 +202,43 @@ const wrapComponent = (Comp) => (
       Meteor.call("products/updateProductField", variant._id, "isVisible", !variant.isVisible);
     }
 
+    /**
+     * @method updateInventoryPolicyIfChildVariants
+     * @description update parent inventory policy if variant has children children
+     * @param {Object} variant product or variant document
+     * @return {undefined} return nothing
+     */
+    updateInventoryPolicyIfChildVariants = (variant) => {
+      // Get parent of variant
+      const parentId = variant.ancestors[1];
+
+      // Get all of parents children
+      // Check to see if their inventory policy is true / false
+      if (parentId) {
+        const options = ReactionProduct.getVariants(parentId);
+        if (options && options.length) {
+          const inventoryPolicy = options.filter((option) => {
+            return option.inventoryPolicy === false;
+          });
+
+          // If all inventory policies on children are true, update parent to be true
+          if (inventoryPolicy.length === 0) {
+            return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", true, (error) => {
+              if (error) {
+                Alerts.toast(error.message, "error");
+              }
+            });
+          }
+          // If any child has a false inventoryPolicy, update parent to be false
+          return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", false, (error) => {
+            if (error) {
+              Alerts.toast(error.message, "error");
+            }
+          });
+        }
+      }
+    }
+
     updateQuantityIfChildVariants =  (variant) => {
       if (this.hasChildVariants(variant)) {
         const variantQuantity = ReactionProduct.getVariantQuantity(variant);
diff --git a/imports/plugins/included/product-variant/server/i18n/en.json b/imports/plugins/included/product-variant/server/i18n/en.json
index 656d523c90e..cf53e907d78 100644
--- a/imports/plugins/included/product-variant/server/i18n/en.json
+++ b/imports/plugins/included/product-variant/server/i18n/en.json
@@ -10,6 +10,7 @@
           "optionTitle": "Displayed on Product Detail Page",
           "price": "Purchase price",
           "title": "Displayed in cart, checkout, and orders",
+          "variantBackorderToggle": "Backorder allowance is now controlled by options",
           "variantInventoryQuantity": "Variant inventory is now controlled by options"
         },
         "tooltip": {

From afc591793baf275b5fa503e0eb0045a479953775 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Mon, 2 Oct 2017 13:48:30 -0700
Subject: [PATCH 2/6] remove logs

---
 .../plugins/included/product-variant/components/variantForm.js | 1 -
 .../product-variant/containers/variantFormContainer.js         | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/imports/plugins/included/product-variant/components/variantForm.js b/imports/plugins/included/product-variant/components/variantForm.js
index fd606fd256a..7ea50314717 100644
--- a/imports/plugins/included/product-variant/components/variantForm.js
+++ b/imports/plugins/included/product-variant/components/variantForm.js
@@ -130,7 +130,6 @@ class VariantForm extends Component {
   }
 
   handleFieldBlur = (event, value, field) => {
-    console.log("field", field);
     if (this.props.onVariantFieldSave) {
       this.props.onVariantFieldSave(this.variant._id, field, value, this.state.variant);
     }
diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index 728bd581225..fb53447b875 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -178,9 +178,6 @@ const wrapComponent = (Comp) => (
     handleVariantFieldSave = (variantId, fieldName, value, variant) => {
       const validationStatus = this.runVariantValidation(variant);
 
-      console.log("fieldName", fieldName);
-
-
       if (validationStatus.isFieldValid(fieldName)) {
         Meteor.call("products/updateProductField", variantId, fieldName, value, (error) => {
           if (error) {

From abb67df12ca2b98e1b333d14cdd3007f01fafb3d Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Mon, 2 Oct 2017 15:19:27 -0700
Subject: [PATCH 3/6] getParent and getSibling methods

---
 .../containers/variantFormContainer.js        | 54 ++++++++++---------
 lib/api/catalog.js                            | 30 +++++++++++
 lib/api/products.js                           | 24 +++++++++
 3 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index fb53447b875..2fc004bbd72 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -206,33 +206,37 @@ const wrapComponent = (Comp) => (
      * @return {undefined} return nothing
      */
     updateInventoryPolicyIfChildVariants = (variant) => {
-      // Get parent of variant
-      const parentId = variant.ancestors[1];
-
-      // Get all of parents children
+      // Get all siblings, including current variant
       // Check to see if their inventory policy is true / false
-      if (parentId) {
-        const options = ReactionProduct.getVariants(parentId);
-        if (options && options.length) {
-          const inventoryPolicy = options.filter((option) => {
-            return option.inventoryPolicy === false;
-          });
+      const options = ReactionProduct.getSiblings(variant);
 
-          // If all inventory policies on children are true, update parent to be true
-          if (inventoryPolicy.length === 0) {
-            return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", true, (error) => {
-              if (error) {
-                Alerts.toast(error.message, "error");
-              }
-            });
-          }
-          // If any child has a false inventoryPolicy, update parent to be false
-          return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", false, (error) => {
-            if (error) {
-              Alerts.toast(error.message, "error");
-            }
-          });
-        }
+      console.log("getParent", ReactionProduct.getParent(variant));
+
+      console.log("variant", variant);
+      console.log("options", options);
+
+      console.log("getSiblings", ReactionProduct.getSiblings(variant));
+      if (options && options.length) {
+        const inventoryPolicy = options.filter((option) => {
+          return option.inventoryPolicy === false;
+        });
+
+        console.log("getParent", ReactionProduct.getParent(variant));
+
+        // // If all inventory policies on children are true, update parent to be true
+        // if (inventoryPolicy.length === 0) {
+        //   return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", true, (error) => {
+        //     if (error) {
+        //       Alerts.toast(error.message, "error");
+        //     }
+        //   });
+        // }
+        // // If any child has a false inventoryPolicy, update parent to be false
+        // return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", false, (error) => {
+        //   if (error) {
+        //     Alerts.toast(error.message, "error");
+        //   }
+        // });
       }
     }
 
diff --git a/lib/api/catalog.js b/lib/api/catalog.js
index c3a7a2b93d4..06d32178540 100644
--- a/lib/api/catalog.js
+++ b/lib/api/catalog.js
@@ -162,6 +162,36 @@ export default {
     }).map(this.getPublishedOrRevision);
   },
 
+  /**
+   * @method getParent
+   * @description Get direct parent variant
+   * @summary could be useful for lower level variants to get direct parents
+   * @param {Object} [variant] - product / variant object
+   * @return {Array} Parent variant or empty
+   */
+  getParent(variant) {
+    return Products.find({
+      _id: { $in: variant.ancestors },
+      type: "variant"
+    }).map(this.getPublishedOrRevision);
+  },
+
+  /**
+   * @method getSiblings
+   * @description Get all sibling variants - variants with the same ancestor tree
+   * @summary could be useful for child variants relationships with top-level variants
+   * @param {Object} [variant] - product / variant object
+   * @param {String} [type] - type of variant
+   * @param {Boolean} [includeSelf] - include current variant in results
+   * @return {Array} Sibling variants or empty array
+   */
+  getSiblings(variant, type) {
+    return Products.find({
+      ancestors: [variant.ancestors],
+      type: type || "variant"
+    }).map(this.getPublishedOrRevision);
+  },
+
   /**
    * @method getTopVariants
    * @description Get only product top level variants
diff --git a/lib/api/products.js b/lib/api/products.js
index d4dfc49cc6e..f1296e5c3c9 100644
--- a/lib/api/products.js
+++ b/lib/api/products.js
@@ -279,6 +279,30 @@ ReactionProduct.getVariants = (id, type) => {
   return Catalog.getVariants(id || ReactionProduct.selectedProductId(), type);
 };
 
+/**
+ * @method getSiblings
+ * @description Get all sibling variants - variants with the same ancestor tree
+ * @summary could be useful for child variants relationships with top-level variants
+ * @param {Object} [variant] - product / variant object
+ * @param {String} [type] - type of variant
+ * @param {Boolean} [includeSelf] - include current variant in results
+ * @return {Array} Sibling variants or empty array
+ */
+ReactionProduct.getSiblings = (variant, type) => {
+  return Catalog.getSiblings(variant, type);
+};
+
+/**
+ * @method getParent
+ * @description Get direct parent variant
+ * @summary could be useful for lower level variants to get direct parents
+ * @param {Object} [variant] - product / variant object
+ * @return {Array} Parent variant or empty
+ */
+ReactionProduct.getParent = (variant) => {
+  return Catalog.getParent(variant);
+};
+
 /**
  * @method getTopVariants
  * @description Get only product top level variants

From 756f7d07d1d8f739e1dcde00c741f6df4d3b44f5 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Mon, 2 Oct 2017 16:12:10 -0700
Subject: [PATCH 4/6] filter => every

---
 .../containers/variantFormContainer.js        | 53 +++++++++----------
 lib/api/catalog.js                            |  7 +--
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index 2fc004bbd72..5409328003d 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -207,36 +207,33 @@ const wrapComponent = (Comp) => (
      */
     updateInventoryPolicyIfChildVariants = (variant) => {
       // Get all siblings, including current variant
-      // Check to see if their inventory policy is true / false
       const options = ReactionProduct.getSiblings(variant);
+      // Get parent
+      const parent = ReactionProduct.getParent(variant);
+
+      // If this is not a top-level variant, update top-level inventory policy as well
+      if (parent) {
+        if (options && options.length) {
+          // Check to see if every variant option inventory policy is true
+          const inventoryPolicy = options.every((option) => {
+            return option.inventoryPolicy === true;
+          });
 
-      console.log("getParent", ReactionProduct.getParent(variant));
-
-      console.log("variant", variant);
-      console.log("options", options);
-
-      console.log("getSiblings", ReactionProduct.getSiblings(variant));
-      if (options && options.length) {
-        const inventoryPolicy = options.filter((option) => {
-          return option.inventoryPolicy === false;
-        });
-
-        console.log("getParent", ReactionProduct.getParent(variant));
-
-        // // If all inventory policies on children are true, update parent to be true
-        // if (inventoryPolicy.length === 0) {
-        //   return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", true, (error) => {
-        //     if (error) {
-        //       Alerts.toast(error.message, "error");
-        //     }
-        //   });
-        // }
-        // // If any child has a false inventoryPolicy, update parent to be false
-        // return Meteor.call("products/updateProductField", parentId, "inventoryPolicy", false, (error) => {
-        //   if (error) {
-        //     Alerts.toast(error.message, "error");
-        //   }
-        // });
+          // If all inventory policies on children are true, update parent to be true
+          if (inventoryPolicy === true) {
+            return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", true, (error) => {
+              if (error) {
+                Alerts.toast(error.message, "error");
+              }
+            });
+          }
+          // If any child has a false inventoryPolicy, update parent to be false
+          return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", false, (error) => {
+            if (error) {
+              Alerts.toast(error.message, "error");
+            }
+          });
+        }
       }
     }
 
diff --git a/lib/api/catalog.js b/lib/api/catalog.js
index 06d32178540..a51387624b7 100644
--- a/lib/api/catalog.js
+++ b/lib/api/catalog.js
@@ -170,10 +170,11 @@ export default {
    * @return {Array} Parent variant or empty
    */
   getParent(variant) {
-    return Products.find({
+    const parent = Products.findOne({
       _id: { $in: variant.ancestors },
       type: "variant"
-    }).map(this.getPublishedOrRevision);
+    });
+    return this.getPublishedOrRevision(parent);
   },
 
   /**
@@ -187,7 +188,7 @@ export default {
    */
   getSiblings(variant, type) {
     return Products.find({
-      ancestors: [variant.ancestors],
+      ancestors: variant.ancestors,
       type: type || "variant"
     }).map(this.getPublishedOrRevision);
   },

From 9c51826a733a2af6516f530166c47a9f3807c206 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Mon, 2 Oct 2017 16:13:24 -0700
Subject: [PATCH 5/6] getParent -> getVariantParent

---
 .../product-variant/containers/variantFormContainer.js      | 2 +-
 lib/api/catalog.js                                          | 4 ++--
 lib/api/products.js                                         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index 5409328003d..f141728469b 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -209,7 +209,7 @@ const wrapComponent = (Comp) => (
       // Get all siblings, including current variant
       const options = ReactionProduct.getSiblings(variant);
       // Get parent
-      const parent = ReactionProduct.getParent(variant);
+      const parent = ReactionProduct.getVariantParent(variant);
 
       // If this is not a top-level variant, update top-level inventory policy as well
       if (parent) {
diff --git a/lib/api/catalog.js b/lib/api/catalog.js
index a51387624b7..69c9289429d 100644
--- a/lib/api/catalog.js
+++ b/lib/api/catalog.js
@@ -163,13 +163,13 @@ export default {
   },
 
   /**
-   * @method getParent
+   * @method getVariantParent
    * @description Get direct parent variant
    * @summary could be useful for lower level variants to get direct parents
    * @param {Object} [variant] - product / variant object
    * @return {Array} Parent variant or empty
    */
-  getParent(variant) {
+  getVariantParent(variant) {
     const parent = Products.findOne({
       _id: { $in: variant.ancestors },
       type: "variant"
diff --git a/lib/api/products.js b/lib/api/products.js
index f1296e5c3c9..f54cd4c3db1 100644
--- a/lib/api/products.js
+++ b/lib/api/products.js
@@ -293,14 +293,14 @@ ReactionProduct.getSiblings = (variant, type) => {
 };
 
 /**
- * @method getParent
+ * @method getVariantParent
  * @description Get direct parent variant
  * @summary could be useful for lower level variants to get direct parents
  * @param {Object} [variant] - product / variant object
  * @return {Array} Parent variant or empty
  */
-ReactionProduct.getParent = (variant) => {
-  return Catalog.getParent(variant);
+ReactionProduct.getVariantParent = (variant) => {
+  return Catalog.getVariantParent(variant);
 };
 
 /**

From 057124fbbd8f48273b8f2e9d78abe5c7fa2d6267 Mon Sep 17 00:00:00 2001
From: Erik Kieckhafer <erik.kieckhafer@gmail.com>
Date: Tue, 3 Oct 2017 09:43:10 -0700
Subject: [PATCH 6/6] small style fixes

---
 .../product-variant/components/variantForm.js |  1 -
 .../containers/variantFormContainer.js        | 32 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/imports/plugins/included/product-variant/components/variantForm.js b/imports/plugins/included/product-variant/components/variantForm.js
index 7ea50314717..38593f69596 100644
--- a/imports/plugins/included/product-variant/components/variantForm.js
+++ b/imports/plugins/included/product-variant/components/variantForm.js
@@ -6,7 +6,6 @@ import Velocity from "velocity-animate";
 import "velocity-animate/velocity.ui";
 import { Components } from "@reactioncommerce/reaction-components";
 import { formatPriceString } from "/client/api";
-import { Reaction } from "/lib/api";
 
 const fieldNames = [
   "title",
diff --git a/imports/plugins/included/product-variant/containers/variantFormContainer.js b/imports/plugins/included/product-variant/containers/variantFormContainer.js
index f141728469b..ac235c8b8e0 100644
--- a/imports/plugins/included/product-variant/containers/variantFormContainer.js
+++ b/imports/plugins/included/product-variant/containers/variantFormContainer.js
@@ -201,7 +201,7 @@ const wrapComponent = (Comp) => (
 
     /**
      * @method updateInventoryPolicyIfChildVariants
-     * @description update parent inventory policy if variant has children children
+     * @description update parent inventory policy if variant has children
      * @param {Object} variant product or variant document
      * @return {undefined} return nothing
      */
@@ -212,28 +212,26 @@ const wrapComponent = (Comp) => (
       const parent = ReactionProduct.getVariantParent(variant);
 
       // If this is not a top-level variant, update top-level inventory policy as well
-      if (parent) {
-        if (options && options.length) {
-          // Check to see if every variant option inventory policy is true
-          const inventoryPolicy = options.every((option) => {
-            return option.inventoryPolicy === true;
-          });
+      if (parent && options && options.length) {
+        // Check to see if every variant option inventory policy is true
+        const inventoryPolicy = options.every((option) => {
+          return option.inventoryPolicy === true;
+        });
 
-          // If all inventory policies on children are true, update parent to be true
-          if (inventoryPolicy === true) {
-            return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", true, (error) => {
-              if (error) {
-                Alerts.toast(error.message, "error");
-              }
-            });
-          }
-          // If any child has a false inventoryPolicy, update parent to be false
-          return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", false, (error) => {
+        // If all inventory policies on children are true, update parent to be true
+        if (inventoryPolicy === true) {
+          return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", true, (error) => {
             if (error) {
               Alerts.toast(error.message, "error");
             }
           });
         }
+        // If any child has a false inventoryPolicy, update parent to be false
+        return Meteor.call("products/updateProductField", parent._id, "inventoryPolicy", false, (error) => {
+          if (error) {
+            Alerts.toast(error.message, "error");
+          }
+        });
       }
     }