svn commit: r729636 [3/5] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/script/org/ofbiz/eco
Locked
svn commit: r729636 [3/5] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/script/org/ofbiz/eco
 
|
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml Sat Dec 27 07:16:04 2008 @@ -25,13 +25,13 @@ <process field="firstName"> <copy/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyFirstNameMissing"/> + <fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/> </not-empty> </process> <process field="lastName"> <copy/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyLastNameMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/> </not-empty> </process> </simple-map-processor> @@ -43,19 +43,19 @@ <process field="countryCode"> <copy/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCountryCodeMissing"/> + <fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/> </not-empty> </process> <process field="areaCode"> <copy/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAreaCodeMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyAreaCodeMissingError"/> </not-empty> </process> <process field="contactNumber"> <copy/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactTelephoneMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyContactTelephoneMissingError"/> </not-empty> </process> <process field="extension"> @@ -69,10 +69,10 @@ </process> <process field="emailAddress"> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyEmailAddressMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressMissingError"/> </not-empty> <validate-method method="isEmail"> - <fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/> </validate-method> <copy/> </process> @@ -91,7 +91,7 @@ <process field="shipToAddress1"> <copy to-field="address1"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/> + <fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/> </not-empty> </process> <process field="shipToAddress2"> @@ -100,25 +100,25 @@ <process field="shipToCity"> <copy to-field="city"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/> + <fail-property resource="PartyUiLabels" property="PartyCityMissing"/> </not-empty> </process> <process field="shipToStateProvinceGeoId"> <copy to-field="stateProvinceGeoId"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyStateMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyStateMissingError"/> </not-empty> </process> <process field="shipToPostalCode"> <copy to-field="postalCode"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyPostalInformationNotFound"/> + <fail-property resource="PartyUiLabels" property="PartyPostalInformationNotFound"/> </not-empty> </process> <process field="shipToCountryGeoId"> <copy to-field="countryGeoId"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCountryMissing"/> + <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/> </not-empty> </process> </simple-map-processor> @@ -136,7 +136,7 @@ <process field="billToAddress1"> <copy to-field="address1"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/> + <fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/> </not-empty> </process> <process field="billToAddress2"> @@ -145,25 +145,25 @@ <process field="billToCity"> <copy to-field="city"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/> + <fail-property resource="PartyUiLabels" property="PartyCityMissing"/> </not-empty> </process> <process field="billToStateProvinceGeoId"> <copy to-field="stateProvinceGeoId"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyStateMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyStateMissingError"/> </not-empty> </process> <process field="billToPostalCode"> <copy to-field="postalCode"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyPostalInformationNotFound"/> + <fail-property resource="PartyUiLabels" property="PartyPostalInformationNotFound"/> </not-empty> </process> <process field="billToCountryGeoId"> <copy to-field="countryGeoId"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCountryMissing"/> + <fail-property resource="PartyUiLabels" property="PartyCountryMissing"/> </not-empty> </process> </simple-map-processor> @@ -171,15 +171,15 @@ <simple-map-processor name="shipToPhone"> <process field="shipToCountryCode"> <copy to-field="countryCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCountryCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty> </process> <process field="shipToAreaCode"> <copy to-field="areaCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyAreaCodeMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyAreaCodeMissingError"/></not-empty> </process> <process field="shipToContactNumber"> <copy to-field="contactNumber"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> </process> <process field="shipToExtension"><copy to-field="extension"/></process> </simple-map-processor> @@ -187,15 +187,15 @@ <simple-map-processor name="billToPhone"> <process field="billToCountryCode"> <copy to-field="countryCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCountryCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryCodeMissing"/></not-empty> </process> <process field="billToAreaCode"> <copy to-field="areaCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyAreaCodeMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyAreaCodeMissingError"/></not-empty> </process> <process field="billToContactNumber"> <copy to-field="contactNumber"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> </process> <process field="billToExtension"><copy to-field="extension"/></process> </simple-map-processor> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sat Dec 27 07:16:04 2008 @@ -63,10 +63,10 @@ <!-- Create the UserLogin Record --> <call-map-processor in-map-name="parameters" out-map-name="userLoginContext"> <simple-map-processor name="newUserLogin"> - <process field="USERNAME"><copy to-field="userLoginId"/><not-empty><fail-property resource="EcommerceUiLabels" property="PartyUserLoginMissingError"/></not-empty></process> - <process field="PASSWORD"><copy to-field="currentPassword"/><not-empty><fail-property resource="EcommerceUiLabels" property="PartyPasswordMissing"/></not-empty></process> + <process field="USERNAME"><copy to-field="userLoginId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyUserLoginMissingError"/></not-empty></process> + <process field="PASSWORD"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process> <process field="CONFIRM_PASSWORD"> - <compare-field operator="equals" field="PASSWORD"><fail-property resource="EcommerceUiLabels" property="PartyPasswordMatchError"/></compare-field> + <compare-field operator="equals" field="PASSWORD"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field> <!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-message message="You must enter your password twice"/></not-empty> --> <copy to-field="currentPasswordVerify"/> </process> @@ -99,17 +99,17 @@ <simple-map-processor name="newPerson"> <process field="USER_FIRST_NAME"> <copy to-field="firstName"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyFirstNameMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/></not-empty> </process> <process field="USER_MIDDLE_NAME"><copy to-field="middleName"/></process> <process field="USER_LAST_NAME"> <copy to-field="lastName"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyLastNameMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/></not-empty> </process> <process field="USER_TITLE"><copy to-field="personalTitle"/></process> <process field="USER_SUFFIX"><copy to-field="suffix"/></process> <process field="USER_BIRTHDATE"> - <convert type="Date" to-field="birthDate"><fail-property resource="EcommerceUiLabels" property="PartyBirthDateMissingError"/></convert> + <convert type="Date" to-field="birthDate"><fail-property resource="PartyUiLabels" property="PartyBirthDateMissingError"/></convert> </process> <process field="USER_GENDER"><copy to-field="gender"/></process> </simple-map-processor> @@ -135,33 +135,35 @@ <process field="fullName"><copy to-field="toName"/></process> <process field="CUSTOMER_ADDRESS1"> <copy to-field="address1"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/></not-empty> </process> <process field="CUSTOMER_ADDRESS2"><copy to-field="address2"/></process> <process field="CUSTOMER_CITY"> <copy to-field="city"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty> </process> <process field="CUSTOMER_STATE"><copy to-field="stateProvinceGeoId"/></process> <process field="CUSTOMER_POSTAL_CODE"> <copy to-field="postalCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyZipCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyZipCodeMissing"/></not-empty> </process> <process field="CUSTOMER_COUNTRY"> <copy to-field="countryGeoId"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCountryMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty> </process> <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> </call-map-processor> <if-compare value="USA" operator="equals" field="parameters.CUSTOMER_COUNTRY"> <if-empty field="parameters.CUSTOMER_STATE"> - <string-to-list string="State is missing, and is required for an address in the United States." message-field-name="CUSTOMER_STATE" list-name="error_list"/> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/> + <string-to-list string="${tempErrorMessage}" message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> <if-compare value="CAN" operator="equals" field="parameters.CUSTOMER_COUNTRY"> <if-empty field="parameters.CUSTOMER_STATE"> - <string-to-list string="State is missing, and is required for an address in the Canada." message-field-name="CUSTOMER_STATE" list-name="error_list"/> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/> + <string-to-list string="${tempErrorMessage}" message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> </else> @@ -232,7 +234,7 @@ <simple-map-processor name="checkRequiredPhone"> <process field="REQUIRED_PHONE"> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> + <fail-property resource="PartyUiLabels" property="PartyContactTelephoneMissingError"/></not-empty> </process> </simple-map-processor> </call-map-processor> @@ -250,8 +252,8 @@ <process field="roleTypeId"><copy/></process> <process field="CUSTOMER_EMAIL"> <copy to-field="emailAddress"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressMissingError"/></not-empty> - <validate-method method="isEmail"><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> + <not-empty><fail-property resource="PartyUiLabels" property="PartyEmailAddressMissingError"/></not-empty> + <validate-method method="isEmail"><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> </process> <process field="CUSTOMER_EMAIL_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -262,7 +264,7 @@ <process field="roleTypeId"><copy/></process> <process field="CUSTOMER_EMAIL"> <copy to-field="emailAddress"/> - <validate-method method="isEmail"><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> + <validate-method method="isEmail"><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> </process> <process field="CUSTOMER_EMAIL_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -513,16 +515,16 @@ <process field="personalTitle"><copy/></process> <process field="firstName"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyFirstNameMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/></not-empty> </process> <process field="middleName"><copy/></process> <process field="lastName"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyLastNameMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/></not-empty> </process> <process field="suffix"><copy/></process> <process field="birthDate"> - <convert type="Date" to-field="birthDate"><fail-property resource="EcommerceUiLabels" property="PartyBirthDateMissingError"/></convert> + <convert type="Date" to-field="birthDate"><fail-property resource="PartyUiLabels" property="PartyBirthDateMissingError"/></convert> </process> <process field="gender"><copy/></process> @@ -541,8 +543,8 @@ <simple-map-processor name="newEmail"> <process field="emailAddress"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressMissingError"/></not-empty> - <validate-method method="isEmail"><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> + <not-empty><fail-property resource="PartyUiLabels" property="PartyEmailAddressMissingError"/></not-empty> + <validate-method method="isEmail"><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> </process> <process field="emailSol"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -713,24 +715,24 @@ <process field="attnName"><copy/></process> <process field="address1"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/></not-empty> </process> <process field="address2"><copy/></process> <process field="city"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty> </process> <process field="stateProvinceGeoId"><copy/></process> <process field="postalCode"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyZipCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyZipCodeMissing"/></not-empty> </process> <process field="countyGeoId"> <copy/> </process> <process field="countryGeoId"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCountryMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty> </process> <process field="allowSolicitation"><copy/></process> <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-message message="Years at address not a valid number: ${parameters.yearsAtAddress}"/></convert></process> @@ -739,12 +741,14 @@ </call-map-processor> <if-compare value="USA" operator="equals" field="parameters.countryGeoId"> <if-empty field="parameters.stateProvinceGeoId"> - <string-to-list string="State is missing, and is required for an address in the United States." message-field-name="CUSTOMER_STATE" list-name="error_list"/> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/> + <string-to-list string="${tempErrorMessage}" message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> <if-compare value="CAN" operator="equals" field="parameters.countryGeoId"> <if-empty field="parameters.stateProvinceGeoId"> - <string-to-list string="State is missing, and is required for an address in the Canada." message-field-name="CUSTOMER_STATE" list-name="error_list"/> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/> + <string-to-list string="${tempErrorMessage}" message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> <check-errors/> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Sat Dec 27 07:16:04 2008 @@ -233,13 +233,13 @@ </call-map-processor> <if-compare value="USA" operator="equals" field="parameters.shipToCountryGeoId"> <if-empty field="parameters.shipToStateProvinceGeoId"> - <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." /> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> <if-compare value="CAN" operator="equals" field="parameters.shipToCountryGeoId"> <if-empty field="parameters.shipToStateProvinceGeoId"> - <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." /> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> @@ -267,13 +267,13 @@ </call-map-processor> <if-compare value="USA" operator="equals" field="parameters.billToCountryGeoId"> <if-empty field="parameters.billToStateProvinceGeoId"> - <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." /> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInUsMissing"/> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> <if-compare value="CAN" operator="equals" field="parameters.billToCountryGeoId"> <if-empty field="parameters.billToStateProvinceGeoId"> - <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." /> + <property-to-field field-name="tempErrorMessage" resource="PartyUiLabels" property="PartyStateInCanadaMissing"/> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml Sat Dec 27 07:16:04 2008 @@ -22,26 +22,26 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-map-processor name="newAffilParty"> <process field="AFFILIATE_ID"><copy to-field="partyId"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAffiliateCodeMissingError"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyAffiliateCodeMissingError"/></not-empty></process> </simple-map-processor> <simple-map-processor name="newAffilGroup"> <process field="COMPANY_NAME"><copy to-field="groupName"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCompanyNameMissingError"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyCompanyNameMissingError"/></not-empty></process> </simple-map-processor> <simple-map-processor name="newAffilPostal"> <process field="COMPANY_NAME"><copy to-field="toName"/></process> <process field="COMPANY_ATTN"><copy to-field="attnName"/></process> <process field="COMPANY_ADDRESS1"><copy to-field="address1"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/></not-empty></process> <process field="COMPANY_ADDRESS2"><copy to-field="address2"/></process> <process field="COMPANY_CITY"><copy to-field="city"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process> <process field="COMPANY_STATE"><copy to-field="stateProvinceGeoId"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyProvinceMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyProvinceMissing"/></not-empty></process> <process field="COMPANY_POSTAL_CODE"><copy to-field="postalCode"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyZipCodeMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyZipCodeMissing"/></not-empty></process> <process field="COMPANY_COUNTRY"><copy to-field="countryGeoId"/></process> <process field="COMPANY_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -49,22 +49,22 @@ <simple-map-processor name="newAffilPostalPurpose"> <make-in-string field="contactMechPurposeTypeId"><constant>BILLING_LOCATION</constant></make-in-string> <process field="contactMechId"><copy/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> <process field="contactMechPurposeTypeId"><copy/></process> </simple-map-processor> <simple-map-processor name="newAffilContact"> <process field="CONTACT_FIRST_NAME"><copy to-field="firstName"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyFirstNameMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/></not-empty></process> <process field="CONTACT_LAST_NAME"><copy to-field="lastName"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyLastNameMissingError"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/></not-empty></process> </simple-map-processor> <simple-map-processor name="newAffilPhone"> <process field="COMPANY_WORK_COUNTRY"><copy to-field="countryCode"/></process> <process field="COMPANY_WORK_AREA"><copy to-field="areaCode"/></process> <process field="COMPANY_WORK_CONTACT"><copy to-field="contactNumber"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactNumberMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyContactNumberMissing"/></not-empty></process> <process field="COMPANY_WORK_EXT"><copy to-field="extension"/></process> <process field="COMPANY_WORK_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -72,7 +72,7 @@ <simple-map-processor name="newAffilPhonePurpose"> <make-in-string field="contactMechPurposeTypeId"><constant>PHONE_WORK</constant></make-in-string> <process field="contactMechId"><copy/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> <process field="contactMechPurposeTypeId"><copy/></process> </simple-map-processor> @@ -93,10 +93,10 @@ <process field="COMPANY_EMAIL"> <copy to-field="emailAddress"/> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyEmailAddressMissingError"/> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressMissingError"/> </not-empty> <validate-method method="isEmail"> - <fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/> </validate-method> </process> <process field="COMPANY_EMAIL_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> @@ -105,7 +105,7 @@ <simple-map-processor name="newAffilEmailPurpose"> <make-in-string field="contactMechPurposeTypeId"><constant>PRIMARY_EMAIL</constant></make-in-string> <process field="contactMechId"><copy/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process> <process field="contactMechPurposeTypeId"><copy/></process> </simple-map-processor> @@ -113,28 +113,28 @@ <make-in-string field="contactMechTypeId"><constant>WEB_ADDRESS</constant></make-in-string> <make-in-string field="allowSolicitation"><constant>Y</constant></make-in-string> <process field="SITE_URL"><copy to-field="infoString"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartySiteURLMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartySiteURLMissing"/></not-empty></process> <process field="contactMechTypeId"><copy/></process> <process field="allowSolicitation"><copy/></process> </simple-map-processor> <simple-map-processor name="newAffil"> <process field="SITE_NAME"><copy to-field="affiliateName"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAffiliateNameMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyAffiliateNameMissing"/></not-empty></process> <process field="SITE_DESCRIPTION"><copy to-field="affiliateDescription"/></process> </simple-map-processor> <simple-map-processor name="newAffilUser"> <process field="AFFILIATE_ID"><copy to-field="userLoginId"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyAffiliateCodeMissingError"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyAffiliateCodeMissingError"/></not-empty></process> <process field="PASSWORD"><copy to-field="currentPassword"/><not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyPasswordMissing"/></not-empty></process> + <fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process> <process field="CONFIRM_PASSWORD"> <compare-field operator="equals" field="PASSWORD"> - <fail-property resource="EcommerceUiLabels" property="PartyPasswordMatchError"/> + <fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/> </compare-field> <not-empty> - <fail-property resource="EcommerceUiLabels" property="PartyEnterPasswordTwice"/> + <fail-property resource="PartyUiLabels" property="PartyEnterPasswordTwice"/> </not-empty> <copy to-field="currentPasswordVerify"/> </process> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Sat Dec 27 07:16:04 2008 @@ -356,7 +356,7 @@ <div class="form-row"> <div class="form-label">${uiLabelMap.CommonPassword}</div> <div class="form-field"> - ${uiLabelMap.PartyRecievePasswordByEmail}. + ${uiLabelMap.PartyReceivePasswordByEmail}. </div> </div> </#if> Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Dec 27 07:16:04 2008 @@ -17,7 +17,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +--> +<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="AddedItemToOrder"> <value xml:lang="en">Added item to order: </value> <value xml:lang="es">Ãtem añadido al pedido:</value> @@ -10306,150 +10307,6 @@ <value xml:lang="th">à¹à¸ªà¸à¸à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value> <value xml:lang="zh">æµè§è¯·æ±</value> </property> - <property key="PartyAdditionalPartyEntry"> - <value xml:lang="de">Zusätzlicher Akteureintrag</value> - <value xml:lang="en">Additional Party Entry</value> - <value xml:lang="es">Entrada adicional de participante</value> - <value xml:lang="fr">Ajout d'un acteur supplémentaire</value> - <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸²à¸£à¸à¸£à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyBusinessPhone"> - <value xml:lang="de">Telefon, geschäftlich</value> - <value xml:lang="en">Business Phone</value> - <value xml:lang="es">Teléfono de trabajo</value> - <value xml:lang="fr">N° de tél. de bureau</value> - <value xml:lang="th">หมายà¹à¸¥à¸à¹à¸à¸à¸£à¹à¹à¸à¸£à¸¨à¸±à¸à¸à¹à¸à¸à¸à¸à¸£à¸´à¸©à¸±à¸</value> - </property> - <property key="PartyEmailAddress"> - <value xml:lang="de">E-Mailadresse</value> - <value xml:lang="en">Email Address</value> - <value xml:lang="es">Dirección de email</value> - <value xml:lang="fr">Addresse courriel</value> - <value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¸¡à¸¥</value> - </property> - <property key="PartyFindParty"> - <value xml:lang="de">Akteur finden</value> - <value xml:lang="en">Find Party</value> - <value xml:lang="es">Buscar participante</value> - <value xml:lang="fr">Chercher un acteur</value> - <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyFirstName"> - <value xml:lang="de">Vorname</value> - <value xml:lang="en">FirstName</value> - <value xml:lang="es">Nombre</value> - <value xml:lang="fr">Prénom</value> - <value xml:lang="th">à¸à¸·à¹à¸</value> - </property> - <property key="PartyHomePhone"> - <value xml:lang="de">Telefon, privat</value> - <value xml:lang="en">HomePhone</value> - <value xml:lang="es">Teléfono privado</value> - <value xml:lang="fr">n° de tél. du domicile</value> - <value xml:lang="th">à¹à¸à¸à¸£à¹à¹à¸à¸£à¸¨à¸±à¸à¸à¹à¸à¹à¸²à¸</value> - </property> - <property key="PartyLastName"> - <value xml:lang="de">Nachname</value> - <value xml:lang="en">LastName</value> - <value xml:lang="es">Apellido</value> - <value xml:lang="fr">Nom de famille</value> - <value xml:lang="th">à¸à¸²à¸¡à¸ªà¸à¸¸à¸¥</value> - </property> - <property key="PartyLookupParty"> - <value xml:lang="de">Akteur ansehen</value> - <value xml:lang="en">Lookup Party</value> - <value xml:lang="es">Buscar participante(s)</value> - <value xml:lang="fr">Consulter l'acteur</value> - <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyMiddleInitial"> - <value xml:lang="de">Zweiter Name</value> - <value xml:lang="en">Middle Initial</value> - <value xml:lang="es">Inicial del segundo nombre</value> - <value xml:lang="fr">Initiale(s) intermédiaire(s)</value> - <value xml:lang="th">Middle Initial</value> - </property> - <property key="PartyNoSupplier"> - <value xml:lang="de">Kein Lieferant</value> - <value xml:lang="en">No Supplier</value> - <value xml:lang="es">Ningún proveedor</value> - <value xml:lang="fr">Aucun fournisseur</value> - <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸à¸¹à¹à¸à¸±à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸à¸à¹à¸«à¹</value> - </property> - <property key="PartyParties"> - <value xml:lang="de">Akteure</value> - <value xml:lang="en">Parties</value> - <value xml:lang="es">Participantes</value> - <value xml:lang="fr">Acteurs</value> - <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyParty"> - <value xml:lang="de">Akteur</value> - <value xml:lang="en">Party</value> - <value xml:lang="es">Participante</value> - <value xml:lang="fr">Acteur</value> - <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyPartyId"> - <value xml:lang="de">Akteur ID</value> - <value xml:lang="en">PartyId</value> - <value xml:lang="es">Código de participante</value> - <value xml:lang="fr">Réf. d'acteur</value> - <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyPartyNotDefined"> - <value xml:lang="de">Akteur nicht definiert</value> - <value xml:lang="en">Party Not Defined</value> - <value xml:lang="es">Participante no definido</value> - <value xml:lang="fr">Acteur non-défini</value> - <value xml:lang="th">à¹à¸¡à¹à¸à¸³à¸«à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartyRole"> - <value xml:lang="de">Rolle</value> - <value xml:lang="en">Role</value> - <value xml:lang="es">Rol de participante</value> - <value xml:lang="fr">Rôle</value> - <value xml:lang="th">สà¸à¸²à¸à¸°</value> - </property> - <property key="PartyRoleType"> - <value xml:lang="de">Rollentyp</value> - <value xml:lang="en">RoleType</value> - <value xml:lang="es">Tipo de rol</value> - <value xml:lang="fr">Type de rôle</value> - <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸ªà¸à¸²à¸à¸°</value> - </property> - <property key="PartySelectcRoleForParty"> - <value xml:lang="de">Rollen für diesen Akteur auswählen</value> - <value xml:lang="en">Select Role For Party</value> - <value xml:lang="es">Seleccionar rol para participante</value> - <value xml:lang="fr">Sélectionner le rôle pour acteur</value> - <value xml:lang="th">à¹à¸¥à¸·à¸à¸à¸ªà¸à¸²à¸à¸°à¸ªà¸³à¸«à¸£à¸±à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="PartySuffix"> - <value xml:lang="de">Suffix</value> - <value xml:lang="en">Suffix</value> - <value xml:lang="es">Sufijo</value> - <value xml:lang="fr">Suffixe</value> - <value xml:lang="th">à¸à¸³à¸à¸³à¸«à¸à¹à¸²à¸à¸·à¹à¸</value> - </property> - <property key="PartySupplier"> - <value xml:lang="de">Lieferant</value> - <value xml:lang="en">Supplier</value> - <value xml:lang="es">Proveedor</value> - <value xml:lang="fr">Fournisseur</value> - <value xml:lang="th">à¸à¸¹à¹à¸à¸±à¸à¸«à¸²à¸ªà¸´à¹à¸à¸à¸à¸à¹à¸«à¹</value> - </property> - <property key="PartyUserLoginId"> - <value xml:lang="de">Benutzeranmeldung ID</value> - <value xml:lang="en">User Login Id</value> - <value xml:lang="es">Código de usuario</value> - <value xml:lang="fr">Réf. d'identifiant de connexion</value> - <value xml:lang="th">รหัสà¸à¸²à¸£à¸¥à¸à¸à¸à¸´à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸£à¸°à¸à¸à¸à¸à¸à¸à¸¹à¹à¹à¸à¹</value> - </property> - <property key="product3net"> - <value xml:lang="en">product3net</value> - <value xml:lang="es">3 Net?</value> - </property> <property key="ProductAddProductsUsingDefaultQuantities"> <value xml:lang="de">Produkte in dieser Kategorie mit Vorgabemengen in den Warenkorb stellen</value> <value xml:lang="en">Add Products Using Default Quantities</value> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=729636&r1=729635&r2=729636&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Sat Dec 27 07:16:04 2008 @@ -31,16 +31,16 @@ <process field="personalTitle"><copy/></process> <process field="firstName"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyFirstNameMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyFirstNameMissing"/></not-empty> </process> <process field="middleName"><copy/></process> <process field="lastName"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyLastNameMissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyLastNameMissingError"/></not-empty> </process> <process field="suffix"><copy/></process> <process field="birthDate"> - <convert type="Date" to-field="birthDate"><fail-property resource="EcommerceUiLabels" property="PartyBirthDateMissingError"/></convert> + <convert type="Date" to-field="birthDate"><fail-property resource="PartyUiLabels" property="PartyBirthDateMissingError"/></convert> </process> <process field="gender"><copy/></process> </simple-map-processor> @@ -51,7 +51,7 @@ <simple-map-processor name="newEmail"> <process field="emailAddress"> <copy/> - <validate-method method="isEmail"><fail-property resource="EcommerceUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> + <validate-method method="isEmail"><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method> </process> <process field="emailSol"><copy to-field="allowSolicitation"/></process> </simple-map-processor> @@ -69,24 +69,24 @@ <process field="fullName"><copy to-field="toName"/></process> <process field="address1"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyAddressLine1MissingError"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1MissingError"/></not-empty> </process> <process field="address2"><copy/></process> <process field="city"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCityMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty> </process> <process field="stateProvinceGeoId"><copy/></process> <process field="postalCode"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyZipCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyZipCodeMissing"/></not-empty> </process> <process field="countyGeoId"> <copy/> </process> <process field="countryGeoId"> <copy/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyCountryMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty> </process> <process field="allowSolicitation"><copy/></process> </simple-map-processor> @@ -101,7 +101,7 @@ <if-compare value="CAN" operator="equals" field="parameters.countryGeoId"> <if-empty field="parameters.stateProvinceGeoId"> <add-error> - <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/> + <fail-property resource="PartyUiLabels" property="PartyProvinceInCanadaMissing"/> </add-error> </if-empty> </if-compare> @@ -113,11 +113,11 @@ <process field="homeCountryCode"><copy to-field="countryCode"/></process> <process field="homeAreaCode"> <copy to-field="areaCode"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyHomePhoneAreaCodeMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyHomePhoneAreaCodeMissing"/></not-empty> </process> <process field="homeContactNumber"> <copy to-field="contactNumber"/> - <not-empty><fail-property resource="EcommerceUiLabels" property="PartyHomePhoneContactNumberMissing"/></not-empty> + <not-empty><fail-property resource="PartyUiLabels" property="PartyHomePhoneContactNumberMissing"/></not-empty> </process> <process field="homeExt"><copy to-field="extension"/></process> <process field="homeSol"><copy to-field="allowSolicitation"/></process> @@ -265,7 +265,7 @@ </simple-method> <simple-method method-name="updateCustomer" short-description="Update Customer" login-required="true"> - <if-empty field="parameters.partyId"><add-error><fail-property resource="EcommerceUiLabels" property="PartyNoPartyForUpdateCustomer"/></add-error></if-empty> + <if-empty field="parameters.partyId"><add-error><fail-property resource="PartyUiLabels" property="PartyNoPartyForUpdateCustomer"/></add-error></if-empty> <call-simple-method method-name="validateCustomerInfo"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |