svn commit: r1857606 - /ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java

[nmalin]

Author: nmalin
Date: Mon Apr 15 22:14:41 2019
New Revision: 1857606

URL: http://svn.apache.org/viewvc?rev=1857606&view=rev
Log:
Fixed: Backport Update an order linked to an other order lost relation applications/order/
(OFBIZ-10926)
When you edit an order linked to an other order like drop shipment process, shopping cart lost the connexion.
The problem came from ShoppingCart.makeAllOrderItemAssociations() function that prepared all generic value OrderItemAssoc without toOrderId.

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1857606&r1=1857605&r2=1857606&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java Mon Apr 15 22:14:41 2019
@@ -4122,6 +4122,7 @@ public class ShoppingCart implements Ite
                             orderItemAssociation.set("orderId", commitment.getString("orderId"));
                             orderItemAssociation.set("orderItemSeqId", commitment.getString("orderItemSeqId"));
                             orderItemAssociation.set("shipGroupSeqId", "_NA_");
+                            orderItemAssociation.set("toOrderId", this.getOrderId());
                             orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId());
                             orderItemAssociation.set("toShipGroupSeqId", "_NA_");
                             orderItemAssociation.set("orderItemAssocTypeId", "PURCHASE_ORDER");
@@ -4136,6 +4137,7 @@ public class ShoppingCart implements Ite
                     orderItemAssociation.set("orderId", item.getAssociatedOrderId());
                     orderItemAssociation.set("orderItemSeqId", item.getAssociatedOrderItemSeqId());
                     orderItemAssociation.set("shipGroupSeqId", csi.getAssociatedShipGroupSeqId() != null ? csi.getAssociatedShipGroupSeqId() : "_NA_");
+                    orderItemAssociation.set("toOrderId", this.getOrderId());
                     orderItemAssociation.set("toOrderItemSeqId", item.getOrderItemSeqId());
                     orderItemAssociation.set("toShipGroupSeqId", csi.getShipGroupSeqId() != null ? csi.getShipGroupSeqId() : "_NA_");
                     orderItemAssociation.set("orderItemAssocTypeId", item.getOrderItemAssocTypeId());