From 5b01be83453a2429bb9316fd9fe70606de0e3a03 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Tue, 3 Dec 2024 19:00:42 +0530
Subject: [PATCH 01/17] Added a view  to fetch the order level details of
 orders eligible for NS

---
 entity/OrderViewEntities.xml | 82 ++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 entity/OrderViewEntities.xml

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
new file mode 100644
index 0000000..834a0d5
--- /dev/null
+++ b/entity/OrderViewEntities.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
+    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+        <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
+        <member-entity entity-alias="SCENM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="OH" join-optional="true">
+            <key-map field-name="salesChannelEnumId" related="enumId"/>
+        </member-entity>
+        <member-entity entity-alias="OID" entity-name="co.hotwax.order.OrderIdentification" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OID" field-name="orderIdentificationTypeId" value="NETSUITE_ORDER_ID"/>
+                <date-filter/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="ODR" entity-name="org.apache.ofbiz.order.order.OrderRole" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="ODR" field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="ODR">
+            <key-map field-name="partyId"/>
+            <entity-condition>
+                <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="OCMBL" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMBL" field-name="contactMechPurposeTypeId" operator="equals" value="BILLING_LOCATION"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="PAB" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMBL" join-optional="true">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
+        <member-entity entity-alias="OCMSL" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMSL" field-name="contactMechPurposeTypeId" operator="equals" value="SHIPPING_LOCATION"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="PAS" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMSL" join-optional="true">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
+        <member-entity entity-alias="OCMBP" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMBP" field-name="contactMechPurposeTypeId" operator="equals" value="PHONE_BILLING"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="TN" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
+        <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition field-name="orderAdjustmentTypeId" value="SHIPPING_CHARGES"/>
+            </entity-condition>
+        </member-entity>
+        <entity-condition>
+            <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
+            <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
+        </entity-condition>
+        <alias-all entity-alias="OH"/>
+        <alias name="shippingAddress1" field="address1" entity-alias="PAS"/>
+        <alias name="shippingAddress2" field="address2" entity-alias="PAS"/>
+        <alias name="shippingCity" field="city" entity-alias="PAS"/>
+        <alias name="shippingState" field="stateProvinceGeoId" entity-alias="PAS"/>
+        <alias name="shippingPostalCode" field="postalCode" entity-alias="PAS"/>
+        <alias name="billingAddress1" field="address2" entity-alias="PAB"/>
+        <alias name="billingAddress2" field="address2" entity-alias="PAB"/>
+        <alias name="billingCity" field="city" entity-alias="PAB"/>
+        <alias name="billingState" field="stateProvinceGeoId" entity-alias="PAB"/>
+        <alias name="billingPostalCode" field="postalCode" entity-alias="PAB"/>
+        <alias name="NetsuiteCustomerId" field="idValue" entity-alias="PID"/>
+        <alias name="salesChannel" field="description" entity-alias="SCENM"/>
+        <alias-all entity-alias="TN"/>
+        <alias name="ShippingCharge" field="amount" entity-alias="OADJ"/>
+    </view-entity>
+</entities>
\ No newline at end of file

From 32a8a8b0afbb0aa8ed20d7e0cc0a1c13700af2fe Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Tue, 3 Dec 2024 19:36:46 +0530
Subject: [PATCH 02/17] Added the OPP in the view entity

---
 entity/OrderViewEntities.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 834a0d5..7246782 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -50,15 +50,21 @@
                 <econdition entity-alias="OCMBP" field-name="contactMechPurposeTypeId" operator="equals" value="PHONE_BILLING"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="TN" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP">
+        <member-entity entity-alias="TN" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
-        <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OH">
+        <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
                 <econdition field-name="orderAdjustmentTypeId" value="SHIPPING_CHARGES"/>
             </entity-condition>
         </member-entity>
+        <member-entity entity-alias="OPP" entity-name="org.apache.ofbiz.order.order.OrderPaymentPreference" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition field-name="paymentMethodTypeId" value="EXT_GIFT_CARD"/>
+            </entity-condition>
+        </member-entity>
         <entity-condition>
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
@@ -78,5 +84,6 @@
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias-all entity-alias="TN"/>
         <alias name="ShippingCharge" field="amount" entity-alias="OADJ"/>
+        <alias name="giftCardAmountSum" field="maxAmount" entity-alias="OPP"/>
     </view-entity>
 </entities>
\ No newline at end of file

From d46e953ec3236ba4d36021a2142f094817be5cce Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Tue, 3 Dec 2024 20:27:03 +0530
Subject: [PATCH 03/17] Added a view to fetch the item level detail

---
 entity/OrderViewEntities.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 7246782..65fac9f 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -35,6 +35,9 @@
         <member-entity entity-alias="PAB" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMBL" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
+        <member-entity entity-alias="COUNTRYGEOBL" entity-name="org.apache.ofbiz.common.geo.Geo" join-from-alias="PAB" join-optional="true">
+            <key-map field-name="countryGeoId" related="geoId"/>
+        </member-entity>
         <member-entity entity-alias="OCMSL" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
@@ -44,6 +47,9 @@
         <member-entity entity-alias="PAS" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMSL" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
+        <member-entity entity-alias="COUNTRYGEOSL" entity-name="org.apache.ofbiz.common.geo.Geo" join-from-alias="PAS" join-optional="true">
+            <key-map field-name="countryGeoId" related="geoId"/>
+        </member-entity>
         <member-entity entity-alias="OCMBP" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
@@ -75,15 +81,41 @@
         <alias name="shippingCity" field="city" entity-alias="PAS"/>
         <alias name="shippingState" field="stateProvinceGeoId" entity-alias="PAS"/>
         <alias name="shippingPostalCode" field="postalCode" entity-alias="PAS"/>
+        <alias name="shippingCountry" field="geoCode" entity-alias="COUNTRYGEOSL"/>
         <alias name="billingAddress1" field="address2" entity-alias="PAB"/>
         <alias name="billingAddress2" field="address2" entity-alias="PAB"/>
         <alias name="billingCity" field="city" entity-alias="PAB"/>
         <alias name="billingState" field="stateProvinceGeoId" entity-alias="PAB"/>
         <alias name="billingPostalCode" field="postalCode" entity-alias="PAB"/>
+        <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
         <alias name="NetsuiteCustomerId" field="idValue" entity-alias="PID"/>
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias-all entity-alias="TN"/>
         <alias name="ShippingCharge" field="amount" entity-alias="OADJ"/>
         <alias name="giftCardAmountSum" field="maxAmount" entity-alias="OPP"/>
     </view-entity>
+
+    <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+        <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
+        <member-entity entity-alias="P" entity-name="org.apache.ofbiz.product.product.Product" join-from-alias="OI">
+            <key-map field-name="productId"/>
+        </member-entity>
+        <member-entity entity-alias="GID" entity-name="org.apache.ofbiz.product.product.GoodIdentification" join-from-alias="P">
+            <key-map field-name="productId"/>
+            <entity-condition>
+                <econdition field-name="goodIdentificationTypeId" value="NETSUITE_PRODUCT_ID"/>
+                <date-filter/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OI" join-optional="true">
+            <key-map field-name="orderId"/>
+            <key-map field-name="orderItemSeqId"/>
+            <entity-condition>
+                <econdition field-name="orderAdjustmentTypeId" value="EXT_PROMO_ADJUSTMENT"/>
+            </entity-condition>
+        </member-entity>
+        <alias-all entity-alias="OI"/>
+        <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
+        <alias name="DiscountSum" field="amount" entity-alias="OADJ" function="sum"/>
+    </view-entity>
 </entities>
\ No newline at end of file

From ab824606f10e3cc28744be6add0b6f33038085ef Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Wed, 4 Dec 2024 16:15:15 +0530
Subject: [PATCH 04/17] Remove the join of OPP from
 EligibleOrdersForNetSuiteView and join of OADJ from the
 OrderItemsForNetSuiteView

---
 entity/OrderViewEntities.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 65fac9f..5de50a9 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -65,12 +65,6 @@
                 <econdition field-name="orderAdjustmentTypeId" value="SHIPPING_CHARGES"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="OPP" entity-name="org.apache.ofbiz.order.order.OrderPaymentPreference" join-from-alias="OH" join-optional="true">
-            <key-map field-name="orderId"/>
-            <entity-condition>
-                <econdition field-name="paymentMethodTypeId" value="EXT_GIFT_CARD"/>
-            </entity-condition>
-        </member-entity>
         <entity-condition>
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
@@ -92,7 +86,6 @@
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias-all entity-alias="TN"/>
         <alias name="ShippingCharge" field="amount" entity-alias="OADJ"/>
-        <alias name="giftCardAmountSum" field="maxAmount" entity-alias="OPP"/>
     </view-entity>
 
     <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
@@ -107,15 +100,7 @@
                 <date-filter/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OI" join-optional="true">
-            <key-map field-name="orderId"/>
-            <key-map field-name="orderItemSeqId"/>
-            <entity-condition>
-                <econdition field-name="orderAdjustmentTypeId" value="EXT_PROMO_ADJUSTMENT"/>
-            </entity-condition>
-        </member-entity>
         <alias-all entity-alias="OI"/>
         <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
-        <alias name="DiscountSum" field="amount" entity-alias="OADJ" function="sum"/>
     </view-entity>
 </entities>
\ No newline at end of file

From 998d0ccb2f99c9eaff18909f6947f7098e3187cc Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Wed, 4 Dec 2024 20:26:41 +0530
Subject: [PATCH 05/17] Remove the alies-all for OH and OI from the respective
 views

---
 entity/OrderViewEntities.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 5de50a9..fa4be2f 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -69,7 +69,9 @@
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
         </entity-condition>
-        <alias-all entity-alias="OH"/>
+        <alias name="orderName" field="orderName" entity-alias="OH"/>
+        <alias name="orderId" field="orderId" entity-alias="OH"/>
+        <alias name="orderDate" field="orderDate" entity-alias="OH"/>
         <alias name="shippingAddress1" field="address1" entity-alias="PAS"/>
         <alias name="shippingAddress2" field="address2" entity-alias="PAS"/>
         <alias name="shippingCity" field="city" entity-alias="PAS"/>
@@ -82,10 +84,10 @@
         <alias name="billingState" field="stateProvinceGeoId" entity-alias="PAB"/>
         <alias name="billingPostalCode" field="postalCode" entity-alias="PAB"/>
         <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
-        <alias name="NetsuiteCustomerId" field="idValue" entity-alias="PID"/>
+        <alias name="customerId" field="idValue" entity-alias="PID"/>
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias-all entity-alias="TN"/>
-        <alias name="ShippingCharge" field="amount" entity-alias="OADJ"/>
+        <alias name="ShippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
 
     <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
@@ -100,7 +102,11 @@
                 <date-filter/>
             </entity-condition>
         </member-entity>
-        <alias-all entity-alias="OI"/>
+        <alias name="orderItemSeqId" field="orderItemSeqId" entity-alias="OI"/>
+        <alias name="orderId" field="orderId" entity-alias="OI"/>
+        <alias name="price" field="unitPrice" entity-alias="OI"/>
+        <alias name="quantity" field="quantity" entity-alias="OI"/>
+        <alias name="itemStatus" field="statusId" entity-alias="OI"/>
         <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
     </view-entity>
 </entities>
\ No newline at end of file

From fa146ae5772e838a45d877a16fe819bbdc78d5a3 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Wed, 4 Dec 2024 21:02:47 +0530
Subject: [PATCH 06/17] Added a view IntegrationTypeMappingAndEnum

---
 entity/OrderViewEntities.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index fa4be2f..c5e426b 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -109,4 +109,14 @@
         <alias name="itemStatus" field="statusId" entity-alias="OI"/>
         <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
     </view-entity>
+    
+    <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
+        <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
+        <member-entity entity-alias="ENUM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="ITM">
+            <key-map field-name="integrationTypeId"/> 
+        </member-entity>
+        <alias-all entity-alias="ITM"/>
+        <alias-all entity-alias="ENUM"/>
+        <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
+    </view-entity>
 </entities>
\ No newline at end of file

From 210d9a2003cd25dba63c4596d6888956ba40285a Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Thu, 5 Dec 2024 15:49:24 +0530
Subject: [PATCH 07/17] Added a view to fetch the eligible order ids and remove
 the eligiblity check from the main view

---
 entity/OrderViewEntities.xml | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index c5e426b..dcb1680 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -2,11 +2,9 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
-    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+
+    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
-        <member-entity entity-alias="SCENM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="OH" join-optional="true">
-            <key-map field-name="salesChannelEnumId" related="enumId"/>
-        </member-entity>
         <member-entity entity-alias="OID" entity-name="co.hotwax.order.OrderIdentification" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
@@ -14,6 +12,24 @@
                 <date-filter/>
             </entity-condition>
         </member-entity>
+        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="ODR">
+            <key-map field-name="partyId"/>
+            <entity-condition>
+                <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
+            </entity-condition>
+        </member-entity>
+        <entity-condition>
+            <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
+            <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
+        </entity-condition>
+        <alias name="orderId" entity-alias="OH"/>
+    </view-entity>
+
+    <view-entity entity-name="OrdersDetailsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+        <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
+        <member-entity entity-alias="SCENM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="OH" join-optional="true">
+            <key-map field-name="salesChannelEnumId" related="enumId"/>
+        </member-entity>
         <member-entity entity-alias="ODR" entity-name="org.apache.ofbiz.order.order.OrderRole" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
@@ -65,10 +81,6 @@
                 <econdition field-name="orderAdjustmentTypeId" value="SHIPPING_CHARGES"/>
             </entity-condition>
         </member-entity>
-        <entity-condition>
-            <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
-            <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
-        </entity-condition>
         <alias name="orderName" field="orderName" entity-alias="OH"/>
         <alias name="orderId" field="orderId" entity-alias="OH"/>
         <alias name="orderDate" field="orderDate" entity-alias="OH"/>
@@ -109,11 +121,11 @@
         <alias name="itemStatus" field="statusId" entity-alias="OI"/>
         <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
     </view-entity>
-    
+
     <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
         <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
         <member-entity entity-alias="ENUM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="ITM">
-            <key-map field-name="integrationTypeId"/> 
+            <key-map field-name="integrationTypeId"/>
         </member-entity>
         <alias-all entity-alias="ITM"/>
         <alias-all entity-alias="ENUM"/>

From 3b699cf2ccfde0d469a86fc7d6048ea4b1092afb Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Wed, 11 Dec 2024 20:03:22 +0530
Subject: [PATCH 08/17] added the communicationeventandorder view.

---
 entity/OrderViewEntities.xml | 57 ++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index dcb1680..8576020 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -22,7 +22,7 @@
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
         </entity-condition>
-        <alias name="orderId" entity-alias="OH"/>
+        <alias-all entity-alias="OH"/>
     </view-entity>
 
     <view-entity entity-name="OrdersDetailsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
@@ -75,6 +75,33 @@
         <member-entity entity-alias="TN" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
+        <member-entity entity-alias="OCMSP" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMSP" field-name="contactMechPurposeTypeId" operator="equals" value="PHONE_SHIPPING"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="TNSP" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMSP" join-optional="true">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
+        <member-entity entity-alias="OCMBE" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMBE" field-name="contactMechPurposeTypeId" operator="equals" value="BILLING_EMAIL"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="CMBE" entity-name="org.apache.ofbiz.party.contact.ContactMech" join-from-alias="OCMBE" join-optional="true">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
+        <member-entity entity-alias="OCMSE" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OCMSE" field-name="contactMechPurposeTypeId" operator="equals" value="SHIPPING_EMAIL"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="CMSE" entity-name="org.apache.ofbiz.party.contact.ContactMech" join-from-alias="OCMSE" join-optional="true">
+            <key-map field-name="contactMechId"/>
+        </member-entity>
         <member-entity entity-alias="OADJ" entity-name="org.apache.ofbiz.order.order.OrderAdjustment" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
@@ -84,12 +111,14 @@
         <alias name="orderName" field="orderName" entity-alias="OH"/>
         <alias name="orderId" field="orderId" entity-alias="OH"/>
         <alias name="orderDate" field="orderDate" entity-alias="OH"/>
+        <alias name="shippingContactMechId" field="contactMechId" entity-alias="PAS"/>
         <alias name="shippingAddress1" field="address1" entity-alias="PAS"/>
         <alias name="shippingAddress2" field="address2" entity-alias="PAS"/>
         <alias name="shippingCity" field="city" entity-alias="PAS"/>
         <alias name="shippingState" field="stateProvinceGeoId" entity-alias="PAS"/>
         <alias name="shippingPostalCode" field="postalCode" entity-alias="PAS"/>
         <alias name="shippingCountry" field="geoCode" entity-alias="COUNTRYGEOSL"/>
+        <alias name="billingContactMechId" field="contactMechId" entity-alias="PAB"/>
         <alias name="billingAddress1" field="address2" entity-alias="PAB"/>
         <alias name="billingAddress2" field="address2" entity-alias="PAB"/>
         <alias name="billingCity" field="city" entity-alias="PAB"/>
@@ -98,7 +127,14 @@
         <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
         <alias name="customerId" field="idValue" entity-alias="PID"/>
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
-        <alias-all entity-alias="TN"/>
+        <alias name="billingCountryCode" field="countryCode" entity-alias="TN"/>
+        <alias name="billingAreaCode" field="countryCode" entity-alias="TN"/>
+        <alias name="billingContactNumber" field="contactNumber" entity-alias="TN"/>
+        <alias name="shippingCountryCode" field="countryCode" entity-alias="TNSP"/>
+        <alias name="shippingAreaCode" field="countryCode" entity-alias="TNSP"/>
+        <alias name="shippingContactNumber" field="contactNumber" entity-alias="TNSP"/>
+        <alias name="billingEmail" field="infoString" entity-alias="CMBE"/>
+        <alias name="shippingEmail" field="infoString" entity-alias="CMSE"/>
         <alias name="ShippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
 
@@ -114,12 +150,19 @@
                 <date-filter/>
             </entity-condition>
         </member-entity>
+        <member-entity entity-alias="OISG" entity-name="org.apache.ofbiz.order.order.OrderItemShipGroup" join-from-alias="OI">
+            <key-map field-name="orderId"/>
+            <key-map field-name="shipGroupSeqId"/>
+        </member-entity>
         <alias name="orderItemSeqId" field="orderItemSeqId" entity-alias="OI"/>
         <alias name="orderId" field="orderId" entity-alias="OI"/>
         <alias name="price" field="unitPrice" entity-alias="OI"/>
         <alias name="quantity" field="quantity" entity-alias="OI"/>
         <alias name="itemStatus" field="statusId" entity-alias="OI"/>
+        <alias name="productId" field="productId" entity-alias="OI"/>
         <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
+        <alias name="shipmentMethodTypeId" entity-alias="OISG"/>
+        <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>
 
     <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
@@ -131,4 +174,14 @@
         <alias-all entity-alias="ENUM"/>
         <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
     </view-entity>
+
+    <view-entity entity-name="CommunicationEventAndOrder" package="co.hotwax.integration">
+        <member-entity entity-alias="CO" entity-name="org.apache.ofbiz.order.order.CommunicationEventOrder"/>
+        <member-entity entity-alias="CE" entity-name="org.apache.ofbiz.party.communication.CommunicationEvent" join-from-alias="CO">
+            <key-map field-name="communicationEventId"/>
+        </member-entity>
+        <alias-all entity-alias="CO"/>
+        <alias-all entity-alias="CE"/>
+    </view-entity>
+
 </entities>
\ No newline at end of file

From c26d7d2f31bcd9a2fbbbdd8552b353aed5986949 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:53:30 +0530
Subject: [PATCH 09/17] Added comments in the viewEntity.

---
 entity/OrderViewEntities.xml | 68 +++++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 8576020..a80c249 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -2,8 +2,17 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
+    <!--
+    Created a view to fetch eligible orders for creating an order feed from HotWax to NetSuite.
+    The view consolidates relevant data from `OrderHeader`, `OrderIdentification`, and `PartyIdentification` entities.
 
-    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order">
+    Criteria for fetching eligible records:
+    1. The order must be of type `SALES_ORDER`
+    2. The order should not already synced with Netsuite
+    3. The customer should be synced with Netsuite
+    4. A date filter can be applied in `OrderIdentification` to fetch the eligible identification.
+    -->
+    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
         <member-entity entity-alias="OID" entity-name="co.hotwax.order.OrderIdentification" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
@@ -25,6 +34,44 @@
         <alias-all entity-alias="OH"/>
     </view-entity>
 
+    <!--Purpose of this view:
+    - The primary purpose of this view-entity is to fetch the order-related data required by the service to prepare the order feed from Hotwax to NetSuite.
+
+    Fetching entities multiple times:
+    1. OrderContactMech (OCMBL, OCMSL, OCMBP, OCMSP, OCMBE, OCMSE):
+       - The OrderContactMech entity is fetched multiple times to retrieve contact mechanisms for various purposes:
+           - `OCMBL`: For billing location details.
+           - `OCMSL`: For shipping location details.
+           - `OCMBP`: For billing phone details.
+           - `OCMSP`: For shipping phone details.
+           - `OCMBE`: For billing email details.
+           - `OCMSE`: For shipping email details.
+       - Each alias is used for a specific contact mechanism purpose, ensuring data is retrieved correctly without overlaps.
+    2. PostalAddress (PAB, PAS):
+       - The PostalAddress entity is fetched twice to separately retrieve the billing and shipping addresses.
+       - `PAB` is used to fetch the billing address associated with the billing contact mechanism (BILLING_LOCATION).
+       - `PAS` is used to fetch the shipping address associated with the shipping contact mechanism (SHIPPING_LOCATION).
+    3. TelecomNumber (TN, TNSP):
+       - Fetched twice to separately retrieve billing and shipping phone numbers.
+       - `TN` retrieves billing phone details associated with `PHONE_BILLING`.
+       - `TNSP` retrieves shipping phone details associated with `PHONE_SHIPPING`.
+    4. Geo (COUNTRYGEOBL, COUNTRYGEOSL):
+       - Fetched twice to separately retrieve country details for billing and shipping addresses.
+       - `COUNTRYGEOBL` retrieves the country information for billing address (`PAB`).
+       - `COUNTRYGEOSL` retrieves the country information for shipping address (`PAS`).
+
+   Reason for including all the details in this view:
+    - To simplify the implementation of the service:
+        - Fetching details like PostalAddress, TelecomNumber, and other related entities directly in the service would make the implementation complex and harder to maintain.
+        - Consolidating all the data fetching logic in the view keeps the service focused on business logic rather than data retrieval. (mainly we want to keep the feting logic and the business logic separate)
+    - To centralize data retrieval logic:
+        - This approach also makes it easier to modify data retrieval logic in one place (the view) without impacting services.
+
+    Approach to alias selection:
+    - Only the required fields are selected in the alias definitions to avoid fetching unnecessary data.
+    - Each alias (e.g., `shippingAddress1`, `billingEmail`, `ShippingCost`) maps to a specific field that is directly used in the service.
+    - This minimizes the size of the result set
+    -->
     <view-entity entity-name="OrdersDetailsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
         <member-entity entity-alias="SCENM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="OH" join-optional="true">
@@ -138,6 +185,23 @@
         <alias name="ShippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
 
+    <!--
+    Purpose of this view:
+    - The primary purpose of the `OrderItemsForNetSuiteView` view is to fetch order item-level details that are required for creating the order feed from Hotwax to NetSuite.
+    - It specifically checks for the eligibility of each order item for NetSuite processing by ensuring that the product has a corresponding NetSuite product ID.`.
+
+    Scenarios to consider:
+    1. **Custom Gift Card Items in POS Orders**:
+       - In some cases, a POS order might contain both regular items and custom gift card items.
+       - Custom gift card items typically do not have a `NETSUITE_PRODUCT_ID` associated with them.
+       - Since this view filters items based on the presence of a `NETSUITE_PRODUCT_ID`, custom gift card items will be excluded from the results.
+       - This exclusion can lead to incomplete or incorrect data in such scenarios, as the custom gift card item will not be included in the feed sent to NetSuite.
+
+    Design decision rationale:
+    - By enforcing the condition that each product must have a `NETSUITE_PRODUCT_ID`, this view ensures that only eligible items are included in the NetSuite feed.
+    - However, scenarios like the one described above must be handled at the service level or through a separate mechanism to ensure that excluded items (such as custom gift cards) are appropriately processed or flagged.
+    - Keeping the data fetching logic in this view simplifies the implementation of the service and maintains separation of concerns between data retrieval and business logic.
+    -->
     <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <member-entity entity-alias="P" entity-name="org.apache.ofbiz.product.product.Product" join-from-alias="OI">
@@ -165,6 +229,7 @@
         <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>
 
+    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as IntegrationTypeMappingAndEnum view is not specific to netsuite. -->
     <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
         <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
         <member-entity entity-alias="ENUM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="ITM">
@@ -175,6 +240,7 @@
         <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
     </view-entity>
 
+    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as CommunicationEventAndOrder view is not specific to netsuite. -->
     <view-entity entity-name="CommunicationEventAndOrder" package="co.hotwax.integration">
         <member-entity entity-alias="CO" entity-name="org.apache.ofbiz.order.order.CommunicationEventOrder"/>
         <member-entity entity-alias="CE" entity-name="org.apache.ofbiz.party.communication.CommunicationEvent" join-from-alias="CO">

From 8589b1addb311d4607e459a8133578795a8dd597 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Sat, 14 Dec 2024 21:32:38 +0530
Subject: [PATCH 10/17] shift the view entity into new file. it can be shifted
 into oms-udm later.

---
 entity/OrderViewEntities.xml | 22 ----------------------
 entity/omsViewWntities.xml   | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 entity/omsViewWntities.xml

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index a80c249..f78f539 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -228,26 +228,4 @@
         <alias name="shipmentMethodTypeId" entity-alias="OISG"/>
         <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>
-
-    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as IntegrationTypeMappingAndEnum view is not specific to netsuite. -->
-    <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
-        <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
-        <member-entity entity-alias="ENUM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="ITM">
-            <key-map field-name="integrationTypeId"/>
-        </member-entity>
-        <alias-all entity-alias="ITM"/>
-        <alias-all entity-alias="ENUM"/>
-        <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
-    </view-entity>
-
-    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as CommunicationEventAndOrder view is not specific to netsuite. -->
-    <view-entity entity-name="CommunicationEventAndOrder" package="co.hotwax.integration">
-        <member-entity entity-alias="CO" entity-name="org.apache.ofbiz.order.order.CommunicationEventOrder"/>
-        <member-entity entity-alias="CE" entity-name="org.apache.ofbiz.party.communication.CommunicationEvent" join-from-alias="CO">
-            <key-map field-name="communicationEventId"/>
-        </member-entity>
-        <alias-all entity-alias="CO"/>
-        <alias-all entity-alias="CE"/>
-    </view-entity>
-
 </entities>
\ No newline at end of file
diff --git a/entity/omsViewWntities.xml b/entity/omsViewWntities.xml
new file mode 100644
index 0000000..ed9da9c
--- /dev/null
+++ b/entity/omsViewWntities.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
+
+    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as IntegrationTypeMappingAndEnum view is not specific to netsuite. -->
+    <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
+        <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
+        <member-entity entity-alias="ENUM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="ITM">
+            <key-map field-name="integrationTypeId"/>
+        </member-entity>
+        <alias-all entity-alias="ITM"/>
+        <alias-all entity-alias="ENUM"/>
+        <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
+    </view-entity>
+
+    <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as CommunicationEventAndOrder view is not specific to netsuite. -->
+    <view-entity entity-name="CommunicationEventAndOrder" package="co.hotwax.integration">
+        <member-entity entity-alias="CO" entity-name="org.apache.ofbiz.order.order.CommunicationEventOrder"/>
+        <member-entity entity-alias="CE" entity-name="org.apache.ofbiz.party.communication.CommunicationEvent" join-from-alias="CO">
+            <key-map field-name="communicationEventId"/>
+        </member-entity>
+        <alias-all entity-alias="CO"/>
+        <alias-all entity-alias="CE"/>
+    </view-entity>
+</entities>
\ No newline at end of file

From 42b511ff8f8b19e4a1e5827a0861c24aa678ca61 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Sat, 14 Dec 2024 21:33:57 +0530
Subject: [PATCH 11/17] updated the component name

---
 component.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/component.xml b/component.xml
index defef7f..e17df69 100644
--- a/component.xml
+++ b/component.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
-   name="mantle-net-suite-connector" version="1.0.0">
+   name="mantle-netsuite-connector" version="1.0.0">
 </component>

From 68a40ea1d851d52e054e10ef27ac91581d2a9b74 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:22:13 +0530
Subject: [PATCH 12/17] Added the subselect in the
 EligibleOrdersForNetSuiteView to add a check on shipping method while
 fetching the eligible orderIds

---
 entity/OrderViewEntities.xml | 37 +++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index f78f539..55932e4 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -27,11 +27,16 @@
                 <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
             </entity-condition>
         </member-entity>
+        <!-- Added the subselect in the EligibleOrdersForNetSuiteView to add a check on shipping method while fetching the eligible orderIds -->
+        <member-entity entity-alias="OIV" entity-name="co.hotwax.order.OrderItemsForNetSuiteView" sub-select="true" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+        </member-entity>
         <entity-condition>
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
         </entity-condition>
         <alias-all entity-alias="OH"/>
+        <alias-all entity-alias="OIV"/>
     </view-entity>
 
     <!--Purpose of this view:
@@ -157,31 +162,33 @@
         </member-entity>
         <alias name="orderName" field="orderName" entity-alias="OH"/>
         <alias name="orderId" field="orderId" entity-alias="OH"/>
-        <alias name="orderDate" field="orderDate" entity-alias="OH"/>
+        <alias name="date" field="orderDate" entity-alias="OH"/>
+        <alias name="customer" field="idValue" entity-alias="PID"/>
+        <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias name="shippingContactMechId" field="contactMechId" entity-alias="PAS"/>
-        <alias name="shippingAddress1" field="address1" entity-alias="PAS"/>
-        <alias name="shippingAddress2" field="address2" entity-alias="PAS"/>
-        <alias name="shippingCity" field="city" entity-alias="PAS"/>
-        <alias name="shippingState" field="stateProvinceGeoId" entity-alias="PAS"/>
-        <alias name="shippingPostalCode" field="postalCode" entity-alias="PAS"/>
-        <alias name="shippingCountry" field="geoCode" entity-alias="COUNTRYGEOSL"/>
+        <alias name="addressee" field="toName" entity-alias="PAS"/>
+        <alias name="address1" field="address1" entity-alias="PAS"/>
+        <alias name="address2" field="address2" entity-alias="PAS"/>
+        <alias name="city" field="city" entity-alias="PAS"/>
+        <alias name="state" field="stateProvinceGeoId" entity-alias="PAS"/>
+        <alias name="zip" field="postalCode" entity-alias="PAS"/>
+        <alias name="country" field="geoCode" entity-alias="COUNTRYGEOSL"/>
+        <alias name="shippingCountryCode" field="countryCode" entity-alias="TNSP"/>
+        <alias name="shippingAreaCode" field="countryCode" entity-alias="TNSP"/>
+        <alias name="shippingContactNumber" field="contactNumber" entity-alias="TNSP"/>
         <alias name="billingContactMechId" field="contactMechId" entity-alias="PAB"/>
         <alias name="billingAddress1" field="address2" entity-alias="PAB"/>
         <alias name="billingAddress2" field="address2" entity-alias="PAB"/>
         <alias name="billingCity" field="city" entity-alias="PAB"/>
         <alias name="billingState" field="stateProvinceGeoId" entity-alias="PAB"/>
-        <alias name="billingPostalCode" field="postalCode" entity-alias="PAB"/>
+        <alias name="billingZip" field="postalCode" entity-alias="PAB"/>
         <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
-        <alias name="customerId" field="idValue" entity-alias="PID"/>
-        <alias name="salesChannel" field="description" entity-alias="SCENM"/>
         <alias name="billingCountryCode" field="countryCode" entity-alias="TN"/>
         <alias name="billingAreaCode" field="countryCode" entity-alias="TN"/>
         <alias name="billingContactNumber" field="contactNumber" entity-alias="TN"/>
-        <alias name="shippingCountryCode" field="countryCode" entity-alias="TNSP"/>
-        <alias name="shippingAreaCode" field="countryCode" entity-alias="TNSP"/>
-        <alias name="shippingContactNumber" field="contactNumber" entity-alias="TNSP"/>
+        <alias name="billingAddressee" field="toName" entity-alias="PAS"/>
         <alias name="billingEmail" field="infoString" entity-alias="CMBE"/>
-        <alias name="shippingEmail" field="infoString" entity-alias="CMSE"/>
+        <alias name="email" field="infoString" entity-alias="CMSE"/>
         <alias name="ShippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
 
@@ -224,7 +231,7 @@
         <alias name="quantity" field="quantity" entity-alias="OI"/>
         <alias name="itemStatus" field="statusId" entity-alias="OI"/>
         <alias name="productId" field="productId" entity-alias="OI"/>
-        <alias name="NetSuiteProductId" field="idValue" entity-alias="GID"/>
+        <alias name="netSuiteProductId" field="idValue" entity-alias="GID"/>
         <alias name="shipmentMethodTypeId" entity-alias="OISG"/>
         <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>

From 237bd923b2a67018b46ec5468897df2b67003976 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Tue, 17 Dec 2024 16:38:38 +0530
Subject: [PATCH 13/17] added comment in subselect

---
 entity/OrderViewEntities.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 55932e4..1d68d7f 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -27,7 +27,6 @@
                 <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
             </entity-condition>
         </member-entity>
-        <!-- Added the subselect in the EligibleOrdersForNetSuiteView to add a check on shipping method while fetching the eligible orderIds -->
         <member-entity entity-alias="OIV" entity-name="co.hotwax.order.OrderItemsForNetSuiteView" sub-select="true" join-from-alias="OH">
             <key-map field-name="orderId"/>
         </member-entity>
@@ -189,7 +188,7 @@
         <alias name="billingAddressee" field="toName" entity-alias="PAS"/>
         <alias name="billingEmail" field="infoString" entity-alias="CMBE"/>
         <alias name="email" field="infoString" entity-alias="CMSE"/>
-        <alias name="ShippingCost" field="amount" entity-alias="OADJ"/>
+        <alias name="shippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
 
     <!--

From 0b677aae86b616aab39d9b969250f22f5cce5b9a Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Fri, 20 Dec 2024 15:50:26 +0530
Subject: [PATCH 14/17] added the enum code in the view

---
 entity/OrderViewEntities.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 1d68d7f..20bff1d 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -164,6 +164,7 @@
         <alias name="date" field="orderDate" entity-alias="OH"/>
         <alias name="customer" field="idValue" entity-alias="PID"/>
         <alias name="salesChannel" field="description" entity-alias="SCENM"/>
+        <alias name="salesChannelEnumCode" field="enumCode" entity-alias="SCENM"/>
         <alias name="shippingContactMechId" field="contactMechId" entity-alias="PAS"/>
         <alias name="addressee" field="toName" entity-alias="PAS"/>
         <alias name="address1" field="address1" entity-alias="PAS"/>

From 7e56cf5629667fcad68deda9609b087c3fa48ffc Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Tue, 24 Dec 2024 11:12:14 +0530
Subject: [PATCH 15/17] Added a view entity (InvalidOrdersForNetsuite) to
 exculde the invalid orders from the EligibleOrdersForNetSuiteView view.

---
 entity/OrderViewEntities.xml                  | 24 +++++++++++++++++++
 ...msViewWntities.xml => omsViewEntities.xml} |  0
 2 files changed, 24 insertions(+)
 rename entity/{omsViewWntities.xml => omsViewEntities.xml} (100%)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 20bff1d..919c7d2 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -30,9 +30,13 @@
         <member-entity entity-alias="OIV" entity-name="co.hotwax.order.OrderItemsForNetSuiteView" sub-select="true" join-from-alias="OH">
             <key-map field-name="orderId"/>
         </member-entity>
+        <member-entity entity-alias="INVORD" entity-name="co.hotwax.netsuite.order.InvalidOrdersForNetsuite" sub-select="true" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+        </member-entity>
         <entity-condition>
             <econdition entity-alias="OH" field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
+            <econdition entity-alias="INVORD" field-name="orderId" operator="equals" value=""/>
         </entity-condition>
         <alias-all entity-alias="OH"/>
         <alias-all entity-alias="OIV"/>
@@ -235,4 +239,24 @@
         <alias name="shipmentMethodTypeId" entity-alias="OISG"/>
         <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>
+    
+    <view-entity entity-name="InvalidOrdersForNetsuite" package="co.hotwax.netsuite.order">
+        <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
+        <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+        </member-entity>
+        <member-entity entity-alias="GID" entity-name="org.apache.ofbiz.product.product.GoodIdentification" join-from-alias="OI" join-optional="true">
+            <key-map field-name="productId"/>
+            <entity-condition>
+                <econdition field-name="goodIdentificationTypeId" value="NETSUITE_PRODUCT_ID"/>
+                <date-filter/>
+            </entity-condition>
+        </member-entity>
+        <alias-all entity-alias="OH"/>
+        <alias name="productId" entity-alias="OI" field="productId"/>
+        <entity-condition>
+            <econdition field-name="goodIdentificationTypeId" entity-alias="GID" operator="equals" value="null"/>
+            <econdition field-name="orderTypeId" entity-alias="OH" operator="equals" value="SALES_ORDER"/>
+        </entity-condition>
+    </view-entity>
 </entities>
\ No newline at end of file
diff --git a/entity/omsViewWntities.xml b/entity/omsViewEntities.xml
similarity index 100%
rename from entity/omsViewWntities.xml
rename to entity/omsViewEntities.xml

From cfb7d4786b77b02e4b7e61c51ebcb45bbeff41de Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Sat, 28 Dec 2024 20:53:09 +0530
Subject: [PATCH 16/17] Added the service def for productPromo  here for now, 
 As deleted from oms-usl-udm.

---
 entity/OrderViewEntities.xml |  4 ++--
 entity/omsViewEntities.xml   | 29 ++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/entity/OrderViewEntities.xml b/entity/OrderViewEntities.xml
index 919c7d2..1f8aeb7 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/OrderViewEntities.xml
@@ -178,7 +178,7 @@
         <alias name="zip" field="postalCode" entity-alias="PAS"/>
         <alias name="country" field="geoCode" entity-alias="COUNTRYGEOSL"/>
         <alias name="shippingCountryCode" field="countryCode" entity-alias="TNSP"/>
-        <alias name="shippingAreaCode" field="countryCode" entity-alias="TNSP"/>
+        <alias name="shippingAreaCode" field="areaCode" entity-alias="TNSP"/>
         <alias name="shippingContactNumber" field="contactNumber" entity-alias="TNSP"/>
         <alias name="billingContactMechId" field="contactMechId" entity-alias="PAB"/>
         <alias name="billingAddress1" field="address2" entity-alias="PAB"/>
@@ -188,7 +188,7 @@
         <alias name="billingZip" field="postalCode" entity-alias="PAB"/>
         <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
         <alias name="billingCountryCode" field="countryCode" entity-alias="TN"/>
-        <alias name="billingAreaCode" field="countryCode" entity-alias="TN"/>
+        <alias name="billingAreaCode" field="areaCode" entity-alias="TN"/>
         <alias name="billingContactNumber" field="contactNumber" entity-alias="TN"/>
         <alias name="billingAddressee" field="toName" entity-alias="PAS"/>
         <alias name="billingEmail" field="infoString" entity-alias="CMBE"/>
diff --git a/entity/omsViewEntities.xml b/entity/omsViewEntities.xml
index ed9da9c..c053679 100644
--- a/entity/omsViewEntities.xml
+++ b/entity/omsViewEntities.xml
@@ -2,6 +2,33 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
+    <entity entity-name="ProductPromo" package="org.apache.ofbiz.product.promo" group="ofbiz_transactional">
+        <field name="productPromoId" type="id" is-pk="true"></field>
+        <field name="promoName" type="text-medium"></field>
+        <field name="promoText" type="text-medium"></field>
+        <field name="userEntered" type="text-indicator"></field>
+        <field name="showToCustomer" type="text-indicator"></field>
+        <field name="requireCode" type="text-indicator"></field>
+        <field name="useLimitPerOrder" type="number-integer"></field>
+        <field name="useLimitPerCustomer" type="number-integer"></field>
+        <field name="useLimitPerPromotion" type="number-integer"></field>
+        <field name="billbackFactor" type="number-decimal"></field>
+        <field name="overrideOrgPartyId" type="id"></field>
+        <field name="createdDate" type="date-time"></field>
+        <field name="createdByUserLogin" type="id-long"></field>
+        <field name="lastModifiedDate" type="date-time"></field>
+        <field name="lastModifiedByUserLogin" type="id-long"></field>
+        <relationship type="one" fk-name="PROD_PRMO_OPA" related="org.apache.ofbiz.party.party.Party">
+            <key-map field-name="overrideOrgPartyId" related="partyId"/>
+        </relationship>
+        <relationship type="one" fk-name="PROD_PRMO_CUL" title="CreatedBy" related="org.apache.ofbiz.security.login.UserLogin">
+            <key-map field-name="createdByUserLogin" related="userLoginId"/>
+        </relationship>
+        <relationship type="one" fk-name="PROD_PRMO_LMCUL" title="LastModifiedBy" related="org.apache.ofbiz.security.login.UserLogin">
+            <key-map field-name="lastModifiedByUserLogin" related="userLoginId"/>
+        </relationship>
+    </entity>
+
     <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as IntegrationTypeMappingAndEnum view is not specific to netsuite. -->
     <view-entity entity-name="IntegrationTypeMappingAndEnum" package="co.hotwax.integration">
         <member-entity entity-alias="ITM" entity-name="co.hotwax.integration.IntegrationTypeMapping"/>
@@ -10,7 +37,7 @@
         </member-entity>
         <alias-all entity-alias="ITM"/>
         <alias-all entity-alias="ENUM"/>
-        <alias name="EnumDescription" field="description" entity-alias="ENUM"/>
+        <alias name="enumDescription" field="description" entity-alias="ENUM"/>
     </view-entity>
 
     <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as CommunicationEventAndOrder view is not specific to netsuite. -->

From e44ade97184208dd1e71678e9a81aaf8643fe543 Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:17:15 +0530
Subject: [PATCH 17/17] Updated the file name

---
 ...ewEntities.xml => NesuiteViewEntities.xml} | 82 ++++++++++---------
 entity/omsViewEntities.xml                    |  1 -
 2 files changed, 42 insertions(+), 41 deletions(-)
 rename entity/{OrderViewEntities.xml => NesuiteViewEntities.xml} (84%)

diff --git a/entity/OrderViewEntities.xml b/entity/NesuiteViewEntities.xml
similarity index 84%
rename from entity/OrderViewEntities.xml
rename to entity/NesuiteViewEntities.xml
index 1f8aeb7..842df1c 100644
--- a/entity/OrderViewEntities.xml
+++ b/entity/NesuiteViewEntities.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
     <!--
-    Created a view to fetch eligible orders for creating an order feed from HotWax to NetSuite.
-    The view consolidates relevant data from `OrderHeader`, `OrderIdentification`, and `PartyIdentification` entities.
+      Created a view to fetch eligible orders for creating an order feed from HotWax to NetSuite.
+      The view consolidates relevant data from `OrderHeader`, `OrderIdentification`, and `PartyIdentification` entities.
 
-    Criteria for fetching eligible records:
-    1. The order must be of type `SALES_ORDER`
-    2. The order should not already synced with Netsuite
-    3. The customer should be synced with Netsuite
-    4. A date filter can be applied in `OrderIdentification` to fetch the eligible identification.
+        Criteria for fetching eligible records:
+        1. The order must be of type `SALES_ORDER`
+        2. The order should not already synced with Netsuite
+        3. The customer should be synced with Netsuite
+        4. A date filter can be applied in `OrderIdentification` to fetch the eligible identification.
     -->
-    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+    <view-entity entity-name="EligibleOrdersForNetSuiteView" package="co.hotwax.order">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
         <member-entity entity-alias="OID" entity-name="co.hotwax.order.OrderIdentification" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
@@ -21,7 +19,13 @@
                 <date-filter/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="ODR">
+        <member-entity entity-alias="OR" entity-name="org.apache.ofbiz.order.order.OrderRole" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition entity-alias="OR" field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
+            </entity-condition>
+        </member-entity>
+        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="OR">
             <key-map field-name="partyId"/>
             <entity-condition>
                 <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
@@ -38,18 +42,18 @@
             <econdition entity-alias="OID" field-name="orderId" operator="equals" value=""/>
             <econdition entity-alias="INVORD" field-name="orderId" operator="equals" value=""/>
         </entity-condition>
+        <alias name="partyId" entity-alias="PID"/>
         <alias-all entity-alias="OH"/>
         <alias-all entity-alias="OIV"/>
     </view-entity>
-
     <!--Purpose of this view:
     - The primary purpose of this view-entity is to fetch the order-related data required by the service to prepare the order feed from Hotwax to NetSuite.
 
     Fetching entities multiple times:
-    1. OrderContactMech (OCMBL, OCMSL, OCMBP, OCMSP, OCMBE, OCMSE):
+    1. OrderContactMech (OCMBA, OCMSA, OCMBP, OCMSP, OCMBE, OCMSE):
        - The OrderContactMech entity is fetched multiple times to retrieve contact mechanisms for various purposes:
-           - `OCMBL`: For billing location details.
-           - `OCMSL`: For shipping location details.
+           - `OCMBA`: For billing address details.
+           - `OCMSA`: For shipping address details.
            - `OCMBP`: For billing phone details.
            - `OCMSP`: For shipping phone details.
            - `OCMBE`: For billing email details.
@@ -59,9 +63,9 @@
        - The PostalAddress entity is fetched twice to separately retrieve the billing and shipping addresses.
        - `PAB` is used to fetch the billing address associated with the billing contact mechanism (BILLING_LOCATION).
        - `PAS` is used to fetch the shipping address associated with the shipping contact mechanism (SHIPPING_LOCATION).
-    3. TelecomNumber (TN, TNSP):
+    3. TelecomNumber (TNBP, TNSP):
        - Fetched twice to separately retrieve billing and shipping phone numbers.
-       - `TN` retrieves billing phone details associated with `PHONE_BILLING`.
+       - `TNTNBP` retrieves billing phone details associated with `PHONE_BILLING`.
        - `TNSP` retrieves shipping phone details associated with `PHONE_SHIPPING`.
     4. Geo (COUNTRYGEOBL, COUNTRYGEOSL):
        - Fetched twice to separately retrieve country details for billing and shipping addresses.
@@ -80,45 +84,45 @@
     - Each alias (e.g., `shippingAddress1`, `billingEmail`, `ShippingCost`) maps to a specific field that is directly used in the service.
     - This minimizes the size of the result set
     -->
-    <view-entity entity-name="OrdersDetailsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+    <view-entity entity-name="OrderDetailsForNetSuiteView" package="co.hotwax.order">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
-        <member-entity entity-alias="SCENM" entity-name="org.apache.ofbiz.common.enum.Enumeration" join-from-alias="OH" join-optional="true">
+        <member-entity entity-alias="SCENM" entity-name="moqui.basic.Enumeration" join-from-alias="OH" join-optional="true">
             <key-map field-name="salesChannelEnumId" related="enumId"/>
         </member-entity>
-        <member-entity entity-alias="ODR" entity-name="org.apache.ofbiz.order.order.OrderRole" join-from-alias="OH" join-optional="true">
+        <member-entity entity-alias="OR" entity-name="org.apache.ofbiz.order.order.OrderRole" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
-                <econdition entity-alias="ODR" field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
+                <econdition entity-alias="OR" field-name="roleTypeId" operator="equals" value="BILL_TO_CUSTOMER"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="ODR">
+        <member-entity entity-alias="PID" entity-name="org.apache.ofbiz.party.party.PartyIdentification" join-from-alias="OR">
             <key-map field-name="partyId"/>
             <entity-condition>
                 <econdition entity-alias="PID" field-name="partyIdentificationTypeId" value="NETSUITE_CUSTOMER_ID"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="OCMBL" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+        <member-entity entity-alias="OCMBA" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
-                <econdition entity-alias="OCMBL" field-name="contactMechPurposeTypeId" operator="equals" value="BILLING_LOCATION"/>
+                <econdition entity-alias="OCMBA" field-name="contactMechPurposeTypeId" operator="equals" value="BILLING_LOCATION"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="PAB" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMBL" join-optional="true">
+        <member-entity entity-alias="PAB" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMBA" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
-        <member-entity entity-alias="COUNTRYGEOBL" entity-name="org.apache.ofbiz.common.geo.Geo" join-from-alias="PAB" join-optional="true">
+        <member-entity entity-alias="COUNTRYGEOBL" entity-name="moqui.basic.Geo" join-from-alias="PAB" join-optional="true">
             <key-map field-name="countryGeoId" related="geoId"/>
         </member-entity>
-        <member-entity entity-alias="OCMSL" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
+        <member-entity entity-alias="OCMSA" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
             <entity-condition>
-                <econdition entity-alias="OCMSL" field-name="contactMechPurposeTypeId" operator="equals" value="SHIPPING_LOCATION"/>
+                <econdition entity-alias="OCMSA" field-name="contactMechPurposeTypeId" operator="equals" value="SHIPPING_LOCATION"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="PAS" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMSL" join-optional="true">
+        <member-entity entity-alias="PAS" entity-name="org.apache.ofbiz.party.contact.PostalAddress" join-from-alias="OCMSA" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
-        <member-entity entity-alias="COUNTRYGEOSL" entity-name="org.apache.ofbiz.common.geo.Geo" join-from-alias="PAS" join-optional="true">
+        <member-entity entity-alias="COUNTRYGEOSL" entity-name="moqui.basic.Geo" join-from-alias="PAS" join-optional="true">
             <key-map field-name="countryGeoId" related="geoId"/>
         </member-entity>
         <member-entity entity-alias="OCMBP" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
@@ -127,7 +131,7 @@
                 <econdition entity-alias="OCMBP" field-name="contactMechPurposeTypeId" operator="equals" value="PHONE_BILLING"/>
             </entity-condition>
         </member-entity>
-        <member-entity entity-alias="TN" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP" join-optional="true">
+        <member-entity entity-alias="TNBP" entity-name="org.apache.ofbiz.party.contact.TelecomNumber" join-from-alias="OCMBP" join-optional="true">
             <key-map field-name="contactMechId"/>
         </member-entity>
         <member-entity entity-alias="OCMSP" entity-name="org.apache.ofbiz.order.order.OrderContactMech" join-from-alias="OH" join-optional="true">
@@ -176,7 +180,7 @@
         <alias name="city" field="city" entity-alias="PAS"/>
         <alias name="state" field="stateProvinceGeoId" entity-alias="PAS"/>
         <alias name="zip" field="postalCode" entity-alias="PAS"/>
-        <alias name="country" field="geoCode" entity-alias="COUNTRYGEOSL"/>
+        <alias name="country" field="geoCodeAlpha2" entity-alias="COUNTRYGEOSL"/>
         <alias name="shippingCountryCode" field="countryCode" entity-alias="TNSP"/>
         <alias name="shippingAreaCode" field="areaCode" entity-alias="TNSP"/>
         <alias name="shippingContactNumber" field="contactNumber" entity-alias="TNSP"/>
@@ -186,16 +190,15 @@
         <alias name="billingCity" field="city" entity-alias="PAB"/>
         <alias name="billingState" field="stateProvinceGeoId" entity-alias="PAB"/>
         <alias name="billingZip" field="postalCode" entity-alias="PAB"/>
-        <alias name="billingCountry" field="geoCode" entity-alias="COUNTRYGEOBL"/>
-        <alias name="billingCountryCode" field="countryCode" entity-alias="TN"/>
-        <alias name="billingAreaCode" field="areaCode" entity-alias="TN"/>
-        <alias name="billingContactNumber" field="contactNumber" entity-alias="TN"/>
+        <alias name="billingCountry" field="geoCodeAlpha2" entity-alias="COUNTRYGEOBL"/>
+        <alias name="billingCountryCode" field="countryCode" entity-alias="TNBP"/>
+        <alias name="billingAreaCode" field="areaCode" entity-alias="TNBP"/>
+        <alias name="billingContactNumber" field="contactNumber" entity-alias="TNBP"/>
         <alias name="billingAddressee" field="toName" entity-alias="PAS"/>
         <alias name="billingEmail" field="infoString" entity-alias="CMBE"/>
         <alias name="email" field="infoString" entity-alias="CMSE"/>
         <alias name="shippingCost" field="amount" entity-alias="OADJ"/>
     </view-entity>
-
     <!--
     Purpose of this view:
     - The primary purpose of the `OrderItemsForNetSuiteView` view is to fetch order item-level details that are required for creating the order feed from Hotwax to NetSuite.
@@ -213,7 +216,7 @@
     - However, scenarios like the one described above must be handled at the service level or through a separate mechanism to ensure that excluded items (such as custom gift cards) are appropriately processed or flagged.
     - Keeping the data fetching logic in this view simplifies the implementation of the service and maintains separation of concerns between data retrieval and business logic.
     -->
-    <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order" group="ofbiz_transactional">
+    <view-entity entity-name="OrderItemsForNetSuiteView" package="co.hotwax.order"  >
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem"/>
         <member-entity entity-alias="P" entity-name="org.apache.ofbiz.product.product.Product" join-from-alias="OI">
             <key-map field-name="productId"/>
@@ -239,7 +242,6 @@
         <alias name="shipmentMethodTypeId" entity-alias="OISG"/>
         <alias name="location" field="facilityId" entity-alias="OISG"/>
     </view-entity>
-    
     <view-entity entity-name="InvalidOrdersForNetsuite" package="co.hotwax.netsuite.order">
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader"/>
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem" join-from-alias="OH">
diff --git a/entity/omsViewEntities.xml b/entity/omsViewEntities.xml
index c053679..eafe3ec 100644
--- a/entity/omsViewEntities.xml
+++ b/entity/omsViewEntities.xml
@@ -37,7 +37,6 @@
         </member-entity>
         <alias-all entity-alias="ITM"/>
         <alias-all entity-alias="ENUM"/>
-        <alias name="enumDescription" field="description" entity-alias="ENUM"/>
     </view-entity>
 
     <!-- we can shift this view into ofbiz-oms-udm component where all other generic views are created as CommunicationEventAndOrder view is not specific to netsuite. -->