svn commit: r1854458 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java

Author: jleroux
Date: Wed Feb 27 13:08:23 2019
New Revision: 1854458

URL: http://svn.apache.org/viewvc?rev=1854458&view=rev
Log:
"Applied fix from trunk for revision: 1854457"
------------------------------------------------------------------------
r1854457 | jleroux | 2019-02-27 14:01:59 +0100 (mer. 27 févr. 2019) | 9 lignes

Fixed: No userLogin given in calculateProductPrice service call context
(OFBIZ-10842)

The call context for calculateProductPrice doesn't contain the userLogin
This is needed in the customPriceCalcService
So currently there's no chance to get the user information in a custom price
calc service.

Thanks: Danny Trunk for the proposition (I changed the code myself)
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 27 13:08:23 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1854458&r1=1854457&r2=1854458&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java Wed Feb 27 13:08:23 2019
@@ -1118,6 +1118,15 @@ public class ShoppingCartItem implements
                 if (partyId != null) {
                     priceContext.put("partyId", partyId);
                 }
+                GenericValue userLogin= cart.getUserLogin();
+                if (userLogin != null) {
+                    priceContext.put("userLogin", userLogin);
+                }
+                GenericValue autoUserLogin= cart.getAutoUserLogin();
+                if (autoUserLogin != null) {
+                    priceContext.put("autoUserLogin", autoUserLogin);
+                }
+
                 // check alternative packaging
                 boolean isAlternativePacking = ProductWorker.isAlternativePacking(delegator, this.productId , this.getParentProductId());
                 BigDecimal pieces = BigDecimal.ONE;