From 78be075553045835a437855e54633e1c5f2a8535 Mon Sep 17 00:00:00 2001
From: "janvi.talreja" <janvi.talreja@hotwax.co>
Date: Fri, 21 Feb 2025 16:16:43 +0530
Subject: [PATCH] Added: orderSalesChannel, orderSalesChannelenumId and shopId
 in the ReturnItemView as we need them in the Return FF at item level.

---
 entity/OmsOrderViewEntities.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index 8a77114..59f8017 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -145,6 +145,9 @@ under the License.
         <member-entity entity-alias="OH" entity-name="org.apache.ofbiz.order.order.OrderHeader" join-from-alias="RI">
             <key-map field-name="orderId"/>
         </member-entity>
+        <member-entity entity-alias="SSO" entity-name="co.hotwax.shopify.ShopifyShopOrder" join-from-alias="OH" join-optional="true">
+            <key-map field-name="orderId"/>
+        </member-entity>
         <member-entity entity-alias="OI" entity-name="org.apache.ofbiz.order.order.OrderItem" join-from-alias="RI" join-optional="true">
             <key-map field-name="orderId"/>
             <key-map field-name="orderItemSeqId"/>
@@ -164,6 +167,9 @@ under the License.
         <member-entity entity-alias="UOM" entity-name="moqui.basic.Uom" join-from-alias="RH" join-optional="true">
             <key-map field-name="currencyUomId" related="uomId"/>
         </member-entity>
+        <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>
         <alias entity-alias="RI" name="returnId"/>
         <alias entity-alias="RI" name="returnItemSeqId"/>
         <alias entity-alias="RI" name="orderId"/>
@@ -179,6 +185,8 @@ under the License.
         <alias entity-alias="OI" field="externalId" name="orderItemExternalId"/>
 
         <alias entity-alias="OH" name="orderName"/>
+        <alias entity-alias="OH" field="salesChannelEnumId" name="orderSalesChannelEnumId"/>
+        <alias entity-alias="SCENM" field="enumCode" name="orderSalesChannel"/>
 
         <alias entity-alias="F" field="externalId" name="facilityExternalId"/>
         <alias entity-alias="F" name="facilityId"/>
@@ -193,6 +201,7 @@ under the License.
         <alias entity-alias="RH" field="externalId" name="returnExternalId"/>
         <alias entity-alias="RI" name="returnTypeId"/>
         <alias entity-alias="RI" name="receivedQuantity"/>
+        <alias entity-alias="SSO" name="shopId"/>
     </view-entity>
 
     <view-entity entity-name="OrderItemAndHistory" package="co.hotwax.oms">