From 1c52bbbeceedbf93fd8d15eb6817c5fdf5474d23 Mon Sep 17 00:00:00 2001
From: JWager-rch <joseph@rcherbals.com>
Date: Fri, 18 Jun 2021 14:38:49 -0600
Subject: [PATCH 1/3] Add product name to Tab Title

---
 screen/store/product.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/screen/store/product.xml b/screen/store/product.xml
index 774f15e3..07a4b3e7 100755
--- a/screen/store/product.xml
+++ b/screen/store/product.xml
@@ -93,9 +93,14 @@ along with this software (see the LICENSE.md file). If not, see
                 <return error="true" message="Product not found with ID ${productId}"/>
             </then>
         </if>
+
+        <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/>
+        <if condition="product.productName != null">
+            <set field="pageTitle" from="product.productName"/>
+        </if>
     </pre-actions>
     <actions>
-        <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/>
+<!--        <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/> -->
         <service-call name="popstore.ProductServices.get#ProductQuantity" out-map="productQuantity" in-map="[productId:productId]"/>
         <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" />

From cf2a0eb8842dc6dc42464b951d8b876db57491b8 Mon Sep 17 00:00:00 2001
From: JWager-SBRx <joseph@rcherbals.com>
Date: Thu, 2 Sep 2021 15:21:24 -0600
Subject: [PATCH 2/3] Add various tags for Header

---
 screen/store/content.xml | 22 ++++++++++++++++------
 screen/store/product.xml | 39 +++++++++++++++++++++++----------------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/screen/store/content.xml b/screen/store/content.xml
index 9f195630..c407b55d 100755
--- a/screen/store/content.xml
+++ b/screen/store/content.xml
@@ -20,7 +20,7 @@ along with this software (see the LICENSE.md file). If not, see
         <if condition="!extraPathNameList"><script>ec.web.sendError(404, "No attachment specified", null); return;</script></if>
         <set field="filename" from="extraPathNameList.remove(extraPathNameList.size()-1)"/>
         <service-call name="org.moqui.impl.WikiServices.get#WikiPageAttachment" out-map="context"
-                in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), filename:filename]"/>
+                      in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), filename:filename]"/>
         <script>ec.web.sendResourceResponse(attachmentReference?.location, true)</script>
     </actions><default-response type="none"/></transition>
 
@@ -60,7 +60,7 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- get the wikiSpaceId for the store space type -->
             <!-- FUTURE: pass locale here if pulled from path or somewhere -->
             <service-call name="popstore.StoreServices.get#WikiSpaceByType" out-map="spaceOut" out-map-add-to-existing="false"
-                    in-map="[productStoreId:productStoreId, spaceTypeEnumId:spaceTypeEnumId]"/>
+                          in-map="[productStoreId:productStoreId, spaceTypeEnumId:spaceTypeEnumId]"/>
             <if condition="!spaceOut.wikiSpaceId">
                 <log level="warn" message="In content/sst no wiki space found for store ${productStoreId} and space type ${spaceTypeEnumId}"/>
                 <script>ec.web.sendError(404, "No content space found for type ${spaceTypeEnumId}", null)</script>
@@ -68,7 +68,7 @@ along with this software (see the LICENSE.md file). If not, see
             </if>
             <!-- get the page content -->
             <service-call name="org.moqui.impl.WikiServices.get#PublishedWikiPageText" out-map="pageTextOut" out-map-add-to-existing="false"
-                    in-map="[wikiSpaceId:spaceOut.wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
+                          in-map="[wikiSpaceId:spaceOut.wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
             <!-- NOTE: could pass filename (pageTextOut.pageReference.getFileName()) but want inline Content-Disposition -->
             <script>ec.web.sendTextResponse(pageTextOut.pageText, pageTextOut.pageReference.getContentType(), null)</script>
         </actions>
@@ -79,15 +79,25 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="createRequest">
         <actions>
             <service-call name="mantle.request.RequestServices.create#ContactRequest"
-                    in-map="context + [moquiSessionToken:ec.web.sessionToken]" out-map="context"/>
+                          in-map="context + [moquiSessionToken:ec.web.sessionToken]" out-map="context"/>
         </actions>
         <default-response url="."/>
     </transition>
 
+    <pre-actions>
+        <set field="pageTitle" from="sri.screenUrlInfo.extraPathNameList[0]" />
+        <if condition="sri.screenUrlInfo.extraPathNameList[0] != null">
+            <then>
+                <set field="pageDesc" from="sri.screenUrlInfo.extraPathNameList[0]"/>
+            </then><else>
+            <set field="pageDesc" value=""/>
+        </else>
+        </if>
+    </pre-actions>
     <actions>
         <set field="extraPathNameList" from="sri.screenUrlInfo.extraPathNameList"/>
         <service-call name="org.moqui.impl.WikiServices.get#PublishedWikiPageText" out-map="context"
-                in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
+                      in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
         <!-- TODO: consider removing versionName:ver above in production so only published versions can be seen -->
     </actions>
     <widgets>
@@ -95,7 +105,7 @@ along with this software (see the LICENSE.md file). If not, see
         <section name="PageTextSection" condition="pageText">
             <widgets>
                 <render-mode><text type="html" location="${template_server_content}"/></render-mode>
-            </widgets> 
+            </widgets>
             <fail-widgets>
                 <render-mode><text type="html" location="component://PopRestStore/template/store/error.html.ftl"/></render-mode>
             </fail-widgets>
diff --git a/screen/store/product.xml b/screen/store/product.xml
index 07a4b3e7..f92d737a 100755
--- a/screen/store/product.xml
+++ b/screen/store/product.xml
@@ -21,11 +21,11 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="addToCart">
         <actions>
             <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"/>
-                <if condition="addOut.orderHeader != null">
-                    <set field="addedCorrect" from="true"/>
-                </if>
+                          in-map="[productId:productId, quantity:quantity, currencyUomId:currencyUomId, productStoreId: productStoreId]"/>
+            <set field="addedCorrect" from="false"/>
+            <if condition="addOut.orderHeader != null">
+                <set field="addedCorrect" from="true"/>
+            </if>
         </actions>
         <conditional-response url="."><condition><expression>categoryId != null</expression></condition><parameter name="categoryId"/><parameter name="addedCorrect"/></conditional-response>
         <conditional-response url="."><condition><expression>searchParameter != null</expression></condition><parameter name="searchParameter"/><parameter name="addedCorrect"/></conditional-response>
@@ -51,15 +51,15 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="addReview">
         <actions>
-            <service-call name="popstore.ProductServices.create#ProductReview" 
-                in-map="[productId:productId, productRating:productRating, productReview:productReview]"/>
+            <service-call name="popstore.ProductServices.create#ProductReview"
+                          in-map="[productId:productId, productRating:productRating, productReview:productReview]"/>
         </actions>
         <default-response url="."/>
         <error-response url="."/>
     </transition>
 
     <pre-actions>
-     	<set field="star" from="5"/>
+        <set field="star" from="5"/>
         <set field="imgContent" from="[]"/>
         <set field="extraPathNameList" from="sri.screenUrlInfo.extraPathNameList"/>
         <if condition="searchParameter"><set field="searchParameter" from="URLEncoder.encode(searchParameter, 'UTF-8')"/></if>
@@ -98,9 +98,16 @@ along with this software (see the LICENSE.md file). If not, see
         <if condition="product.productName != null">
             <set field="pageTitle" from="product.productName"/>
         </if>
+        <if condition="product.description != null">
+            <then>
+                <set field="pageDesc" from="product.description"/>
+            </then><else>
+            <set field="pageDesc" value=""/>
+        </else>
+        </if>
     </pre-actions>
     <actions>
-<!--        <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/> -->
+        <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/>
         <service-call name="popstore.ProductServices.get#ProductQuantity" out-map="productQuantity" in-map="[productId:productId]"/>
         <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" />
@@ -109,13 +116,13 @@ along with this software (see the LICENSE.md file). If not, see
 
         <set field="inStock" from="false"/>
         <if condition="product.productTypeEnumId == 'PtVirtual'">
-            <service-call name="popstore.ProductServices.get#ProductVariantsDisplayInfo" 
-                in-map="context" out-map="variantsList" />
-        <else>
-            <if condition="productAvailability.get(productId)">
-                <set field="inStock" from="true"/>
-            </if>
-        </else>
+            <service-call name="popstore.ProductServices.get#ProductVariantsDisplayInfo"
+                          in-map="context" out-map="variantsList" />
+            <else>
+                <if condition="productAvailability.get(productId)">
+                    <set field="inStock" from="true"/>
+                </if>
+            </else>
         </if>
 
         <if condition="categoryId">

From 57390fad5e08ef4830b5f3872490413231eddd5c Mon Sep 17 00:00:00 2001
From: JWager-SBRx <joseph@rcherbals.com>
Date: Wed, 8 Sep 2021 13:11:06 -0600
Subject: [PATCH 3/3] Correct whitespace and formatting

---
 screen/store/content.xml | 22 ++++++++++------------
 screen/store/product.xml | 37 +++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/screen/store/content.xml b/screen/store/content.xml
index c407b55d..d39a3e44 100755
--- a/screen/store/content.xml
+++ b/screen/store/content.xml
@@ -20,7 +20,7 @@ along with this software (see the LICENSE.md file). If not, see
         <if condition="!extraPathNameList"><script>ec.web.sendError(404, "No attachment specified", null); return;</script></if>
         <set field="filename" from="extraPathNameList.remove(extraPathNameList.size()-1)"/>
         <service-call name="org.moqui.impl.WikiServices.get#WikiPageAttachment" out-map="context"
-                      in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), filename:filename]"/>
+                in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), filename:filename]"/>
         <script>ec.web.sendResourceResponse(attachmentReference?.location, true)</script>
     </actions><default-response type="none"/></transition>
 
@@ -60,7 +60,7 @@ along with this software (see the LICENSE.md file). If not, see
             <!-- get the wikiSpaceId for the store space type -->
             <!-- FUTURE: pass locale here if pulled from path or somewhere -->
             <service-call name="popstore.StoreServices.get#WikiSpaceByType" out-map="spaceOut" out-map-add-to-existing="false"
-                          in-map="[productStoreId:productStoreId, spaceTypeEnumId:spaceTypeEnumId]"/>
+                    in-map="[productStoreId:productStoreId, spaceTypeEnumId:spaceTypeEnumId]"/>
             <if condition="!spaceOut.wikiSpaceId">
                 <log level="warn" message="In content/sst no wiki space found for store ${productStoreId} and space type ${spaceTypeEnumId}"/>
                 <script>ec.web.sendError(404, "No content space found for type ${spaceTypeEnumId}", null)</script>
@@ -68,7 +68,7 @@ along with this software (see the LICENSE.md file). If not, see
             </if>
             <!-- get the page content -->
             <service-call name="org.moqui.impl.WikiServices.get#PublishedWikiPageText" out-map="pageTextOut" out-map-add-to-existing="false"
-                          in-map="[wikiSpaceId:spaceOut.wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
+                    in-map="[wikiSpaceId:spaceOut.wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
             <!-- NOTE: could pass filename (pageTextOut.pageReference.getFileName()) but want inline Content-Disposition -->
             <script>ec.web.sendTextResponse(pageTextOut.pageText, pageTextOut.pageReference.getContentType(), null)</script>
         </actions>
@@ -79,25 +79,23 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="createRequest">
         <actions>
             <service-call name="mantle.request.RequestServices.create#ContactRequest"
-                          in-map="context + [moquiSessionToken:ec.web.sessionToken]" out-map="context"/>
+                    in-map="context + [moquiSessionToken:ec.web.sessionToken]" out-map="context"/>
         </actions>
         <default-response url="."/>
     </transition>
 
     <pre-actions>
-        <set field="pageTitle" from="sri.screenUrlInfo.extraPathNameList[0]" />
-        <if condition="sri.screenUrlInfo.extraPathNameList[0] != null">
-            <then>
-                <set field="pageDesc" from="sri.screenUrlInfo.extraPathNameList[0]"/>
-            </then><else>
+        <set field="pageTitle" from="sri.screenUrlInfo.extraPathNameList[sri.screenUrlInfo.extraPathNameList.size()-1]" />
+        <if condition="sri.screenUrlInfo.extraPathNameList[0] != null"><then>
+            <set field="pageDesc" from="pageTitle"/>
+        </then><else>
             <set field="pageDesc" value=""/>
-        </else>
-        </if>
+        </else></if>
     </pre-actions>
     <actions>
         <set field="extraPathNameList" from="sri.screenUrlInfo.extraPathNameList"/>
         <service-call name="org.moqui.impl.WikiServices.get#PublishedWikiPageText" out-map="context"
-                      in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
+                in-map="[wikiSpaceId:wikiSpaceId, pagePath:extraPathNameList?.join('/'), versionName:ver]"/>
         <!-- TODO: consider removing versionName:ver above in production so only published versions can be seen -->
     </actions>
     <widgets>
diff --git a/screen/store/product.xml b/screen/store/product.xml
index f92d737a..7aa22149 100755
--- a/screen/store/product.xml
+++ b/screen/store/product.xml
@@ -21,11 +21,11 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="addToCart">
         <actions>
             <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"/>
-            <if condition="addOut.orderHeader != null">
-                <set field="addedCorrect" from="true"/>
-            </if>
+                    in-map="[productId:productId, quantity:quantity, currencyUomId:currencyUomId, productStoreId: productStoreId]"/>
+                <set field="addedCorrect" from="false"/>
+                <if condition="addOut.orderHeader != null">
+                    <set field="addedCorrect" from="true"/>
+                </if>
         </actions>
         <conditional-response url="."><condition><expression>categoryId != null</expression></condition><parameter name="categoryId"/><parameter name="addedCorrect"/></conditional-response>
         <conditional-response url="."><condition><expression>searchParameter != null</expression></condition><parameter name="searchParameter"/><parameter name="addedCorrect"/></conditional-response>
@@ -52,14 +52,14 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="addReview">
         <actions>
             <service-call name="popstore.ProductServices.create#ProductReview"
-                          in-map="[productId:productId, productRating:productRating, productReview:productReview]"/>
+                in-map="[productId:productId, productRating:productRating, productReview:productReview]"/>
         </actions>
         <default-response url="."/>
         <error-response url="."/>
     </transition>
 
     <pre-actions>
-        <set field="star" from="5"/>
+      <set field="star" from="5"/>
         <set field="imgContent" from="[]"/>
         <set field="extraPathNameList" from="sri.screenUrlInfo.extraPathNameList"/>
         <if condition="searchParameter"><set field="searchParameter" from="URLEncoder.encode(searchParameter, 'UTF-8')"/></if>
@@ -98,13 +98,11 @@ along with this software (see the LICENSE.md file). If not, see
         <if condition="product.productName != null">
             <set field="pageTitle" from="product.productName"/>
         </if>
-        <if condition="product.description != null">
-            <then>
-                <set field="pageDesc" from="product.description"/>
-            </then><else>
+        <if condition="product.description != null"><then>
+            <set field="pageDesc" from="product.description"/>
+        </then><else>
             <set field="pageDesc" value=""/>
-        </else>
-        </if>
+        </else></if>
     </pre-actions>
     <actions>
         <service-call name="popstore.ProductServices.get#ProductInfo" out-map="product" in-map="[productId:productId]"/>
@@ -117,13 +115,12 @@ along with this software (see the LICENSE.md file). If not, see
         <set field="inStock" from="false"/>
         <if condition="product.productTypeEnumId == 'PtVirtual'">
             <service-call name="popstore.ProductServices.get#ProductVariantsDisplayInfo"
-                          in-map="context" out-map="variantsList" />
-            <else>
-                <if condition="productAvailability.get(productId)">
-                    <set field="inStock" from="true"/>
-                </if>
-            </else>
-        </if>
+                in-map="context" out-map="variantsList" />
+        <else>
+            <if condition="productAvailability.get(productId)">
+                <set field="inStock" from="true"/>
+            </if>
+        </else></if>
 
         <if condition="categoryId">
             <service-call name="popstore.ProductServices.get#CategoryInfo" out-map="category" in-map="[productCategoryId:categoryId]"/>