This is an automated email from the ASF dual-hosted git repository.
arunpati pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new ee3a7627d8 Fixed issue in reCreateOrderAdjustment service on adding
promo item after cancel order item request. (#1137)
ee3a7627d8 is described below
commit ee3a7627d8079c4531a4c6ad579b378e22f7fb6e
Author: Arun Patidar <[email protected]>
AuthorDate: Tue Apr 28 18:07:37 2026 +0530
Fixed issue in reCreateOrderAdjustment service on adding promo item after
cancel order item request. (#1137)
Fixed: After cancelling it was creating only orderItem record while we
need to map that item with orderItemShipGroup using ship group assocs.
So added support to create ship group assoc whenever it creats new item
due to promotion.[OFBIZ-12104]
(OFBIZ-12104)
Thanks: Rashi Dhagat for reporting the issue and providing details.
---
.../order/minilang/order/OrderServices.xml | 27 +++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/applications/order/minilang/order/OrderServices.xml
b/applications/order/minilang/order/OrderServices.xml
index f24b297dc9..f3d4deae7d 100644
--- a/applications/order/minilang/order/OrderServices.xml
+++ b/applications/order/minilang/order/OrderServices.xml
@@ -384,10 +384,35 @@ under the License.
<set field="newOrderItem.isModifiedPrice" value="N"/>
<set field="newOrderItem.isPromo" value="Y"/>
<if-empty field="newOrderItem.statusId">
- <set field="newOrderItem.statusId" value="ITEM_CREATED"/>
+ <if-compare field="order.statusId" operator="equals"
value="ORDER_APPROVED">
+ <set field="newOrderItem.statusId"
value="ITEM_APPROVED"/>
+ <else>
+ <set field="newOrderItem.statusId"
value="ITEM_CREATED"/>
+ </else>
+ </if-compare>
</if-empty>
<make-next-seq-id value-field="newOrderItem"
seq-field-name="orderItemSeqId"/>
<create-value value-field="newOrderItem"/>
+
+ <!-- create the OrderItemShipGroupAssoc -->
+ <call-object-method obj-field="cart"
method-name="getItemIndex" ret-field="itemIndex">
+ <field field="item"
type="org.apache.ofbiz.order.shoppingcart.ShoppingCartItem"/>
+ </call-object-method>
+ <call-object-method obj-field="cart"
method-name="getItemShipGroupIndex" ret-field="shipGroupIndex">
+ <field field="itemIndex" type="int"/>
+ </call-object-method>
+ <call-object-method obj-field="cart" method-name="getShipInfo"
ret-field="csi">
+ <field field="shipGroupIndex" type="int"/>
+ </call-object-method>
+ <call-object-method obj-field="csi"
method-name="getShipGroupSeqId" ret-field="shipGroupSeqId"/>
+
+ <make-value entity-name="OrderItemShipGroupAssoc"
value-field="newOisga"/>
+ <set field="newOisga.orderId" from-field="parameters.orderId"/>
+ <set field="newOisga.orderItemSeqId"
from-field="newOrderItem.orderItemSeqId"/>
+ <set field="newOisga.shipGroupSeqId"
from-field="shipGroupSeqId"/>
+ <set field="newOisga.quantity"
from-field="newOrderItem.quantity"/>
+ <create-value value-field="newOisga"/>
+
<!-- and the orderItemSeqId is assigned to the shopping cart
item-->
<call-object-method obj-field="item"
method-name="setOrderItemSeqId">
<field field="newOrderItem.orderItemSeqId" type="String"/>
