Author: surajk
Date: Sat Dec 22 04:55:20 2018
New Revision: 1849514
URL: http://svn.apache.org/viewvc?rev=1849514&view=rev
Log:
Fixed: Incorrect PartyContactMechPurpose created while calling
createUpdateBillingAddress service.
(OFBIZ-10588)
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml?rev=1849514&r1=1849513&r2=1849514&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/minilang/order/OrderServices.xml
Sat Dec 22 04:55:20 2018
@@ -877,17 +877,17 @@ under the License.
</call-service>
</if-compare-field>
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpShipList" filter-by-date="true">
- <field-map field-name="partyId"
from-field="userLogin.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechId"
from-field="parameters.shipToContactMechId"/>
<field-map field-name="contactMechPurposeTypeId"
value="SHIPPING_LOCATION"/>
</entity-and>
<!-- If purpose is not exists then create -->
<if-empty field="pcmpShipList">
<set-service-fields
service-name="createPartyContactMechPurpose" map="parameters"
to-map="serviceContext"/>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpList" filter-by-date="true">
- <field-map field-name="partyId"
from-field="userLogin.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechPurposeTypeId"
value="SHIPPING_LOCATION"/>
</entity-and>
<iterate list="pcmpList" entry="pcmp">
@@ -895,7 +895,7 @@ under the License.
<call-service
service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/>
<clear-field field="serviceInMap"/>
</iterate>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<set field="serviceContext.contactMechId"
from-field="parameters.shipToContactMechId"/>
<set field="serviceContext.contactMechPurposeTypeId"
value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose"
in-map-name="serviceContext"/>
@@ -905,7 +905,7 @@ under the License.
<if-compare field="parameters.setDefaultShipping"
operator="equals" value="Y">
<set-service-fields service-name="setPartyProfileDefaults"
map="parameters" to-map="partyProfileDefaultsCtx"/>
<set field="partyProfileDefaultsCtx.defaultShipAddr"
from-field="parameters.shipToContactMechId"/>
- <set field="partyProfileDefaultsCtx.partyId"
from-field="userLogin.partyId"/>
+ <set field="partyProfileDefaultsCtx.partyId"
from-field="partyId"/>
<call-service service-name="setPartyProfileDefaults"
in-map-name="partyProfileDefaultsCtx"/>
</if-compare>
</if-compare>
@@ -919,7 +919,7 @@ under the License.
<if-compare-field field="oldValue" to-field="newValue"
operator="not-equals" type="Object">
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpList" filter-by-date="true">
<field-map field-name="contactMechId"
from-field="shipToAddressCtx.shipToContactMechId"/>
- <field-map field-name="partyId"
from-field="userLogin.partyId"/>
+ <field-map field-name="partyId"
from-field="partyId"/>
<field-map field-name="contactMechPurposeTypeId"
value="SHIPPING_LOCATION"/>
</entity-and>
<iterate list="pcmpList" entry="pcmp">
@@ -1013,7 +1013,7 @@ under the License.
<result-to-field result-name="contactMechId"
field="parameters.billToContactMechId"/>
</call-service>
<set-service-fields
service-name="createPartyContactMechPurpose" map="parameters"
to-map="serviceContext"/>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpList" filter-by-date="true">
<field-map field-name="partyId"
from-field="billToAddressCtx.partyId"/>
@@ -1024,7 +1024,7 @@ under the License.
<call-service
service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/>
<clear-field field="serviceInMap"/>
</iterate>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<set field="serviceContext.contactMechId"
from-field="parameters.billToContactMechId"/>
<set field="serviceContext.contactMechPurposeTypeId"
value="BILLING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose"
in-map-name="serviceContext"/>
@@ -1056,17 +1056,17 @@ under the License.
</if-compare-field>
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpBillList" filter-by-date="true">
- <field-map field-name="partyId"
from-field="userLogin.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechId"
from-field="parameters.billToContactMechId"/>
<field-map field-name="contactMechPurposeTypeId"
value="BILLING_LOCATION"/>
</entity-and>
<!-- If purpose is not exists then create -->
<if-empty field="pcmpBillList">
<set-service-fields
service-name="createPartyContactMechPurpose" map="parameters"
to-map="serviceContext"/>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<entity-and entity-name="PartyContactMechPurpose"
list="pcmpList" filter-by-date="true">
- <field-map field-name="partyId"
from-field="userLogin.partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
<field-map field-name="contactMechPurposeTypeId"
value="BILLING_LOCATION"/>
</entity-and>
<iterate list="pcmpList" entry="pcmp">
@@ -1074,7 +1074,7 @@ under the License.
<call-service
service-name="expirePartyContactMechPurpose" in-map-name="serviceInMap"/>
<clear-field field="serviceInMap"/>
</iterate>
- <set field="serviceContext.partyId"
from-field="userLogin.partyId"/>
+ <set field="serviceContext.partyId" from-field="partyId"/>
<set field="serviceContext.contactMechId"
from-field="parameters.billToContactMechId"/>
<set field="serviceContext.contactMechPurposeTypeId"
value="BILLING_LOCATION"/>
<call-service service-name="createPartyContactMechPurpose"
in-map-name="serviceContext"/>
@@ -1084,7 +1084,7 @@ under the License.
<if-compare field="parameters.setDefaultBilling"
operator="equals" value="Y">
<set-service-fields service-name="setPartyProfileDefaults"
map="parameters" to-map="partyProfileDefaultsCtx"/>
<set field="partyProfileDefaultsCtx.defaultBillAddr"
from-field="parameters.billToContactMechId"/>
- <set field="partyProfileDefaultsCtx.partyId"
from-field="userLogin.partyId"/>
+ <set field="partyProfileDefaultsCtx.partyId"
from-field="partyId"/>
<call-service service-name="setPartyProfileDefaults"
in-map-name="partyProfileDefaultsCtx"/>
</if-compare>
</else>
