svn commit: r1663203 - in /ofbiz/branches/release14.12: ./ applications/order/script/org/ofbiz/order/order/CheckoutServices.xml

Author: jleroux
Date: Mon Mar  2 08:21:01 2015
New Revision: 1663203

URL: http://svn.apache.org/r1663203
Log:
"Applied fix from trunk for revision: 1663202  "
------------------------------------------------------------------------
r1663202 | jleroux | 2015-03-02 09:18:39 +0100 (lun., 02 mars 2015) | 7 lines

A patch from  Deepak Dixit for "One page checkout broken for registered user" https://issues.apache.org/jira/browse/OFBIZ-6119

Onepage checkout process is broken for registered user.
Error in Service [createPartyRole]: Value found (with ids 10000::CUSTOMER), cannot create a new one


Its due to CheckoutServices.xml#createUpdateCustomerAndShippingAddress service, in this service if system try to create party role at line 54, as this service is used for create/update shipping address so at the time of create its working fine but at the time of update it fails to create same party role again.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  2 08:21:01 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202

Modified: ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=1663203&r1=1663202&r2=1663203&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original)
+++ ofbiz/branches/release14.12/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Mon Mar  2 08:21:01 2015
@@ -51,7 +51,13 @@ under the License.
         <set field="partyRoleCtx.roleTypeId" value="CUSTOMER"/>
         <set field="partyRoleCtx.userLogin" from-field="userLogin"/>
 
-        <call-service service-name="createPartyRole" in-map-name="partyRoleCtx"/>
+        <entity-one entity-name="PartyRole" value-field="partyRole">
+            <field-map field-name="partyId" from-field="partyRoleCtx.partyId"/>
+            <field-map field-name="roleTypeId" from-field="partyRoleCtx.roleTypeId"/>
+        </entity-one>
+        <if-empty field="partyRole">
+            <call-service service-name="createPartyRole" in-map-name="partyRoleCtx"/>
+        </if-empty>
 
         <!-- Create Update Shipping address -->
         <set-service-fields service-name="createUpdateShippingAddress" map="parameters" to-map="shipToAddressCtx"/>