"Deny when out of stock" behavior improvements 1928

imports/plugins/core/checkout/client/index.js

@@ -15,6 +15,7 @@ import "./templates/cartPanel/cartPanel.html";
 import "./templates/cartPanel/cartPanel.js";
 
 import "./templates/checkout/addressBook/addressBook.html";
+import "./templates/checkout/addressBook/addressBook.js";
 import "./templates/checkout/completed/completed.html";
 import "./templates/checkout/completed/completed.js";
 import "./templates/checkout/header/header.html";

imports/plugins/core/checkout/client/templates/checkout/addressBook/addressBook.js

@@ -0,0 +1,10 @@
+import { Template } from "meteor/templating";
+import { Reaction } from "/client/api";
+
+Template.checkoutAddressBook.onCreated(function () {
+  Reaction.showActionView({
+    provides: "settings",
+    name: "settings/shipping",
+    template: "shippingSettings"
+  });
+});

imports/plugins/core/checkout/client/templates/checkout/review/review.js

@@ -1,6 +1,7 @@
 import "./review.html";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
+import { Reaction } from "/client/api";
 
 /**
 * review status
@@ -9,4 +10,9 @@ import { Template } from "meteor/templating";
 
 Template.checkoutReview.onRendered(function () {
   Meteor.call("workflow/pushCartWorkflow", "coreCartWorkflow", "checkoutReview");
+  Reaction.showActionView({
+    name: "payment/settings",
+    provides: "settings",
+    template: "paymentSettings"
+  });
 });

imports/plugins/included/product-detail-simple/client/containers/productDetailContainer.js

@@ -5,7 +5,7 @@ import { composeWithTracker } from "/lib/api/compose";
 import { Meteor } from "meteor/meteor";
 import { ReactionProduct } from "/lib/api";
 import { Reaction, i18next, Logger } from "/client/api";
-import { Tags, Media } from "/lib/collections";
+import { Tags, Media, Cart } from "/lib/collections";
 import { Loading } from "/imports/plugins/core/ui/client/components";
 import { ProductDetail, ProductNotFound } from "../components";
 import { SocialContainer, VariantListContainer } from "./";
@@ -30,6 +30,8 @@ class ProductDetailContainer extends Component {
   handleAddToCart = () => {
     let productId;
     let quantity;
+    let totalQuantity;
+    let storedQuantity = 0;
     const currentVariant = ReactionProduct.selectedVariant();
     const currentProduct = ReactionProduct.selectedProduct();
 
@@ -56,12 +58,38 @@ class ProductDetailContainer extends Component {
         return [];
       }
 
+      if (this.props.storedCart.items && this.props.storedCart.items) {
+        this.props.storedCart.items.forEach((item) => {
+          if (item.variants._id === currentVariant._id) {
+            storedQuantity = item.quantity;
+          }
+        });
+      }
+
       quantity = parseInt(this.state.cartQuantity, 10);
+      totalQuantity = quantity + storedQuantity;
 
       if (quantity < 1) {
         quantity = 1;
       }
 
+      if (currentVariant.inventoryPolicy && quantity > currentVariant.inventoryQuantity && storedQuantity < currentVariant.inventoryQuantity) {
+        Alerts.inline("Your product quantity has been adjusted to the max quantity in stock", "warning", {
+          placement: "productDetail",
+          autoHide: 10000
+        });
+        quantity = currentVariant.inventoryQuantity;
+        totalQuantity = totalQuantity - currentVariant.inventoryQuantity;
+      }
+
+      if (currentVariant.inventoryPolicy && totalQuantity > currentVariant.inventoryQuantity) {
+        Alerts.inline(`Sorry, cart contains maximum quantity of ${currentVariant.title}. Failed to add to cart.`, "error", {
+          placement: "productDetail",
+          autoHide: 10000
+        });
+        return [];
+      }
+
       if (!currentProduct.isVisible) {
         Alerts.inline("Publish product before adding to cart.", "error", {
           placement: "productDetail",
@@ -182,11 +210,13 @@ class ProductDetailContainer extends Component {
 
 ProductDetailContainer.propTypes = {
   media: PropTypes.arrayOf(PropTypes.object),
-  product: PropTypes.object
+  product: PropTypes.object,
+  storedCart: PropTypes.object
 };
 
 function composer(props, onData) {
   const tagSub = Meteor.subscribe("Tags");
+  const cartSub = Meteor.subscribe("Cart", Meteor.sessionId);
   const productId = Reaction.Router.getParam("handle");
   const variantId = Reaction.Router.getParam("variantId");
   const revisionType = Reaction.Router.getQueryParam("revision");
@@ -198,7 +228,7 @@ function composer(props, onData) {
     productSub = Meteor.subscribe("Product", productId);
   }
 
-  if (productSub && productSub.ready() && tagSub.ready()) {
+  if (productSub && productSub.ready() && tagSub.ready() && cartSub.ready()) {
     // Get the product
     const product = ReactionProduct.setProduct(productId, variantId);
 
@@ -282,6 +312,8 @@ function composer(props, onData) {
 
       const topVariants = ReactionProduct.getTopVariants();
 
+      const storedCart = Cart.findOne();
+
       onData(null, {
         variants: topVariants,
         layout: product.template || "productDetailSimple",
@@ -291,7 +323,8 @@ function composer(props, onData) {
         media: mediaArray,
         editable,
         viewAs: viewProductAs,
-        hasAdminPermission: Reaction.hasPermission(["createProduct"])
+        hasAdminPermission: Reaction.hasPermission(["createProduct"]),
+        storedCart
       });
     } else {
       // onData must be called with composeWithTracker, or else the loading icon will show forever.