set/get hostname from store setting

growerp · Jun 28, 2022 · 832186f · 832186f
1 parent 2581a13
commit 832186f
Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/service/growerp/100/PartyServices100.xml b/service/growerp/100/PartyServices100.xml
@@ -1586,7 +1586,13 @@ along with this software (see the LICENSE.md file). If not, see
 
             <!-- update website settings-->
             <set field="hostName" from="ec.web.getHostName(false)"/>
-            <if condition="hostName == '10.0.2.2'"><set field="hostName" value="localhost"/></if>
+            <if condition="hostName == '10.0.2.2' || hostname == '127.0.0.1'">
+                <set field="hostName" value="localhost"/></if>
+            <if condition="hostName == 'localhost'">
+                <set field="hostName" value="localhost:8080"/></if>
+            <if condition="hostName.indexOf('.', hostName.indexOf('.') + 1) != -1"><!-- two dots? -->
+                <set field="hostName" from="hostName.substring(hostName.indexOf('.')+1)"/>
+            </if>
             <set field="hostName" value="${productStoreId}.${hostName}"/>
             <entity-find entity-name="mantle.product.store.ProductStoreSetting" list="stores">
                 <econdition field-name="productStoreId" value="POPC_DEFAULT"/>

diff --git a/service/growerp/100/WebsiteServices100.xml b/service/growerp/100/WebsiteServices100.xml
@@ -60,10 +60,19 @@ along with this software (see the LICENSE.md file). If not, see
                 <set field="website" from="[:]"/>
                 <return error="true" message="No product store found for company $companyPartyId appl: $classificationId"/>
             </if>
-            <set field="hostName" from="ec.web.getHostName(false)"/>
+            <entity-find entity-name="mantle.product.store.ProductStoreSetting" list="hostNames">
+                <econdition field-name="productStoreId" from="pages[0].productStoreId"/>
+                <econdition field-name="settingTypeEnumId" value="PsstHostname"/>
+            </entity-find>
+            <if condition="hostNames">
+                <set field="hostName" from="hostNames[0].settingValue"/>
+                <else>
+                    <set field="hostName" value="????"/>
+                </else>
+            </if>
             <if condition="hostName == '10.0.2.2'">
-                <set field="hostName" value="localhost:8080"/></if>
-            <set field="hostName" value="${pages[0].productStoreId}.${hostName}/store"/>
+                <set field="hostName" value="${pages[0].productStoreId}.localhost:8080"/></if>
+            <set field="hostName" value="${hostName}/store"/>
             <set field="website" from="[
                     id: pages[0].productStoreId,
                     hostName: hostName,