From ac6854387313f8cfa89b44d4fd5b86971f8cda28 Mon Sep 17 00:00:00 2001
From: Gurveen Bagga <gurveen.bagga@hotwax.co>
Date: Fri, 17 Feb 2023 12:49:05 +0530
Subject: [PATCH 1/2] Improved: Included ReturnItemReponse in
 OrderPaymentPreferenceAndType view

This is done for below scenario
1. The view should include ReturnItemResponse entity with join-optional true as for Sales, this entity does not hold records, but it contains records for Returns and Appeasements.
2. Now for Sales Items, we can fetch payment details using order Id and statusId = 'PAYMENT_SETTLED'.
3. For Return Items, we can fetch payment details using return Id and statusId = 'PAYMENT_REFUNDED'.
4. For Appeasements, we can fetch payment details using return Id and statusId = 'PAYMENT_REFUNDED'.
5. This way we can correctly fetch details for the scenario when the same order has a return and an appeasement.
---
 entity/OmsOrderViewEntities.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index 7ef2d67..6a8e13c 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -391,11 +391,20 @@ under the License.
 
     <!-- NOTE: Not added group attribute in the view entity definition as fix done in Moqui,
          TODO update all view entities to remove the use of group attribute as not needed now -->
+    <!-- The ReturnItemResponse entity is included in the view for handling below scenario,
+        1. The same order has a return and an appeasement.
+        2. The view should include ReturnItemResponse entity with join-optional true as for Sales,
+        this entity does not hold records, but it contains records for Returns and Appeasements.
+        2. Now for Sales Items, we can fetch payment details using order Id and statusId = 'PAYMENT_SETTLED'.
+        3. For Return Items, we can fetch payment details using return Id and statusId = 'PAYMENT_REFUNDED'.
+        4. For Appeasements, we can fetch payment details using return Id and statusId = 'PAYMENT_REFUNDED'.
+        5. This way we can correctly fetch details for the return and appeasement for the same order. -->
     <view-entity entity-name="OrderPaymentPreferenceAndType" package="co.hotwax.financial">
         <member-entity entity-alias="OPP" entity-name="org.apache.ofbiz.order.order.OrderPaymentPreference"/>
         <member-entity entity-alias="PMT" entity-name="org.apache.ofbiz.accounting.payment.PaymentMethodType" join-from-alias="OPP" join-optional="true">
             <key-map field-name="paymentMethodTypeId"/>
         </member-entity>
+        <member-entity entity-alias="RIR" entity-name="org.apache.ofbiz.order.return.ReturnItemResponse" join-from-alias="OPP" join-optional="true">
         <alias entity-alias="OPP" name="orderId"/>
         <alias entity-alias="OPP" name="statusId"/>
         <alias entity-alias="OPP" field="maxAmount" name="amount" />
@@ -403,6 +412,7 @@ under the License.
         <alias entity-alias="PMT" name="paymentMethodTypeId"/>
         <alias entity-alias="PMT" name="paymentMethodCode"/>
         <alias entity-alias="PMT" field="description" name="paymentMethodDescription"/>
+        <alias entity-alias="RIR" name="returnId"/>
     </view-entity>
 
     <!-- To get the Party and Person details -->

From c5b45d6d1388dba2d48cea143e70737f4afad521 Mon Sep 17 00:00:00 2001
From: Gurveen Bagga <gurveen.bagga@hotwax.co>
Date: Fri, 17 Feb 2023 13:01:39 +0530
Subject: [PATCH 2/2] Fixed typo in the member entity definition

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

diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index 6a8e13c..b68466c 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -405,6 +405,8 @@ under the License.
             <key-map field-name="paymentMethodTypeId"/>
         </member-entity>
         <member-entity entity-alias="RIR" entity-name="org.apache.ofbiz.order.return.ReturnItemResponse" join-from-alias="OPP" join-optional="true">
+            <key-map field-name="orderPaymentPreferenceId"/>
+        </member-entity>
         <alias entity-alias="OPP" name="orderId"/>
         <alias entity-alias="OPP" name="statusId"/>
         <alias entity-alias="OPP" field="maxAmount" name="amount" />