From bb8282a3947fd60c85859b21b431158b586fee1e Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Fri, 29 May 2020 11:33:32 -0500
Subject: [PATCH 1/2] Added a service to get associated products

---
 service/popstore/ProductServices.xml | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/service/popstore/ProductServices.xml b/service/popstore/ProductServices.xml
index 5bc36606..c20df25f 100755
--- a/service/popstore/ProductServices.xml
+++ b/service/popstore/ProductServices.xml
@@ -105,6 +105,48 @@ along with this software (see the LICENSE.md file). If not, see
         </actions>
     </service>
 
+    <service verb="get" noun="LocationText">
+        <in-parameters>
+            <parameter name="location" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="text"/>
+        </out-parameters>
+        <actions>
+            <set field="text" from="ec.resource.getLocationText(location, true)"/>
+        </actions>
+    </service>
+
+    <!-- Service to get associated products for such thigns as upsells. -->
+    <service verb="get" noun="ProductAssocAndDetails">
+        <in-parameters>
+            <parameter name="productId" />
+            <parameter name="assocType" default="PatVariant" />
+            <parameter name="productStoreId"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="products" type="List" />
+        </out-parameters>
+        <actions>
+            <entity-find entity-name="ProductAssocAndTo" list="assocs">
+                <search-form-inputs default-order-by="sequenceNum"/>
+                <econdition field-name="productAssocTypeEnumId" from="assocType"/>
+                <econdition field-name="productId"/><date-filter/>
+            </entity-find>
+
+            <set field="products" from="[]"/>
+            <iterate list="assocs" entry="assoc">
+                <service-call name="mantle.product.PriceServices.get#ProductPrice" out-map="prices"
+                            in-map="context + [productId:assoc.toProductId]" />
+
+                <service-call name="popstore.ProductServices.find#ProductContentList" out-map="content" 
+                        in-map="[productId:assoc.toProductId]"/>
+
+                <script>products.add(['product':assoc, 'prices':prices, 'content':content.productContentList ])</script>
+            </iterate>
+        </actions>
+    </service>
+
     <!-- TODO: this service is not adequately constrained, will get inventory from all facilities, owners, pools, etc; see AssetServices.get#AvailableInventory -->
     <service verb="get" noun="ProductQuantity">
         <in-parameters>

From 81e9227cc9c7fb75db956f5af00ceeefb49a4a02 Mon Sep 17 00:00:00 2001
From: Daniel Taylor <daniel@danieltaylor.co.nz>
Date: Fri, 29 May 2020 11:37:29 -0500
Subject: [PATCH 2/2] Removed service that is handled in other PR

---
 service/popstore/ProductServices.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/service/popstore/ProductServices.xml b/service/popstore/ProductServices.xml
index c20df25f..1f3b8ba6 100755
--- a/service/popstore/ProductServices.xml
+++ b/service/popstore/ProductServices.xml
@@ -104,19 +104,7 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- <set field="imageSmallList" from="contentList.findAll({ 'PcntImageSmall' == it.productContentTypeEnumId })"/> -->
         </actions>
     </service>
-
-    <service verb="get" noun="LocationText">
-        <in-parameters>
-            <parameter name="location" required="true"/>
-        </in-parameters>
-        <out-parameters>
-            <parameter name="text"/>
-        </out-parameters>
-        <actions>
-            <set field="text" from="ec.resource.getLocationText(location, true)"/>
-        </actions>
-    </service>
-
+    
     <!-- Service to get associated products for such thigns as upsells. -->
     <service verb="get" noun="ProductAssocAndDetails">
         <in-parameters>