svn commit: r1743413 - in /ofbiz/branches/release15.12: ./ applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy

Author: jleroux
Date: Wed May 11 19:16:10 2016
New Revision: 1743413

URL: http://svn.apache.org/viewvc?rev=1743413&view=rev
Log:
"Applied fix from trunk for revision: 1743412"
------------------------------------------------------------------------
r1743412 | jleroux | 2016-05-11 21:13:44 +0200 (mer. 11 mai 2016) | 2 lignes

Partially revert r1743411, some files inadvertently slipped in :/
This keep changes for OFBIZ-7053
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
    ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 19:16:10 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412

Modified: ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1743413&r1=1743412&r2=1743413&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/branches/release15.12/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Wed May 11 19:16:10 2016
@@ -1305,6 +1305,7 @@ public class ShoppingCartEvents {
         String termValueStr = request.getParameter("termValue");
         String termDaysStr = request.getParameter("termDays");
         String textValue = request.getParameter("textValue");
+        String description = request.getParameter("description");
 
         GenericValue termType = null;
         Delegator delegator = (Delegator) request.getAttribute("delegator");
@@ -1349,7 +1350,7 @@ public class ShoppingCartEvents {
 
         removeOrderTerm(request, response);
 
-        cart.addOrderTerm(termTypeId, termValue, termDays, textValue);
+        cart.addOrderTerm(termTypeId, null, termValue, termDays, textValue, description);
 
         return "success";
     }

Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy?rev=1743413&r1=1743412&r2=1743413&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy (original)
+++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/OrderTerms.groovy Wed May 11 19:16:10 2016
@@ -41,6 +41,7 @@ if (request.getParameter('createNew') ==
                context.termValue = orderTerm.termValue;
                context.termDays = orderTerm.termDays;
                context.textValue = orderTerm.textValue;
+               context.description = orderTerm.description;
 
                context.termIndex = termIndexStr;
             }