svn commit: r951254 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
Locked
svn commit: r951254 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
 
|
Author: apatel
Date: Fri Jun 4 03:42:47 2010 New Revision: 951254 URL: http://svn.apache.org/viewvc?rev=951254&view=rev Log: Applied fix from trunk for revision: 951251 Fix missing prefix for shipTo and billTo phone numbers. Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml ofbiz/branches/release10.04/applications/order/servicedef/services_checkout.xml ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 4 03:42:47 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951098 +/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951098,951251 Modified: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=951254&r1=951253&r2=951254&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original) +++ ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Fri Jun 4 03:42:47 2010 @@ -23,7 +23,7 @@ under the License. <simple-method method-name="createUpdateCustomerAndShippingAddress" short-description="Create/Update Customer, Shipping Address and other contact details." login-required="false"> <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml" - processor-name="phoneNumber" in-map-name="parameters" out-map-name="shipToPhoneCtx"/> + processor-name="shipToPhone" in-map-name="parameters" out-map-name="shipToPhoneCtx"/> <call-map-processor xml-resource="component://party/script/org/ofbiz/party/contact/PartyContactMechMapProcs.xml" processor-name="emailAddress" in-map-name="parameters" out-map-name="emailAddressCtx"/> <check-errors/> @@ -69,7 +69,7 @@ under the License. <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_SHIPPING"/> <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx"> <result-to-field result-name="contactMechId" field="shipToPhoneContactMechId"/> - <result-to-result result-name="contactMechId" service-result-name="phoneContactMechId"/> + <result-to-result result-name="contactMechId" service-result-name="shipToPhoneContactMechId"/> </call-service> <if-not-empty field="shipToPhoneContactMechId"> @@ -114,7 +114,7 @@ under the License. <simple-method method-name="createUpdateBillingAddressAndPaymentMethod" short-description="Create/update billing address and payment information" login-required="false"> <call-map-processor xml-resource="component://order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml" - processor-name="phoneNumber" in-map-name="parameters" out-map-name="billToPhoneContext"/> + processor-name="billToPhone" in-map-name="parameters" out-map-name="billToPhoneContext"/> <check-errors/> <set field="shoppingCart" from-field="parameters.shoppingCart"/> <call-object-method obj-field="shoppingCart" method-name="getUserLogin" ret-field="userLogin"/> @@ -162,7 +162,7 @@ under the License. <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_BILLING"/> <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx"> <result-to-field result-name="contactMechId" field="billToPhoneContactMechId"/> - <result-to-result result-name="contactMechId" service-result-name="phoneContactMechId"/> + <result-to-result result-name="contactMechId" service-result-name="billToPhoneContactMechId"/> </call-service> <if-not-empty field="billToPhoneContactMechId"> <call-object-method obj-field="shoppingCart" method-name="addContactMech"> Modified: ofbiz/branches/release10.04/applications/order/servicedef/services_checkout.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/servicedef/services_checkout.xml?rev=951254&r1=951253&r2=951254&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/servicedef/services_checkout.xml (original) +++ ofbiz/branches/release10.04/applications/order/servicedef/services_checkout.xml Fri Jun 4 03:42:47 2010 @@ -28,13 +28,13 @@ under the License. <attribute name="lastName" type="String" mode="IN" optional="true"/> <attribute name="userLogin" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> <attribute name="emailAddress" type="String" mode="IN" optional="false"/> - <attribute name="countryCode" type="String" mode="IN" optional="true"/> - <attribute name="areaCode" type="String" mode="IN" optional="true"/> - <attribute name="contactNumber" type="String" mode="IN" optional="true"/> - <attribute name="extension" type="String" mode="IN" optional="true"/> + <attribute name="shipToCountryCode" type="String" mode="IN" optional="true"/> + <attribute name="shipToAreaCode" type="String" mode="IN" optional="true"/> + <attribute name="shipToContactNumber" type="String" mode="IN" optional="true"/> + <attribute name="shipToExtension" type="String" mode="IN" optional="true"/> <attribute name="emailContactMechId" mode="INOUT" type="String" optional="true"/> <attribute name="partyId" type="String" mode="INOUT" optional="true"/> - <attribute name="phoneContactMechId" type="String" mode="INOUT" optional="true"/> + <attribute name="shipToPhoneContactMechId" type="String" mode="INOUT" optional="true"/> </service> <service name="createUpdateBillingAddressAndPaymentMethod" engine="simple" location="component://order/script/org/ofbiz/order/order/CheckoutServices.xml" auth="false" invoke="createUpdateBillingAddressAndPaymentMethod"> @@ -42,13 +42,13 @@ under the License. <implements service="createUpdateCreditCard"/> <attribute name="shoppingCart" type="org.ofbiz.order.shoppingcart.ShoppingCart" mode="IN" optional="false"/> <attribute name="userLogin" type="org.ofbiz.entity.GenericValue" mode="IN" optional="true"/> - <attribute name="countryCode" type="String" mode="IN" optional="true"/> - <attribute name="areaCode" type="String" mode="IN" optional="true"/> - <attribute name="contactNumber" type="String" mode="IN" optional="true"/> - <attribute name="extension" type="String" mode="IN" optional="true"/> - <attribute name="cardSecurityCode" type="String" mode="IN" optional="true"/> + <attribute name="billToCountryCode" type="String" mode="IN" optional="true"/> + <attribute name="billToAreaCode" type="String" mode="IN" optional="true"/> + <attribute name="billToContactNumber" type="String" mode="IN" optional="true"/> + <attribute name="billToExtension" type="String" mode="IN" optional="true"/> + <attribute name="billToCardSecurityCode" type="String" mode="IN" optional="true"/> <attribute name="partyId" type="String" mode="INOUT" optional="true"/> - <attribute name="phoneContactMechId" mode="INOUT" type="String" optional="true"/> + <attribute name="billToPhoneContactMechId" mode="INOUT" type="String" optional="true"/> </service> <service name="setAnonUserLogin" engine="simple" location="component://order/script/org/ofbiz/order/order/CheckoutServices.xml" auth="false" invoke="setAnonUserLogin"> Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=951254&r1=951253&r2=951254&view=diff ============================================================================== --- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original) +++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Fri Jun 4 03:42:47 2010 @@ -258,46 +258,46 @@ under the License. <label for="shipToCountryCode">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> - + <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> - </span> <span> <label for="shipToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="extension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="3" /> + <input type="text" name="shipToExtension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="3" /> </span> <#else> <span> <label for="shipToCountryCode">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${parameters.shipToAreaCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> - + <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${parameters.shipToContactNumber?if_exists}" size="10" maxlength="7" /> - </span> <span> <label for="shipToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="extension" id="shipToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" /> + <input type="text" name="shipToExtension" id="shipToExtension" value="${parameters.shipToExtension?if_exists}" size="5" maxlength="3" /> </span> </#if> </div> @@ -481,46 +481,46 @@ under the License. <label for="billToCountryCode">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> - + <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> - </span> <span> <label for="billToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="extension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="3" /> + <input type="text" name="billToExtension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="3" /> </span> <#else> <span> <label for="billToCountryCode">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="billToAreaCode">${uiLabelMap.PartyAreaCode}* <span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> - + <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${parameters.billToAreaCode?if_exists}" size="5" maxlength="3" /> - </span> <span> <label for="billToContactNumber">${uiLabelMap.PartyContactNumber}* <span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span> </label> - <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> - + <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${parameters.billToContactNumber?if_exists}" size="10" maxlength="7" /> - </span> <span> <label for="billToExtension">${uiLabelMap.PartyExtension}</label> - <input type="text" name="extension" id="billToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" /> + <input type="text" name="billToExtension" id="billToExtension" value="${parameters.billToExtension?if_exists}" size="5" maxlength="3" /> </span> </#if> </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |