From f6a90ee9bce090374ab0cb9e1f524a70def44580 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Thu, 19 Dec 2024 10:43:14 +0530
Subject: [PATCH 1/4] Added two views to fetch the data for the customer
 deposit feed

Changelog: Added
---
 entity/CustomerDepositView.xml | 47 ++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 entity/CustomerDepositView.xml

diff --git a/entity/CustomerDepositView.xml b/entity/CustomerDepositView.xml
new file mode 100644
index 0000000..cf9e1db
--- /dev/null
+++ b/entity/CustomerDepositView.xml
@@ -0,0 +1,47 @@
+<?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="CustomerDepositSyncView"  package="co.hotwax.financial" 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">
+            <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="OPP" entity-name="org.apache.ofbiz.order.order.OrderPaymentPreference" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+        </member-entity>
+        <member-entity entity-alias="OISG" entity-name="org.apache.ofbiz.order.order.OrderItemShipGroup" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+        </member-entity>
+        <member-entity entity-alias="DCO" entity-name="co.hotwax.order.DirectCancelOrder" join-from-alias="OH" sub-select="true" join-optional="true">
+            <key-map field-name="orderId"/>
+        </member-entity>
+        <alias name="shopifyOrderNo" field="externalId" entity-alias="OH"/>
+        <alias name="totalAmount" field="maxAmount" entity-alias="OPP"/>
+        <alias name="externalId" field="manualRefNum" entity-alias="OPP"/>
+        <alias name="fromDate" entity-alias="OID"/>
+        <alias name="paymentMethodTypeId" entity-alias="OPP"/>
+    </view-entity>
+
+    <view-entity entity-name="DirectCancelOrder" package="co.hotwax.order" group="ofbiz_transactional">
+        <member-entity entity-alias="OS" entity-name="org.apache.ofbiz.order.order.OrderStatus"/>
+        <alias name="statusCount" field="statusId" entity-alias="OS" function="count"/>
+        <alias name="status" field="statusId" entity-alias="OS" function="max"/>
+        <alias name="orderId" entity-alias="OS"/>
+        <entity-condition>
+            <econdition field-name="orderItemSeqId" operator="is-null" entity-alias="OS"/>
+            <econdition field-name="orderPaymentPreferenceId" operator="is-null" entity-alias="OS"/>
+            <having-econditions>
+                <econditions>
+                    <econdition field-name="statusCount" operator="equals" value="1"/>
+                    <econdition field-name="status" operator="equals" value="ORDER_CANCELLED"/>
+                </econditions>
+            </having-econditions>
+        </entity-condition>
+    </view-entity>
+</entities>
\ No newline at end of file

From c3878398c8b604c8e04ccd20a82823e5e19c0919 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Thu, 19 Dec 2024 14:19:31 +0530
Subject: [PATCH 2/4] added the netsuite order id in view

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

diff --git a/entity/CustomerDepositView.xml b/entity/CustomerDepositView.xml
index cf9e1db..d8b02ca 100644
--- a/entity/CustomerDepositView.xml
+++ b/entity/CustomerDepositView.xml
@@ -25,6 +25,7 @@
         <alias name="totalAmount" field="maxAmount" entity-alias="OPP"/>
         <alias name="externalId" field="manualRefNum" entity-alias="OPP"/>
         <alias name="fromDate" entity-alias="OID"/>
+        <alias name="orderId" field="idValue" entity-alias="OID"/>
         <alias name="paymentMethodTypeId" entity-alias="OPP"/>
     </view-entity>
 

From 3547b0e7447a532860b5ad3642f5dafacee92f4b Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:42:45 +0530
Subject: [PATCH 3/4] Added the conditions in the view

---
 entity/CustomerDepositView.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/entity/CustomerDepositView.xml b/entity/CustomerDepositView.xml
index d8b02ca..553360b 100644
--- a/entity/CustomerDepositView.xml
+++ b/entity/CustomerDepositView.xml
@@ -27,6 +27,13 @@
         <alias name="fromDate" entity-alias="OID"/>
         <alias name="orderId" field="idValue" entity-alias="OID"/>
         <alias name="paymentMethodTypeId" entity-alias="OPP"/>
+        <alias name="orderPaymentPreferenceId" entity-alias="OPP"/>
+        <alias name="shipmentMethodTypeId" entity-alias="OISG" is-aggregate="true"/>
+        <entity-condition>
+            <econdition entity-alias="OH" field-name="orderTypeId" value="SALES_ORDER"/>
+            <econdition field-name="statusId" operator="not-equals" value="PAYMENT_REFUNDED" entity-alias="OPP"/>
+            <econdition field-name="paymentMethodTypeId" operator="not-equals" value="EXT_SHOP_GFT_CARD" entity-alias="OPP"/>
+        </entity-condition>
     </view-entity>
 
     <view-entity entity-name="DirectCancelOrder" package="co.hotwax.order" group="ofbiz_transactional">

From 1b3ce1fb2ca598352220036bc937180c7e14d05f Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:38:54 +0530
Subject: [PATCH 4/4] updated the view entity

---
 ...epositView.xml => NesuiteViewEntities.xml} | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)
 rename entity/{CustomerDepositView.xml => NesuiteViewEntities.xml} (74%)

diff --git a/entity/CustomerDepositView.xml b/entity/NesuiteViewEntities.xml
similarity index 74%
rename from entity/CustomerDepositView.xml
rename to entity/NesuiteViewEntities.xml
index 553360b..11ddac0 100644
--- a/entity/CustomerDepositView.xml
+++ b/entity/NesuiteViewEntities.xml
@@ -3,7 +3,7 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/entity-definition-3.xsd">
 
-    <view-entity entity-name="CustomerDepositSyncView"  package="co.hotwax.financial" group="ofbiz_transactional">
+   <view-entity entity-name="CustomerDepositSyncView"  package="co.hotwax.financial">
         <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">
             <key-map field-name="orderId"/>
@@ -18,8 +18,12 @@
         <member-entity entity-alias="OISG" entity-name="org.apache.ofbiz.order.order.OrderItemShipGroup" join-from-alias="OH">
             <key-map field-name="orderId"/>
         </member-entity>
-        <member-entity entity-alias="DCO" entity-name="co.hotwax.order.DirectCancelOrder" join-from-alias="OH" sub-select="true" join-optional="true">
+        <member-entity entity-alias="OS" entity-name="org.apache.ofbiz.order.order.OrderStatus" join-from-alias="OH" join-optional="true">
             <key-map field-name="orderId"/>
+            <entity-condition>
+                <econdition field-name="orderItemSeqId" operator="is-null" entity-alias="OS"/>
+                <econdition field-name="orderPaymentPreferenceId" operator="is-null" entity-alias="OS"/>
+            </entity-condition>
         </member-entity>
         <alias name="shopifyOrderNo" field="externalId" entity-alias="OH"/>
         <alias name="totalAmount" field="maxAmount" entity-alias="OPP"/>
@@ -29,26 +33,18 @@
         <alias name="paymentMethodTypeId" entity-alias="OPP"/>
         <alias name="orderPaymentPreferenceId" entity-alias="OPP"/>
         <alias name="shipmentMethodTypeId" entity-alias="OISG" is-aggregate="true"/>
+        <alias name="statusCount" field="statusId" entity-alias="OS" function="count"/>
+        <alias name="status" field="statusId" entity-alias="OS" function="max"/>
         <entity-condition>
             <econdition entity-alias="OH" field-name="orderTypeId" value="SALES_ORDER"/>
             <econdition field-name="statusId" operator="not-equals" value="PAYMENT_REFUNDED" entity-alias="OPP"/>
             <econdition field-name="paymentMethodTypeId" operator="not-equals" value="EXT_SHOP_GFT_CARD" entity-alias="OPP"/>
-        </entity-condition>
-    </view-entity>
-
-    <view-entity entity-name="DirectCancelOrder" package="co.hotwax.order" group="ofbiz_transactional">
-        <member-entity entity-alias="OS" entity-name="org.apache.ofbiz.order.order.OrderStatus"/>
-        <alias name="statusCount" field="statusId" entity-alias="OS" function="count"/>
-        <alias name="status" field="statusId" entity-alias="OS" function="max"/>
-        <alias name="orderId" entity-alias="OS"/>
-        <entity-condition>
-            <econdition field-name="orderItemSeqId" operator="is-null" entity-alias="OS"/>
-            <econdition field-name="orderPaymentPreferenceId" operator="is-null" entity-alias="OS"/>
-            <having-econditions>
+            <having-econditions combine="or">
                 <econditions>
                     <econdition field-name="statusCount" operator="equals" value="1"/>
-                    <econdition field-name="status" operator="equals" value="ORDER_CANCELLED"/>
+                    <econdition field-name="status" operator="not-equals" value="ORDER_CANCELLED"/>
                 </econditions>
+                <econdition field-name="statusCount" operator="greater" value="1"/>
             </having-econditions>
         </entity-condition>
     </view-entity>