You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/06/16 15:18:03 UTC
svn commit: r785202 - in /ofbiz/trunk:
applications/party/script/org/ofbiz/party/contact/
applications/party/script/org/ofbiz/party/party/
applications/party/servicedef/
specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/
Author: ashish
Date: Tue Jun 16 13:18:02 2009
New Revision: 785202
URL: http://svn.apache.org/viewvc?rev=785202&view=rev
Log:
Applied patch from jira issue OFBIZ-2557 (Collect PartyContactMech services to PartyContactMechServices.xml file).
Thanks Jyotsna for your contribution.
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/servicedef/services.xml
ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml?rev=785202&r1=785201&r2=785202&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/PartyContactMechServices.xml Tue Jun 16 13:18:02 2009
@@ -561,4 +561,22 @@
<field-to-result field="contactMech.infoString" result-name="emailAddress"/>
<field-to-result field="contactMechId"/>
</simple-method>
+
+ <simple-method method-name="createUpdatePartyTelecomNumber" short-description="Create and update phone number" login-required="false">
+ <if-empty field="parameters.contactMechId">
+ <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
+ <call-service service-name="createPartyTelecomNumber" in-map-name="phoneContext">
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
+ </call-service>
+ <log level="info" message="Phone Contact created phoneContactMechId is ${contactMechId}"/>
+ <else>
+ <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
+ <call-service service-name="updatePartyTelecomNumber" in-map-name="phoneContext">
+ <result-to-field result-name="contactMechId" field="contactMechId"/>
+ </call-service>
+ <log level="info" message="Phone Contact updated phoneContactMechId is ${contactMechId}"/>
+ </else>
+ </if-empty>
+ <field-to-result field="contactMechId"/>
+ </simple-method>
</simple-methods>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=785202&r1=785201&r2=785202&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Tue Jun 16 13:18:02 2009
@@ -959,22 +959,4 @@
</if-empty>
<field-to-result field="partyId"/>
</simple-method>
-
- <simple-method method-name="createUpdateTelecomNumber" short-description="Create and update phone number" login-required="false">
- <if-empty field="parameters.contactMechId">
- <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
- <call-service service-name="createPartyTelecomNumber" in-map-name="phoneContext">
- <result-to-field result-name="contactMechId" field="contactMechId"/>
- </call-service>
- <log level="info" message="Phone Contact created phoneContactMechId is ${contactMechId}"/>
- <else>
- <set-service-fields service-name="createPartyTelecomNumber" map="parameters" to-map="phoneContext"/>
- <call-service service-name="updatePartyTelecomNumber" in-map-name="phoneContext">
- <result-to-field result-name="contactMechId" field="contactMechId"/>
- </call-service>
- <log level="info" message="Phone Contact updated phoneContactMechId is ${contactMechId}"/>
- </else>
- </if-empty>
- <field-to-result field="contactMechId"/>
- </simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=785202&r1=785201&r2=785202&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Tue Jun 16 13:18:02 2009
@@ -1168,8 +1168,8 @@
<override name="firstName" optional="false"/>
<override name="lastName" optional="false"/>
</service>
- <service name="createUpdateTelecomNumber" engine="simple"
- location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createUpdateTelecomNumber" auth="false">
+ <service name="createUpdatePartyTelecomNumber" engine="simple"
+ location="component://party/script/org/ofbiz/party/contact/PartyContactMechServices.xml" invoke="createUpdatePartyTelecomNumber" auth="false">
<description>Create and Update telecom number</description>
<attribute name="partyId" type="String" mode="IN" optional="false"/>
<auto-attributes entity-name="PartyContactMech" include="all" mode="IN" optional="true"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=785202&r1=785201&r2=785202&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Jun 16 13:18:02 2009
@@ -903,13 +903,13 @@
processor-name="phoneNumber" in-map-name="parameters" out-map-name="shipToPhoneContext"/>
<check-errors/>
- <set-service-fields service-name="createUpdateTelecomNumber" map="shipToPhoneContext" to-map="createUpdateTelecomNumberCtx"/>
- <set field="createUpdateTelecomNumberCtx.contactMechId" from-field="parameters.shipToPhoneContactMechId"/>
- <set field="createUpdateTelecomNumberCtx.userLogin" from-field="userLogin"/>
- <set field="createUpdateTelecomNumberCtx.partyId" from-field="parameters.partyId"/>
- <set field="createUpdateTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
- <set field="createUpdateTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
- <call-service service-name="createUpdateTelecomNumber" in-map-name="createUpdateTelecomNumberCtx">
+ <set-service-fields service-name="createUpdatePartyTelecomNumber" map="shipToPhoneContext" to-map="createUpdatePartyTelecomNumberCtx"/>
+ <set field="createUpdatePartyTelecomNumberCtx.contactMechId" from-field="parameters.shipToPhoneContactMechId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.userLogin" from-field="userLogin"/>
+ <set field="createUpdatePartyTelecomNumberCtx.partyId" from-field="parameters.partyId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
+ <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx">
<result-to-field result-name="contactMechId" field="parameters.shipToPhoneContactMechId"/>
</call-service>
<field-to-request field="parameters.shipToPhoneContactMechId" request-name="shipToPhoneContactMechId"/>
@@ -1206,13 +1206,13 @@
processor-name="phoneNumber" in-map-name="parameters" out-map-name="billToPhoneContext"/>
<check-errors/>
- <set-service-fields service-name="createUpdateTelecomNumber" map="billToPhoneContext" to-map="createUpdateTelecomNumberCtx"/>
- <set field="createUpdateTelecomNumberCtx.contactMechId" from-field="parameters.billToPhoneContactMechId"/>
- <set field="createUpdateTelecomNumberCtx.userLogin" from-field="userLogin"/>
- <set field="createUpdateTelecomNumberCtx.partyId" from-field="parameters.partyId"/>
- <set field="createUpdateTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
- <set field="createUpdateTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
- <call-service service-name="createUpdateTelecomNumber" in-map-name="createUpdateTelecomNumberCtx">
+ <set-service-fields service-name="createUpdatePartyTelecomNumber" map="billToPhoneContext" to-map="createUpdatePartyTelecomNumberCtx"/>
+ <set field="createUpdatePartyTelecomNumberCtx.contactMechId" from-field="parameters.billToPhoneContactMechId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.userLogin" from-field="userLogin"/>
+ <set field="createUpdatePartyTelecomNumberCtx.partyId" from-field="parameters.partyId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
+ <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
+ <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx">
<result-to-field result-name="contactMechId" field="parameters.billToPhoneContactMechId"/>
</call-service>
<field-to-request field="parameters.billToPhoneContactMechId" request-name="billToPhoneContactMechId"/>