Zizi store master

build.gradle

@@ -20,7 +20,7 @@ plugins {
 def compsPath = "screen/store/components"
 // source JS files in load order
 def compsJsFiles = [compsPath + "/utilities.js", compsPath + "/ApiServices.js", compsPath + "/ComponentsNav.js",
-        compsPath + "/ComponentsProduct.js", compsPath + "/ComponentsAccount.js", compsPath + "/ComponentsCheckout.js", compsPath + "/main.js"]
+        compsPath + "/ComponentsAccount.js", compsPath + "/ComponentsCheckout.js", compsPath + "/main.js"]
 
 task combineBaseJs(type: com.eriwen.gradle.js.tasks.CombineJsTask) {
     encoding = "UTF-8"

data/PopRestStoreAaaSetupData.xml

@@ -24,6 +24,9 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.basic.Enumeration enumCode="store_path" description="Base path for store's product list" enumId="PsstStorePath" enumTypeId="ProductStoreSettingType"/>
 
     <!-- client template setting types -->
+    <moqui.basic.Enumeration enumCode="template_client_header" description="Template Client Header for Accounts" enumId="PsstTemplateClientHeader" enumTypeId="ProductStoreSettingType"/>
+    <moqui.basic.Enumeration enumCode="template_client_footer" description="Template Client Footer for Accounts" enumId="PsstTemplateClientFooter" enumTypeId="ProductStoreSettingType"/>
+
     <moqui.basic.Enumeration enumCode="template_client_account" description="Template Client Account Page" enumId="PsstTemplateClientAccount" enumTypeId="ProductStoreSettingType"/>
     <moqui.basic.Enumeration enumCode="template_client_addAddress" description="Template Client Add Address" enumId="PsstTemplateClientAddAddress" enumTypeId="ProductStoreSettingType"/>
     <moqui.basic.Enumeration enumCode="template_client_checkoutHeader" description="Template Client Checkout Header" enumId="PsstTemplateClientCheckoutHeader" enumTypeId="ProductStoreSettingType"/>
@@ -50,7 +53,13 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.basic.Enumeration enumCode="template_server_product" description="Template Server Product" enumId="PsstTemplateServerProduct" enumTypeId="ProductStoreSettingType"/>
     <moqui.basic.Enumeration enumCode="template_server_search" description="Template Server Search" enumId="PsstTemplateServerSearch" enumTypeId="ProductStoreSettingType"/>
     <moqui.basic.Enumeration enumCode="template_server_category" description="Template Server Category" enumId="PsstTemplateServerCategory" enumTypeId="ProductStoreSettingType"/>
+    <moqui.basic.Enumeration enumCode="template_server_spa" description="Template Server SPA" enumId="PsstTemplateServerSpa" enumTypeId="ProductStoreSettingType"/>
+
+    <moqui.basic.Enumeration enumCode="category_page_size" description="Category Products Page Size" enumId="PsstCategoryPageSize" enumTypeId="ProductStoreSettingType"/>
 
     <!-- store setting used for dynamically setting the productStoreId depending on the hostname -->
     <moqui.basic.Enumeration enumCode="product_store_id_from_hostname" description="Product Store ID From Hostname" enumId="PsstHostname" enumTypeId="ProductStoreSettingType"/>
+
+    <moqui.basic.Enumeration description="Product Listing Image" enumId="PcntListingImage" enumTypeId="ProductContentType"/>
+    <moqui.basic.Enumeration description="Category Image" enumId="PcctImage" enumTypeId="ProductCategoryContentType"/>
 </entity-facade-xml>

data/PopRestStoreProductData.xml

@@ -26,9 +26,9 @@ along with this software (see the LICENSE.md file). If not, see
 
     <!-- TODO: get original text instead of binary export, fine for demo images but for text makes it impossible to maintain -->
 
-    <mantle.product.category.ProductCategory productCategoryId="DEMO_CLOTHING" productCategoryTypeEnumId="PctCatalog" categoryName="Clothing" description=""/>
+    <mantle.product.category.ProductCategory productCategoryId="DEMO_CLOTHING" pseudoId="clothing" productCategoryTypeEnumId="PctCatalog" categoryName="Clothing" description=""/>
     <mantle.product.category.ProductCategoryRollup productCategoryId="DEMO_CLOTHING" parentProductCategoryId="PopcBrowseRoot" fromDate="1265184000000" sequenceNum="1"/>
-    <mantle.product.category.ProductCategory productCategoryId="DEMO_OFFICE" productCategoryTypeEnumId="PctCatalog" categoryName="Office" description=""/>
+    <mantle.product.category.ProductCategory productCategoryId="DEMO_OFFICE" pseudoId="office-supplies" productCategoryTypeEnumId="PctCatalog" categoryName="Office" description=""/>
     <mantle.product.category.ProductCategoryRollup productCategoryId="DEMO_OFFICE" parentProductCategoryId="PopcBrowseRoot" fromDate="1265184000000" sequenceNum="2"/>
 
     <!-- Men's T-Shirt with size only variants -->
@@ -71,7 +71,7 @@ along with this software (see the LICENSE.md file). If not, see
             assetTypeEnumId="AstTpInventory" assetClassEnumId="AsClsInventoryFin" copyCategoryMembers="false"/>
 
     <!-- Women's T-Shirt with size and color variants -->
-    <mantle.product.Product productId="DEMO_TS_W" productTypeEnumId="PtVirtual" assetTypeEnumId="" assetClassEnumId=""
+    <mantle.product.Product productId="DEMO_TS_W" pseudoId="womens-tshirt" productTypeEnumId="PtVirtual" assetTypeEnumId="" assetClassEnumId=""
             chargeShipping="Y" returnable="Y" productName="Women&apos;s T-Shirt" description="">
         <prices productPriceId="DEMO_TS_W_L" pricePurposeEnumId="PppPurchase" priceTypeEnumId="PptList" fromDate="1265184000000"
                 minQuantity="1" price="19.99" priceUomId="USD"/>
@@ -393,5 +393,5 @@ along with this software (see the LICENSE.md file). If not, see
 
     <!-- run index for search -->
     <org.moqui.search.SearchServices.indexDataFeedDocuments dataFeedId="MantleSearch"/>
-    <org.moqui.search.SearchServices.indexDataFeedDocuments dataFeedId="PopCommerceSearch"/>
+    <!-- org.moqui.search.SearchServices.indexDataFeedDocuments dataFeedId="PopCommerceSearch"/ -->
 </entity-facade-xml>

screen/store.xml

@@ -28,6 +28,8 @@ along with this software (see the LICENSE.md file). If not, see
                 <field-map field-name="partyId" from="ec.user.userId"/>
             </entity-find-one>
         </if>
+
+        <service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="cart" />
     </always-actions>
 
     <transition name="config.js" read-only="true">
@@ -71,27 +73,20 @@ var storeInfo = ${storeInfoJson};
         <!-- get browseRootCategoryInfo for subCategoryList used in header, etc -->
         <if condition="browseRootCategoryId">
             <service-call name="popstore.ProductServices.get#CategoryInfo" out-map="browseRootCategoryInfo"
-                in-map="[productCategoryId:browseRootCategoryId]"/>
-        </if>
-        <!-- get allProductsInfo for subCategoryList used in header, etc --> 
-        <set field="allProducts" from="storeInfo.categoryByType.PsctSearch"/>
-        <set field="allProductsId" from="storeInfo.categoryByType.PsctSearch?.productCategoryId"/>
-        <if condition="allProductsId">
-            <service-call name="popstore.ProductServices.get#CategoryInfo" out-map="allProductsInfo"
-                in-map="[productCategoryId:allProductsId]"/>
+                in-map="[categoryId:browseRootCategoryId]"/>
         </if>
-        <!-- cartInfo for cart count in header/navbar -->
-        <service-call name="popstore.CartServices.get#CartInfo" out-map="cartInfo" in-map="context"/>
-
+
         <!-- get settings used in subscreens -->
         <set field="template_server_root" from="storeInfo.settings.template_server_root" default-value="component://PopRestStore/template/store/root.html.ftl"/>
         <set field="template_server_header" from="storeInfo.settings.template_server_header" default-value="component://PopRestStore/template/store/navbar.html.ftl"/>
         <set field="template_server_footer" from="storeInfo.settings.template_server_footer" default-value="component://PopRestStore/template/store/footer.html.ftl"/>
         <set field="template_server_home" from="storeInfo.settings.template_server_home" default-value="component://PopRestStore/template/store/home.html.ftl"/>
         <set field="template_server_category" from="storeInfo.settings.template_server_category" default-value="component://PopRestStore/template/store/category.html.ftl"/>
         <set field="template_server_product" from="storeInfo.settings.template_server_product" default-value="component://PopRestStore/template/store/product.html.ftl"/>
-        <set field="template_server_content" from="storeInfo.settings.template_server_content" default-value="component://PopRestStore/template/store/help.html.ftl"/>
+        <set field="template_server_content" from="storeInfo.settings.template_server_content" default-value="component://PopRestStore/template/store/content.html.ftl"/>
         <set field="template_server_search" from="storeInfo.settings.template_server_search" default-value="component://PopRestStore/template/store/search.html.ftl"/>
+        <set field="template_server_spa" from="storeInfo.settings.template_server_spa" default-value="component://PopRestStore/template/store/spa.html.ftl"/>
+        <set field="template_server_error" from="storeInfo.settings.template_server_error" default-value="component://PopRestStore/template/store/error.html.ftl"/>
     </pre-actions>
 
     <widgets>

screen/store/category.xml

@@ -14,14 +14,12 @@ along with this software (see the LICENSE.md file). If not, see
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
         require-authentication="anonymous-view" allow-extra-path="true">
-    <parameter name="categoryId"/>
     <parameter name="orderBy"/>
-    <parameter name="productName"/>
-    <parameter name="pageIndex"/>
-    <parameter name="addedCorrect"/>
+    <parameter name="page"/>
 
     <transition name="addToCart">
         <actions>
+            <log message="addToCart!!" />
             <service-call name="popstore.CartServices.add#Product" out-map="addOut"
                 in-map="[productId:productId, quantity:quantity, currencyUomId:currencyUomId, productStoreId: productStoreId]"/> 
                 <set field="addedCorrect" from="false"/>
@@ -41,67 +39,42 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <pre-actions>
-        <set field="extraPathNameList" from="sri.screenUrlInfo.extraPathNameList"/>
-        <if condition="extraPathNameList &amp;&amp; !categoryId"><set field="categoryId" from="extraPathNameList[0]"/></if>
-        <if condition="extraPathNameList &amp;&amp; !pageIndex">
-            <set field="pageIndex" from="extraPathNameList[1]"/>
-            <if condition="pageIndex == null">
-                <set field="pageIndex" from="0"/>
-            </if>
-        </if>
-        <if condition="extraPathNameList &amp;&amp; !orderBy">
-            <set field="orderBy" from="extraPathNameList[2]"/>
-            <if condition="orderBy == null">
-                <set field="orderBy" from="'default'"/>
-            </if>
-        </if>
+        <set field="pathParts" from="sri.screenUrlInfo.extraPathNameList"/>
+        <set field="categoryId" from="pathParts[0]"/>
+        <set field="productId" from="pathParts[1]"/>
     </pre-actions>
     <actions>
-        <service-call name="popstore.ProductServices.get#CategoryProducts" out-map="products"
-            in-map="[productCategoryId:categoryId, orderBy: orderBy, pageIndex:pageIndex ? pageIndex : '0', pageSize:6]"/>
-
-        <service-call name="popstore.ProductServices.get#CategoryInfo" out-map="category" in-map="[productCategoryId:categoryId]"/>
-
-        <service-call name="popstore.ProductServices.find#ProductAvailability" in-map="context" out-map="context" />
-
-        <set field="inStock" from="false"/>
-
-        <service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />
-        <service-call name="popstore.ProductServices.get#SortedProductList" in-map="context + [productCategoryId:categoryId]" out-map="context"/>
+        <!-- if no category is passed in the url, we default to the browse root -->
+        <if condition="!categoryId">
+            <set field="categoryId" from="storeInfo.categoryByType.PsctBrowseRoot.productCategoryId"/>
+        </if>
+
+        <service-call name="popstore.ProductServices.get#CategoryInfo" out-map="category" in-map="[categoryId:categoryId]"/>
 
-        <service-call name="popstore.ProductServices.get#ViewAllowProducts" in-map="context" out-map="context"/>
+        <!-- no point in query products if we will display the product -->
+        <if condition="!productId">
+            <set field="pageSize" from="storeInfo.settings.category_page_size ?: 6" />
+            <service-call name="popstore.ProductServices.get#CategoryProducts" out-map="context" 
+                in-map="[productStoreId:productStoreId, productCategoryId:category.productCategoryId, orderBy: orderBy, pageIndex:page ? page-1 : '0', pageSize:pageSize]"/>
 
-        <set field="pageSize" from="pageSize ?: 100"/>
+            <service-call name="popstore.ProductServices.get#ViewAllowProducts" in-map="context" out-map="context"/>
 
-        <set field="virtualProductsIds" from="[:]"/>
-        <iterate list="productList" entry="product">
-            <if condition="product.productTypeEnumId == 'PtVirtual'">
-                <then>
-                    <script>
-                        virtualProductsIds.put(product.productId, product.productId)
-                    </script>
-                </then>
-                <else>
-                    <entity-find-one entity-name="mantle.product.ProductAssocAndFrom" value-field="productAssoc">
-                        <field-map field-name="toProductId" from="product.productId"/>
-                        <field-map field-name="productTypeEnumId" value="PtVirtual"/>
-                    </entity-find-one>
-                    <script>
-                        if(productAssoc){
-                            virtualProductsIds.put(product.productId, productAssoc.productId)
-                        }else{
-                            virtualProductsIds.put(product.productId, product.productId)
-                        }
-                    </script>
-                </else>
-            </if>
-        </iterate>
-        <script>paginateList("productList", null, context)</script>
+            <set field="productListPageCount" from="Math.ceil(productListCount/productListPageSize)"/>
+        </if>
     </actions>
 
     <widgets>
-        <render-mode><text type="html" location="${template_server_header}"/></render-mode>
-        <render-mode><text type="html" location="${template_server_category}"/></render-mode>
-        <render-mode><text type="html" location="${template_server_footer}"/></render-mode>
+        <section name="Product">
+            <condition><expression>productId != null</expression></condition>
+            <widgets><include-screen location="component://PopRestStore/screen/store/product.xml"/></widgets>
+        </section>
+        <section name="Category">
+            <condition><expression>productId == null</expression></condition>
+            <widgets>
+                <render-mode><text type="html" location="${template_server_header}"/></render-mode>
+                <render-mode><text type="html" location="${template_server_category}"/></render-mode>
+                <render-mode><text type="html" location="${template_server_footer}"/></render-mode>
+            </widgets>
+        </section>
     </widgets>
 </screen>

screen/store/components/ComponentsCheckout.js

@@ -55,7 +55,7 @@ storeComps.CheckOutPage = {
     name: "checkout-page",
     extends: storeComps.CheckoutNavbar,
     data: function() { return {
-            cvv: "", showCvvError: false, homePath: "", storePath: "", customerInfo: {}, productsInCart: {}, shippingAddress: {}, shippingAddressSelect: {}, paymentMethod: {}, shippingMethod: {},
+            cvv: "", showCvvError: false, homePath: "", storePath: "", customerInfo: {}, cartItemsImage:{}, productsInCart: {}, shippingAddress: {}, shippingAddressSelect: {}, paymentMethod: {}, shippingMethod: {},
             showCheckoutMessages:false, billingAddress: {}, billingAddressOption: "", listShippingAddress: [], listPaymentMethods: [],  promoCode: "", promoError: "", postalAddressStateGeoSelected: null,
             countriesList: [], regionsList: [], shippingOption: "", addressOption: "", paymentOption: "", isSameAddress: "0", shippingItemPrice: 0,
             isUpdate: false, isSpinner: false, responseMessage: "", toNameErrorMessage: "", countryErrorMessage: "", addressErrorMessage: "", 
@@ -108,6 +108,12 @@ storeComps.CheckOutPage = {
                 return a + value;
             }, 0);
         },
+        getProductImage: function(productId) {
+            if (productId in this.cartItemsImage)
+                return storeConfig.productImageLocation + this.cartItemsImage[productId].productContentId;
+            else
+                return "/store/assets/default.png";
+        },
         getCartCountByItemEnum: function(itemEnum){
             return this.productsInCart.orderItemList.reduce(function (acc, item) {
                 return item.itemTypeEnumId == itemEnum ? acc + item.quantity : acc + 0;
@@ -199,6 +205,7 @@ storeComps.CheckOutPage = {
                         this.addressOption = data.postalAddress.contactMechId + ':' + data.postalAddress.telecomContactMechId;
                         this.shippingAddressSelect = data.postalAddress;
                         this.shippingAddressSelect.contactNumber = data.telecomNumber.contactNumber;
+                        this.cartItemsImage = data.cartItemsImage;
                     } else if (this.listShippingAddress.length) {
                         // Preselect first address
                         this.addressOption = this.listShippingAddress[0].postalContactMechId + ':' + this.listShippingAddress[0].telecomContactMechId;

screen/store/components/ComponentsNav.js

@@ -167,7 +167,9 @@ storeComps.ModalAddress = {
             }
 
             this.disabled = true;
-            CustomerService.addShippingAddress(this.shippingAddress, this.axiosConfig).then(function (data) {
+            const axiosConfig = { headers: { "Content-Type": "application/json;charset=UTF-8", "Access-Control-Allow-Origin": "*",
+                                              "api_key":this.$root.apiKey, "moquiSessionToken":this.$root.moquiSessionToken } }
+            CustomerService.addShippingAddress(this.shippingAddress, axiosConfig).then(function (data) {
                 this.responseMessage = "";
                 this.completeCallback(data);
             }.bind(this));