CIF-1334 - Set default quantities of grouped products (#240)

cjelger · web-flow · commit ae20b2186152 · 2020-03-30T15:24:31.000+02:00
* CIF-1334 - Set default quantities of grouped products

- use default quantities of grouped products

* CIF-1334 - Set default quantities of grouped products

- enable/disable add-to-cart on load based on product quantities

* CIF-1334 - Set default quantities of grouped products

- fix issue with possible null value

* CIF-1334 - Set default quantities of grouped products

- fix issue with possible null value
diff --git a/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/GroupItemImpl.java b/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/GroupItemImpl.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ *
+ *    Copyright 2020 Adobe. All rights reserved.
+ *    This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License. You may obtain a copy
+ *    of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software distributed under
+ *    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ *    OF ANY KIND, either express or implied. See the License for the specific language
+ *    governing permissions and limitations under the License.
+ *
+ ******************************************************************************/
+
+package com.adobe.cq.commerce.core.components.internal.models.v1.product;
+
+import com.adobe.cq.commerce.core.components.models.common.Price;
+import com.adobe.cq.commerce.core.components.models.product.GroupItem;
+
+public class GroupItemImpl implements GroupItem {
+
+    private String name;
+    private String sku;
+    private Price priceRange;
+    private Double defaultQuantity;
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    @Override
+    public Price getPriceRange() {
+        return priceRange;
+    }
+
+    public void setPriceRange(Price priceRange) {
+        this.priceRange = priceRange;
+    }
+
+    @Override
+    public Double getDefaultQuantity() {
+        return defaultQuantity;
+    }
+
+    public void setDefaultQuantity(Double defaultQuantity) {
+        this.defaultQuantity = defaultQuantity;
+    }
+}
diff --git a/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductImpl.java b/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductImpl.java
@@ -40,6 +40,7 @@
 import com.adobe.cq.commerce.core.components.internal.models.v1.common.PriceImpl;
 import com.adobe.cq.commerce.core.components.models.common.Price;
 import com.adobe.cq.commerce.core.components.models.product.Asset;
+import com.adobe.cq.commerce.core.components.models.product.GroupItem;
 import com.adobe.cq.commerce.core.components.models.product.Product;
 import com.adobe.cq.commerce.core.components.models.product.Variant;
 import com.adobe.cq.commerce.core.components.models.product.VariantAttribute;
@@ -211,7 +212,7 @@ public List<Variant> getVariants() {
     }
 
     @Override
-    public List<Variant> getGroupedProductItems() {
+    public List<GroupItem> getGroupedProductItems() {
         // Don't return any items if the current product is not of type GroupedProduct.
         if (!isGroupedProduct()) {
             return Collections.emptyList();
@@ -296,15 +297,16 @@ private Variant mapVariant(ConfigurableVariant variant) {
         return productVariant;
     }
 
-    private Variant mapGroupedProductItem(GroupedProductItem item) {
+    private GroupItem mapGroupedProductItem(com.adobe.cq.commerce.magento.graphql.GroupedProductItem item) {
         ProductInterface product = item.getProduct();
 
-        VariantImpl productVariant = new VariantImpl();
-        productVariant.setName(product.getName());
-        productVariant.setSku(product.getSku());
-        productVariant.setPriceRange(new PriceImpl(product.getPriceRange(), locale));
+        GroupItemImpl groupedProductItem = new GroupItemImpl();
+        groupedProductItem.setName(product.getName());
+        groupedProductItem.setSku(product.getSku());
+        groupedProductItem.setPriceRange(new PriceImpl(product.getPriceRange(), locale));
+        groupedProductItem.setDefaultQuantity(item.getQty());
 
-        return productVariant;
+        return groupedProductItem;
     }
 
     private List<Asset> filterAndSortAssets(List<MediaGalleryEntry> assets) {
diff --git a/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/models/product/GroupItem.java b/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/models/product/GroupItem.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ *
+ *    Copyright 2020 Adobe. All rights reserved.
+ *    This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License. You may obtain a copy
+ *    of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software distributed under
+ *    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ *    OF ANY KIND, either express or implied. See the License for the specific language
+ *    governing permissions and limitations under the License.
+ *
+ ******************************************************************************/
+
+package com.adobe.cq.commerce.core.components.models.product;
+
+import com.adobe.cq.commerce.core.components.models.common.Price;
+
+/**
+ * GroupItem is a view model interface representing the item of a grouped product.
+ */
+public interface GroupItem {
+
+    String getName();
+
+    String getSku();
+
+    Price getPriceRange();
+
+    Double getDefaultQuantity();
+}
diff --git a/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/models/product/Product.java b/bundles/core/src/main/java/com/adobe/cq/commerce/core/components/models/product/Product.java
@@ -70,7 +70,7 @@ public interface Product {
 
     List<Variant> getVariants();
 
-    List<Variant> getGroupedProductItems();
+    List<GroupItem> getGroupedProductItems();
 
     List<Asset> getAssets();
 
diff --git a/bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductImplTest.java b/bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/models/v1/product/ProductImplTest.java
@@ -36,6 +36,7 @@
 import com.adobe.cq.commerce.common.ValueMapDecorator;
 import com.adobe.cq.commerce.core.components.models.common.Price;
 import com.adobe.cq.commerce.core.components.models.product.Asset;
+import com.adobe.cq.commerce.core.components.models.product.GroupItem;
 import com.adobe.cq.commerce.core.components.models.product.Variant;
 import com.adobe.cq.commerce.core.components.models.product.VariantAttribute;
 import com.adobe.cq.commerce.core.components.models.product.VariantValue;
@@ -346,18 +347,19 @@ public void testGroupedProduct() throws IOException {
 
         productModel = context.request().adaptTo(ProductImpl.class);
 
-        List<Variant> items = productModel.getGroupedProductItems();
+        List<GroupItem> items = productModel.getGroupedProductItems();
         Assert.assertTrue(productModel.isGroupedProduct());
         Assert.assertEquals(3, items.size());
 
         GroupedProduct gp = (GroupedProduct) product;
         for (int i = 0; i < items.size(); i++) {
-            Variant item = items.get(i);
+            GroupItem item = items.get(i);
             ProductInterface pi = gp.getItems().get(i).getProduct();
 
             Assert.assertEquals(pi.getSku(), item.getSku());
             Assert.assertEquals(pi.getName(), item.getName());
             Assert.assertEquals(pi.getPriceRange().getMinimumPrice().getFinalPrice().getValue(), item.getPriceRange().getFinalPrice(), 0);
+            Assert.assertEquals(gp.getItems().get(i).getQty(), item.getDefaultQuantity(), 0);
         }
     }
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/clientlib/js/addToCart.js b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/clientlib/js/addToCart.js
@@ -37,7 +37,7 @@ class AddToCart {
 
         const groupedProducts = document.querySelector(AddToCart.selectors.groupedProducts);
         if (groupedProducts) {
-            this._element.disabled = true;
+            this._onQuantityChanged(); // init
             // Disable/enable add to cart based on the selected quantities of a grouped product
             document.querySelectorAll(AddToCart.selectors.quantity).forEach(selection => {
                 selection.addEventListener('change', this._onQuantityChanged.bind(this));
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/groupedProducts.html b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/groupedProducts.html
@@ -29,7 +29,7 @@ <h3>${item.name}</h3>
                 </td>
                 <td data-th="{'Quantity' @ i18n}">
                     <sly data-sly-use.template="quantity.html"
-                         data-sly-call="${template.quantity @ product=item, allowZeroQuantity=true}"></sly>
+                         data-sly-call="${template.quantity @ product=item, allowZeroQuantity=true, defaultQuantity=item.defaultQuantity}"></sly>
                 </td>
             </tr>
             </sly>
diff --git a/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/quantity.html b/ui.apps/src/main/content/jcr_root/apps/core/cif/components/commerce/product/v1/product/quantity.html
@@ -11,16 +11,16 @@
   ~ governing permissions and limitations under the License.
   ~ 
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-<template data-sly-template.quantity="${ @ product, allowZeroQuantity}">
+<template data-sly-template.quantity="${ @ product, allowZeroQuantity, defaultQuantity}">
     <div class="quantity__root">
         <span class="fieldIcons__root" style="--iconsBefore:0; --iconsAfter:1;">
             <span class="fieldIcons__input">
                 <select aria-label="product's quantity" class="select__input field__input" name="quantity" data-product-sku="${product.sku}">
-                    <option value="0" data-sly-test="${allowZeroQuantity}">0</option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
+                    <option value="0" data-sly-test="${allowZeroQuantity}" selected="${defaultQuantity && defaultQuantity == 0}">0</option>
+                    <option value="1" selected="${defaultQuantity == null || defaultQuantity == 1}">1</option>
+                    <option value="2" selected="${defaultQuantity && defaultQuantity == 2}">2</option>
+                    <option value="3" selected="${defaultQuantity && defaultQuantity == 3}">3</option>
+                    <option value="4" selected="${defaultQuantity && defaultQuantity == 4}">4</option>
                 </select>
             </span>
             <span class="fieldIcons__before"></span>
