updated the view entity

hotwax · Jan 9, 2025 · 1b3ce1f · 1b3ce1f
1 parent 3547b0e
commit 1b3ce1f
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/entity/CustomerDepositView.xml → entity/NesuiteViewEntities.xml b/entity/CustomerDepositView.xml → 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>