From cffd24a4153331724a1e1812b9961588604d1d96 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Mon, 25 May 2020 09:10:00 -0500
Subject: [PATCH 1/2] Removed redundant calls to get CartInfo

---
 screen/store.xml         | 3 ++-
 screen/store/product.xml | 2 --
 screen/store/search.xml  | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/screen/store.xml b/screen/store.xml
index 64fb908b..b49d2394 100644
--- a/screen/store.xml
+++ b/screen/store.xml
@@ -82,7 +82,8 @@ var storeInfo = ${storeInfoJson};
         </if>
         <!-- cartInfo for cart count in header/navbar -->
         <service-call name="popstore.CartServices.get#CartInfo" out-map="cartInfo" in-map="context"/>
-
+        <set field="productsInCart" from="cartInfo" /><!-- for legacy reasons -->
+ 
         <!-- 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"/>
diff --git a/screen/store/product.xml b/screen/store/product.xml
index b1d34d57..4326c8ef 100755
--- a/screen/store/product.xml
+++ b/screen/store/product.xml
@@ -85,8 +85,6 @@ along with this software (see the LICENSE.md file). If not, see
         <service-call name="popstore.ProductServices.get#ProductReviews" out-map="reviewsList" in-map="[productId:productId]"/>
         <service-call name="popstore.ProductServices.find#ProductAvailability" in-map="context" out-map="context" />
 
-        <service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />
-
         <set field="inStock" from="false"/>
         <if condition="product.productTypeEnumId == 'PtVirtual'">
             <service-call name="popstore.ProductServices.get#ProductVariantsDisplayInfo" 
diff --git a/screen/store/search.xml b/screen/store/search.xml
index 19fc303d..2430c757 100644
--- a/screen/store/search.xml
+++ b/screen/store/search.xml
@@ -41,8 +41,6 @@ along with this software (see the LICENSE.md file). If not, see
         <service-call name="popstore.SearchServices.search#All" out-map="context"
             in-map="[searchParameter:searchParameter, productStoreId:productStoreId, pageIndex:pageIndex ? pageIndex : '0', pageSize:'12']"/>
 
-        <service-call name="popstore.CartServices.get#CartInfo" in-map="context" out-map="productsInCart" />
-
         <set field="productListCount" from="productListCount ?: 0"/>
         <set field="productListPageSize" from="productListPageSize ?: 0"/>
         <set field="productListPageRangeHigh" from="productListPageRangeHigh ?: 0"/>

From 9e759114071350b2ec72c735e39ef113bf8a4128 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Fri, 29 May 2020 13:00:37 -0500
Subject: [PATCH 2/2] Removed redundant service calls

---
 screen/store.xml          | 7 -------
 screen/store/category.xml | 1 -
 2 files changed, 8 deletions(-)

diff --git a/screen/store.xml b/screen/store.xml
index b49d2394..f4fe4efe 100644
--- a/screen/store.xml
+++ b/screen/store.xml
@@ -73,13 +73,6 @@ var storeInfo = ${storeInfoJson};
             <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]"/>
-        </if>
         <!-- cartInfo for cart count in header/navbar -->
         <service-call name="popstore.CartServices.get#CartInfo" out-map="cartInfo" in-map="context"/>
         <set field="productsInCart" from="cartInfo" /><!-- for legacy reasons -->
diff --git a/screen/store/category.xml b/screen/store/category.xml
index 1916476b..133dd4fe 100755
--- a/screen/store/category.xml
+++ b/screen/store/category.xml
@@ -65,7 +65,6 @@ along with this software (see the LICENSE.md file). If not, see
         <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"/>
 
         <set field="pageSize" from="pageSize ?: 100"/>