OFBiz › OFBiz - Commits

svn commit: r690248 - in /ofbiz/trunk/applications/ecommerce: config/ webapp/ecommerce/WEB-INF/actions/customer/ webapp/ecommerce/customer/profile/ webapp/ecommerce/order/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mor-2

svn commit: r690248 - in /ofbiz/trunk/applications/ecommerce: config/ webapp/ecommerce/WEB-INF/actions/customer/ webapp/ecommerce/customer/profile/ webapp/ecommerce/order/

Author: mor
Date: Fri Aug 29 06:17:41 2008
New Revision: 690248

URL: http://svn.apache.org/viewvc?rev=690248&view=rev
Log:
Removed deprecated class inputBox and unused code.
Changed script code to use context rather then parameters (Also reported by Scott - Initially I thought it would be an issue but its working fine)
More internationalization on one page template.

Thanks to Santosh Malviya and Sumit Pandit for this effort.

Modified:
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Fri Aug 29 06:17:41 2008
@@ -3050,6 +3050,9 @@
<value xml:lang="th">à¸§à¸±à¸à¸à¸µà¹à¹à¸£à¸´à¹à¸¡à¸à¹à¸</value>
<value xml:lang="zh">å¼å§æ¥æ</value>
</property>
+ <property key="EcommerceStep">
+ <value xml:lang="en">Step</value>
+ </property>
<property key="EcommerceSubject">
<value xml:lang="en">Subject</value>
<value xml:lang="es">Asunto</value>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy Fri Aug 29 06:17:41 2008
@@ -26,20 +26,20 @@
contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "BILLING_LOCATION", "POSTAL_ADDRESS", false));
if (contactMech) {
postalAddress = contactMech.getRelatedOne("PostalAddress");
- parameters.billToContactMechId = postalAddress.contactMechId;
- parameters.billToAddress1 = postalAddress.address1;
- parameters.billToAddress2 = postalAddress.address2;
- parameters.billToCity = postalAddress.city;
- parameters.billToPostalCode = postalAddress.postalCode;
- parameters.billToStateProvinceGeoId = postalAddress.stateProvinceGeoId;
- parameters.billToCountryGeoId = postalAddress.countryGeoId;
+ context.billToContactMechId = postalAddress.contactMechId;
+ context.billToAddress1 = postalAddress.address1;
+ context.billToAddress2 = postalAddress.address2;
+ context.billToCity = postalAddress.city;
+ context.billToPostalCode = postalAddress.postalCode;
+ context.billToStateProvinceGeoId = postalAddress.stateProvinceGeoId;
+ context.billToCountryGeoId = postalAddress.countryGeoId;
billToStateProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false);
if (billToStateProvinceGeo) {
- parameters.billToStateProvinceGeo = billToStateProvinceGeo.geoName;
+ context.billToStateProvinceGeo = billToStateProvinceGeo.geoName;
}
billToCountryProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false);
if (billToCountryProvinceGeo) {
- parameters.billToCountryProvinceGeo = billToCountryProvinceGeo.geoName;
+ context.billToCountryProvinceGeo = billToCountryProvinceGeo.geoName;
}
}

@@ -56,13 +56,13 @@
if (paymentMethod) {
creditCard = paymentMethod.getRelatedOne("CreditCard");
if (creditCard) {
- parameters.paymentMethodTypeId = "CREDIT_CARD";
- parameters.cardNumber = creditCard.cardNumber;
- parameters.paymentMethodId = creditCard.paymentMethodId;
- parameters.firstNameOnCard = creditCard.firstNameOnCard;
- parameters.lastNameOnCard = creditCard.lastNameOnCard;
- parameters.expMonth = (creditCard.expireDate).substring(0, 2);
- parameters.expYear = (creditCard.expireDate).substring(3);
+ context.paymentMethodTypeId = "CREDIT_CARD";
+ context.cardNumber = creditCard.cardNumber;
+ context.paymentMethodId = creditCard.paymentMethodId;
+ context.firstNameOnCard = creditCard.firstNameOnCard;
+ context.lastNameOnCard = creditCard.lastNameOnCard;
+ context.expMonth = (creditCard.expireDate).substring(0, 2);
+ context.expYear = (creditCard.expireDate).substring(3);
}
}
}
\ No newline at end of file

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy Fri Aug 29 06:17:41 2008
@@ -25,8 +25,8 @@

contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "PRIMARY_EMAIL", "EMAIL_ADDRESS", false));
if (contactMech) {
- parameters.emailContactMechId = contactMech.contactMechId;
- parameters.emailAddress = contactMech.infoString;
+ context.emailContactMechId = contactMech.contactMechId;
+ context.emailAddress = contactMech.infoString;
}

contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "PRIMARY_PHONE", "TELECOM_NUMBER", false));
@@ -34,11 +34,11 @@
partyContactMech = EntityUtil.getFirst(delegator.findByAnd("PartyContactMech", [partyId : party.partyId, contactMechId : contactMech.contactMechId]));
if (partyContactMech) {
telecomNumber = partyContactMech.getRelatedOne("TelecomNumber");
- parameters.phoneContactMechId = telecomNumber.contactMechId;
- parameters.countryCode = telecomNumber.countryCode;
- parameters.areaCode = telecomNumber.areaCode;
- parameters.contactNumber = telecomNumber.contactNumber;
- parameters.extension = partyContactMech.extension;
+ context.phoneContactMechId = telecomNumber.contactMechId;
+ context.countryCode = telecomNumber.countryCode;
+ context.areaCode = telecomNumber.areaCode;
+ context.contactNumber = telecomNumber.contactNumber;
+ context.extension = partyContactMech.extension;
}
}
}
\ No newline at end of file

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy Fri Aug 29 06:17:41 2008
@@ -23,27 +23,27 @@
if (userLogin) {
party = userLogin.getRelatedOne("Party");
person = delegator.findByPrimaryKey("Person", [partyId : party.partyId]);
- parameters.firstName = person.firstName;
- parameters.lastName = person.lastName;
+ context.firstName = person.firstName;
+ context.lastName = person.lastName;

contactMech = EntityUtil.getFirst(ContactHelper.getContactMech(party, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false));
if (contactMech) {
postalAddress = contactMech.getRelatedOne("PostalAddress");
- parameters.shipToContactMechId = postalAddress.contactMechId;
+ context.shipToContactMechId = postalAddress.contactMechId;

- parameters.shipToAddress1 = postalAddress.address1;
- parameters.shipToAddress2 = postalAddress.address2;
- parameters.shipToCity = postalAddress.city;
- parameters.shipToPostalCode = postalAddress.postalCode;
- parameters.shipToStateProvinceGeoId = postalAddress.stateProvinceGeoId;
- parameters.shipToCountryGeoId = postalAddress.countryGeoId;
+ context.shipToAddress1 = postalAddress.address1;
+ context.shipToAddress2 = postalAddress.address2;
+ context.shipToCity = postalAddress.city;
+ context.shipToPostalCode = postalAddress.postalCode;
+ context.shipToStateProvinceGeoId = postalAddress.stateProvinceGeoId;
+ context.shipToCountryGeoId = postalAddress.countryGeoId;
shipToStateProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.stateProvinceGeoId], false);
if (shipToStateProvinceGeo) {
- parameters.shipToStateProvinceGeo = shipToStateProvinceGeo.geoName;
+ context.shipToStateProvinceGeo = shipToStateProvinceGeo.geoName;
}
shipToCountryProvinceGeo = delegator.findOne("Geo", [geoId : postalAddress.countryGeoId], false);
if (shipToCountryProvinceGeo) {
- parameters.shipToCountryProvinceGeo = shipToCountryProvinceGeo.geoName;
+ context.shipToCountryProvinceGeo = shipToCountryProvinceGeo.geoName;
}
}

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Fri Aug 29 06:17:41 2008
@@ -21,33 +21,33 @@
<form id="editBillToPostalAddress" name="editBillToPostalAddress" method="post" action="<@ofbizUrl></@ofbizUrl>">
<div>
<input type="hidden" name="setBillingPurpose" value="Y"/>
- <input type="hidden" name="contactMechId" value="${parameters.billToContactMechId?if_exists}"/>
+ <input type="hidden" name="contactMechId" value="${billToContactMechId?if_exists}"/>
<#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
<input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
<div class="form-row">
<label>${uiLabelMap.PartyAddressLine1}*</label>
<span>
- <input type="text" class="left required" name="address1" id="billToAddress1" value="${parameters.billToAddress1?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left required" name="address1" id="billToAddress1" value="${billToAddress1?if_exists}" size="30" maxlength="30">
<span id="advice-required-billToAddress1" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyAddressLine2}</label>
<span>
- <input type="text" class="left" name="address2" value="${parameters.billToAddress2?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left" name="address2" value="${billToAddress2?if_exists}" size="30" maxlength="30">
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyCity}*</label>
<span>
- <input type="text" class="left required" name="city" id="billToCity" value="${parameters.billToCity?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left required" name="city" id="billToCity" value="${billToCity?if_exists}" size="30" maxlength="30">
<span id="advice-required-billToCity" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyZipCode}*</label>
<span>
- <input type="text" class="left required" name="postalCode" id="billToPostalCode" value="${parameters.billToPostalCode?if_exists}" size="12" maxlength="10">
+ <input type="text" class="left required" name="postalCode" id="billToPostalCode" value="${billToPostalCode?if_exists}" size="12" maxlength="10">
<span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
@@ -55,8 +55,8 @@
<label>${uiLabelMap.PartyState}*</label>
<span>
<select name="stateProvinceGeoId" id="billToStateProvinceGeoId" class="left required" style="width: 70%">
- <#if parameters.billToStateProvinceGeoId?exists>
- <option value='${parameters.billToStateProvinceGeoId}'>${parameters.billToStateProvinceGeo?default(parameters.billToStateProvinceGeoId)}</option>
+ <#if billToStateProvinceGeoId?exists>
+ <option value='${billToStateProvinceGeoId?if_exists}'>${billToStateProvinceGeo?default(billToStateProvinceGeoId?if_exists)}</option>
</#if>
<option value="">${uiLabelMap.PartyNoState}</option>
${screens.render("component://common/widget/CommonScreens.xml#states")}
@@ -68,8 +68,8 @@
<label>${uiLabelMap.PartyCountry}*</label>
<span>
<select name="countryGeoId" id="billToCountryGeoId" class="left required" style="width: 70%">
- <#if parameters.billToCountryGeoId?exists>
- <option value='${parameters.billToCountryGeoId}'>${parameters.billToCountryProvinceGeo?default(parameters.billToCountryGeoId)}</option>
+ <#if billToCountryGeoId?exists>
+ <option value='${billToCountryGeoId?if_exists}'>${billToCountryProvinceGeo?default(billToCountryGeoId?if_exists)}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditProfile.ftl Fri Aug 29 06:17:41 2008
@@ -24,18 +24,18 @@
<div class="screenlet-body">
<form id="editUserForm" name="editUserForm" method="post" action="<@ofbizUrl>updateCustomerProfile</@ofbizUrl>">
<input type="hidden" name="emailContactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
- <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
+ <input type="hidden" name="emailContactMechId" value="${emailContactMechId?if_exists}"/>

<div class="left center">
<div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.PartyContactInformation}</div></div>
<div class="screenlet-body">
<div class="form-row">
<div class="field-label"><label for="firstName">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstName" style="display: none" class="errorMessage">(required)</span></label></div>
- <div class="form-field"><input type="text" name="firstName" id="firstName" class="required" value="${parameters.firstName?if_exists}" size="30" maxlength="30"></div>
+ <div class="form-field"><input type="text" name="firstName" id="firstName" class="required" value="${firstName?if_exists}" size="30" maxlength="30"></div>
</div>
<div class="form-row">
<div class="field-label"><label for="lastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastName" style="display: none" class="errorMessage">(required)</span></label></div>
- <div class="form-field"><input type="text" name="lastName" id="lastName" class="required" value="${parameters.lastName?if_exists}" size="30" maxlength="30"></div>
+ <div class="form-field"><input type="text" name="lastName" id="lastName" class="required" value="${lastName?if_exists}" size="30" maxlength="30"></div>
</div>
<div class="form-row">
<div class="field-label">
@@ -45,7 +45,7 @@
<span id="advice-validate-email-emailAddress" class="errorMessage" style="display:none">${uiLabelMap.PartyEmailAddressNotFormattedCorrectly}</span>
</label>
</div>
- <div class="form-field"><input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${parameters.emailAddress?if_exists}" size="30" maxlength="255"/></div>
+ <div class="form-field"><input type="text" class="required validate-email" name="emailAddress" id="emailAddress" value="${emailAddress?if_exists}" size="30" maxlength="255"/></div>
</div>
</div>
</div>
@@ -59,15 +59,15 @@
</div>
<div class="form-row">
<div class="field-label"><label for="currentPassword">${uiLabelMap.CommonCurrentPassword}*</label></div>
- <div class="form-field"><input type="password" name="currentPassword" id="currentPassword" value="${parameters.currentPassword?if_exists}" size="30" maxlength="16"></div>
+ <div class="form-field"><input type="password" name="currentPassword" id="currentPassword" value="" size="30" maxlength="16"></div>
</div>
<div class="form-row">
<div class="field-label"><label for="newPassword">${uiLabelMap.CommonNewPassword}*</label></div>
- <div class="form-field"><input type="password" name="newPassword" id="newPassword" value="${parameters.newPassword?if_exists}" size="30" maxlength="16"></div>
+ <div class="form-field"><input type="password" name="newPassword" id="newPassword" value="" size="30" maxlength="16"></div>
</div>
<div class="form-row">
<div class="field-label"><label for="newPasswordVerify">${uiLabelMap.CommonNewPasswordVerify}*</label></div>
- <div class="form-field"><input type="password" name="newPasswordVerify" id="newPasswordVerify" value="${parameters.passwordVerify?if_exists}" size="30" maxlength="16"></div>
+ <div class="form-field"><input type="password" name="newPasswordVerify" id="newPasswordVerify" value="" size="30" maxlength="16"></div>
</div>
</div>
</div>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Fri Aug 29 06:17:41 2008
@@ -21,33 +21,33 @@
<form id="editShipToPostalAddress" name="editShipToPostalAddress" method="post" action="<@ofbizUrl></@ofbizUrl>">
<div>
<input type="hidden" name="setShippingPurpose" value="Y"/>
- <input type="hidden" name="contactMechId" value="${parameters.shipToContactMechId?if_exists}"/>
+ <input type="hidden" name="contactMechId" value="${shipToContactMechId?if_exists}"/>
<#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
<input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
<div class="form-row">
<label>${uiLabelMap.PartyAddressLine1}*</label>
<span>
- <input type="text" class="left required" name="address1" id="shipToAddress1" value="${parameters.shipToAddress1?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left required" name="address1" id="shipToAddress1" value="${shipToAddress1?if_exists}" size="30" maxlength="30">
<span id="advice-required-shipToAddress1" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyAddressLine2}</label>
<span>
- <input type="text" class="left" name="address2" value="${parameters.shipToAddress2?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left" name="address2" value="${shipToAddress2?if_exists}" size="30" maxlength="30">
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyCity}*</label>
<span>
- <input type="text" class="left required" name="city" id="shipToCity" value="${parameters.shipToCity?if_exists}" size="30" maxlength="30">
+ <input type="text" class="left required" name="city" id="shipToCity" value="${shipToCity?if_exists}" size="30" maxlength="30">
<span id="advice-required-shipToCity" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
<div class="form-row">
<label>${uiLabelMap.PartyZipCode}*</label>
<span>
- <input type="text" class="left required" name="postalCode" id="shipToPostalCode" value="${parameters.shipToPostalCode?if_exists}" size="12" maxlength="10">
+ <input type="text" class="left required" name="postalCode" id="shipToPostalCode" value="${shipToPostalCode?if_exists}" size="12" maxlength="10">
<span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(required)</span>
</span>
</div>
@@ -55,8 +55,8 @@
<label>${uiLabelMap.PartyState}*</label>
<span>
<select name="stateProvinceGeoId" id="shipToStateProvinceGeoId" class="left required" style="width: 70%">
- <#if parameters.shipToStateProvinceGeoId?exists>
- <option value='${parameters.shipToStateProvinceGeoId}'>${parameters.shipToStateProvinceGeo?default(parameters.shipToStateProvinceGeoId)}</option>
+ <#if shipToStateProvinceGeoId?exists>
+ <option value='${shipToStateProvinceGeoId?if_exists}'>${shipToStateProvinceGeo?default(shipToStateProvinceGeoId?if_exists)}</option>
</#if>
<option value="">${uiLabelMap.PartyNoState}</option>
${screens.render("component://common/widget/CommonScreens.xml#states")}
@@ -68,8 +68,8 @@
<label>${uiLabelMap.PartyCountry}*</label>
<span>
<select name="countryGeoId" id="shipToCountryGeoId" class="left required" style="width: 70%">
- <#if parameters.shipToCountryGeoId?exists>
- <option value='${parameters.shipToCountryGeoId}'>${parameters.shipToCountryProvinceGeo?default(parameters.shipToCountryGeoId)}</option>
+ <#if shipToCountryGeoId?exists>
+ <option value='${shipToCountryGeoId?if_exists}'>${shipToCountryProvinceGeo?default(shipToCountryGeoId?if_exists)}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Fri Aug 29 06:17:41 2008
@@ -100,13 +100,13 @@
<div class="screenlet-body">
<#--===================================== Billing Address and Telecom number ===========================================-->
<h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.PartyBillingAddress}</h3>
- <#if parameters.billToContactMechId?exists>
- ${parameters.billToAddress1?if_exists}<br/>
- <#if parameters.billToAddress2?has_content>${parameters.billToAddress2?if_exists}<br/></#if>
- ${parameters.billToCity?if_exists},
- ${parameters.billToStateProvinceGeoId?if_exists}
- ${parameters.billToPostalCode?if_exists}<br/>
- ${parameters.billToCountryGeoId?if_exists}<br/>
+ <#if billToContactMechId?exists>
+ ${billToAddress1?if_exists}<br/>
+ <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if>
+ ${billToCity?if_exists},
+ ${billToStateProvinceGeoId?if_exists}
+ ${billToPostalCode?if_exists}<br/>
+ ${billToCountryGeoId?if_exists}<br/>
<#if billToTelecomNumber?has_content>
${billToTelecomNumber.countryCode?if_exists}-
${billToTelecomNumber.areaCode?if_exists}-
@@ -127,13 +127,13 @@

<#--===================================== Shipping Address and Telecom number ===========================================-->
<h3>${uiLabelMap.EcommercePrimary} ${uiLabelMap.OrderShippingAddress}</h3>
- <#if parameters.shipToContactMechId?exists>
- ${parameters.shipToAddress1?if_exists}<br/>
- <#if parameters.shipToAddress2?has_content>${parameters.shipToAddress2?if_exists}<br/></#if>
- ${parameters.shipToCity?if_exists},
- ${parameters.shipToStateProvinceGeoId?if_exists}
- ${parameters.shipToPostalCode?if_exists}<br/>
- ${parameters.shipToCountryGeoId?if_exists}<br/>
+ <#if shipToContactMechId?exists>
+ ${shipToAddress1?if_exists}<br/>
+ <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if>
+ ${shipToCity?if_exists},
+ ${shipToStateProvinceGeoId?if_exists}
+ ${shipToPostalCode?if_exists}<br/>
+ ${shipToCountryGeoId?if_exists}<br/>
<#if shipToTelecomNumber?has_content>
${shipToTelecomNumber.countryCode?if_exists}-
${shipToTelecomNumber.areaCode?if_exists}-

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Fri Aug 29 06:17:41 2008
@@ -26,16 +26,16 @@
<div class="screenlet-header"><div class="boxhead"> ${uiLabelMap.PartyContactInformation}</div></div>
<div class="screenlet-body">
<div class="form-row">
- <div class="form-field">${parameters.firstName?if_exists} ${parameters.lastName?if_exists}</div>
+ <div class="form-field">${firstName?if_exists} ${lastName?if_exists}</div>
</div>

<div class="form-row">
- <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${parameters.emailContactMechId}">
- <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${parameters.emailAddress}">
- <div class="form-field" id="emailAddress">${parameters.emailAddress}</div>
- <a href="mailto:${parameters.emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a> 
+ <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}">
+ <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}">
+ <div class="form-field" id="emailAddress">${emailAddress}</div>
+ <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a> 
</div>
- <div class="form-row"><div id="serverError_${parameters.emailContactMechId}" class="errorMessage"></div></div>
+ <div class="form-row"><div id="serverError_${emailContactMechId}" class="errorMessage"></div></div>
</div>

<#-- Manage Addresses -->
@@ -45,13 +45,13 @@
<div class="left center">
<div class="screenlet-header"><div class='boxhead'>${uiLabelMap.EcommercePrimary} ${uiLabelMap.OrderShippingAddress}</div></div>
<div class="screenlet-body">
- <#if parameters.shipToContactMechId?exists>
- ${parameters.shipToAddress1?if_exists}<br/>
- <#if parameters.shipToAddress2?has_content>${parameters.shipToAddress2?if_exists}<br/></#if>
- ${parameters.shipToCity?if_exists},
- ${parameters.shipToStateProvinceGeoId?if_exists}
- ${parameters.shipToPostalCode?if_exists}<br/>
- ${parameters.shipToCountryGeoId?if_exists}<br/>
+ <#if shipToContactMechId?exists>
+ ${shipToAddress1?if_exists}<br/>
+ <#if shipToAddress2?has_content>${shipToAddress2?if_exists}<br/></#if>
+ ${shipToCity?if_exists},
+ ${shipToStateProvinceGeoId?if_exists}
+ ${shipToPostalCode?if_exists}<br/>
+ ${shipToCountryGeoId?if_exists}<br/>
<#if shipToTelecomNumber?has_content>
${shipToTelecomNumber.countryCode?if_exists}-
${shipToTelecomNumber.areaCode?if_exists}-
@@ -67,13 +67,13 @@
<div class="center right">
<div class="screenlet-header"><div class='boxhead'> ${uiLabelMap.EcommercePrimary} ${uiLabelMap.PartyBillingAddress}</div></div>
<div class="screenlet-body">
- <#if parameters.billToContactMechId?exists>
- ${parameters.billToAddress1?if_exists}<br/>
- <#if parameters.billToAddress2?has_content>${parameters.billToAddress2?if_exists}<br/></#if>
- ${parameters.billToCity?if_exists},
- ${parameters.billToStateProvinceGeoId?if_exists}
- ${parameters.billToPostalCode?if_exists}<br/>
- ${parameters.billToCountryGeoId?if_exists}<br/>
+ <#if billToContactMechId?exists>
+ ${billToAddress1?if_exists}<br/>
+ <#if billToAddress2?has_content>${billToAddress2?if_exists}<br/></#if>
+ ${billToCity?if_exists},
+ ${billToStateProvinceGeoId?if_exists}
+ ${billToPostalCode?if_exists}<br/>
+ ${billToCountryGeoId?if_exists}<br/>
<#if billToTelecomNumber?has_content>
${billToTelecomNumber.countryCode?if_exists}-
${billToTelecomNumber.areaCode?if_exists}-

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=690248&r1=690247&r2=690248&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Fri Aug 29 06:17:41 2008
@@ -28,10 +28,10 @@

<#-- ========================================================================================================================== -->
<div id="cartPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">Step 1: ${uiLabelMap.PageTitleShoppingCart}</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}</div></div>
<div id="cartSummaryPanel" class="screenlet-body" style="display: none;">
- <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openCartPanel">Click here to edit</a></span></h3></div>
- <div align="center"><h2>${uiLabelMap.OrderShoppingCart} ${uiLabelMap.EcommerceSummary}</h2></div>
+ <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openCartPanel">${uiLabelMap.CommonClickHere} ${uiLabelMap.CommonTo} ${uiLabelMap.CommonEdit}</a></span></h3></div>
+ <div align="center"><h3>${uiLabelMap.OrderShoppingCart} ${uiLabelMap.EcommerceSummary}</h3></div>
<table width="75%" cellspacing="0" cellpadding="1" border="0">
<thead>
<tr>
@@ -148,7 +148,7 @@
<input type="hidden" name="cartLineProductId" id="cartLineProductId_${cartLineIndex}" value="${cartLine.getProductId()}">
<div>
<span>
- <input type="text" name="update_${cartLineIndex}" id="qty_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" size="6" class="inputBox required validate-number"><span></span>
+ <input type="text" name="update_${cartLineIndex}" id="qty_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" size="6" class="required validate-number">
</span>
<label for="qty_${cartLineIndex}"><span id="advice-required-qty_${cartLineIndex}" style="display:none;" class="errorMessage"> (required)</span></label>
</div>
@@ -173,7 +173,7 @@
<td><div id="cartSubTotal" align="center"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
<tr>
- <td colspan="4"><div>${uiLabelMap.EcommerceEnterPromoCode}:<input id="productPromoCode" class="inputBox" name="productPromoCode" size="22" type="text" value=""/></div></td>
+ <td colspan="4"><div>${uiLabelMap.EcommerceEnterPromoCode}:<input id="productPromoCode" name="productPromoCode" size="22" type="text" value=""/></div></td>
<td><div id="cartDiscount" align="right"><b>${uiLabelMap.ProductDiscount}:</b></div></td>
<td>
<div id="cartDiscountValue" align="center">
@@ -203,17 +203,17 @@
</tbody>
</table>
</form>
- <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editShipping">Continue for step 2</a></span></h3></div>
+ <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editShipping">${uiLabelMap.CommonContinue} ${uiLabelMap.CommonFor} ${uiLabelMap.EcommerceStep} 2</a></span></h3></div>
</div>
</div>

<#-- ========================================================================================================================== -->
<div id="shippingPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">Step 2: Shipping</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}</div></div>
<div id="shippingSummaryPanel" class="screenlet-body">
- <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openShippingPanel">Click here to edit</a></span></h3></div>
+ <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openShippingPanel">${uiLabelMap.CommonClickHere} ${uiLabelMap.CommonTo} ${uiLabelMap.CommonEdit}</a></span></h3></div>
<div style="display:none" id="shippingCompleted">
- <a href="javascript:void(0);" id="openShippingAndPersonlDetail"><h3>Shipping Summary</h3></a>
+ <div align="center" id="openShippingAndPersonlDetail"><h3>${uiLabelMap.FacilityShipping} ${uiLabelMap.EcommerceSummary}</h3></div>
<table>
<tbody>
<tr>
@@ -242,11 +242,11 @@
<#-- ============================================================= -->
<div id="editShippingPanel" class="screenlet-body" style="display: none;">
<form name="shippingForm" id="shippingForm" action="<@ofbizUrl>createUpdateShippingAddress</@ofbizUrl>" method="post">
- <input type="hidden" id="shipToContactMechId" name="shipToContactMechId" value="${parameters.shipToContactMechId?if_exists}"/>
- <input type="hidden" id="billToContactMechIdInShipingForm" name="billToContactMechId" value="${parameters.billToContactMechId?if_exists}"/>
+ <input type="hidden" id="shipToContactMechId" name="shipToContactMechId" value="${shipToContactMechId?if_exists}"/>
+ <input type="hidden" id="billToContactMechIdInShipingForm" name="billToContactMechId" value="${billToContactMechId?if_exists}"/>
<input type="hidden" id="shipToPartyId" name="partyId" value="${parameters.partyId?if_exists}"/>
- <input type="hidden" id="phoneContactMechId" name="phoneContactMechId" value="${parameters.phoneContactMechId?if_exists}"/>
- <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
+ <input type="hidden" id="phoneContactMechId" name="phoneContactMechId" value="${phoneContactMechId?if_exists}"/>
+ <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}"/>
<input type="hidden" name="roleTypeId" value="CUSTOMER"/>
<div id="shippingFormServerError" class="errorMessage"></div>
<table>
@@ -254,91 +254,91 @@
<td width="40%" valign="top">
<div class="form-row">
<div class="field-label">
- <label for="firstName">${uiLabelMap.PartyFirstName}<span>*</span>
+ <label for="firstName">${uiLabelMap.PartyFirstName}*
<span id="advice-required-firstName" style="display: none" class="errorMessage"> (required)</span>
</label>
</div>
- <div class="field-widget"><input id="firstName" name="firstName" class="inputBox required" type="text" value="${(parameters.firstName)?if_exists}"/></div>
+ <div><input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}"/></div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="lastName">${uiLabelMap.PartyLastName}<span>*</span>
+ <label for="lastName">${uiLabelMap.PartyLastName}*
<span id="advice-required-lastName" style="display:none" class="errorMessage"> (required)</span>
</label>
</div>
- <div class="field-widget"><input id="lastName" name="lastName" class="inputBox required" type="text" value="${(parameters.lastName)?if_exists}"/></div>
+ <div><input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}"/></div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="countryCode">${uiLabelMap.PartyCountry}<span>*</span>
+ <label for="countryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-shippingCountryCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <label for="areaCode">${uiLabelMap.PartyAreaCode}<span>*</span><span id="advice-required-shippingAreaCode" style="display:none" class="errorMessage"> (required)</span></label>
- <label for="contactNumber">${uiLabelMap.PartyContactNumber}<span>*</span><span id="advice-required-shippingContactNumber" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="areaCode">${uiLabelMap.PartyAreaCode}*<span id="advice-required-shippingAreaCode" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="contactNumber">${uiLabelMap.PartyContactNumber}*<span id="advice-required-shippingContactNumber" style="display:none" class="errorMessage"> (required)</span></label>
<label for="extension">${uiLabelMap.PartyExtension}</label>
</div>
- <div class="field-widget">
- <input name="countryCode" class="inputBox required" id="shippingCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength=3> -
- <input name="areaCode" class="inputBox required" id="shippingAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength=3> -
- <input name="contactNumber" class="inputBox required" id="shippingContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength=7> -
- <input name="extension" class="inputBox" id="shippingExtension" value="${parameters.extension?if_exists}" size="5" maxlength=3>
+ <div>
+ <input name="countryCode" class="required" id="shippingCountryCode" value="${countryCode?if_exists}" size="5" maxlength=3> -
+ <input name="areaCode" class="required" id="shippingAreaCode" value="${areaCode?if_exists}" size="5" maxlength=3> -
+ <input name="contactNumber" class="required" id="shippingContactNumber" value="${contactNumber?if_exists}" size="10" maxlength=7> -
+ <input name="extension" id="shippingExtension" value="${extension?if_exists}" size="5" maxlength=3>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="emailAddress">${uiLabelMap.PartyEmailAddress}<span>*</span>
+ <label for="emailAddress">${uiLabelMap.PartyEmailAddress}*
<span id="advice-required-emailAddress" style="display:none" class="errorMessage"> (required)</span>
</label>
</div>
- <div class="field-widget">
- <input id="emailAddress" name="emailAddress" class="inputBox required validate-email" maxlength="255" size="40" type="text" value="${parameters.emailAddress?if_exists}"/>
+ <div>
+ <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress?if_exists}"/>
</div>
</div>
</td><td width="20%"></td><td>
<div class="form-row">
<div class="field-label">
- <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}<span>*</span><span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
+ <label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*<span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="shipToAddress1" name="shipToAddress1" class="inputBox required" type="text" value="${parameters.shipToAddress1?if_exists}" maxlength="255" size="40"/>
+ <div>
+ <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}" maxlength="255" size="40"/>
</div>
</div>
<div class="form-row">
<div class="field-label"><label for="address2">${uiLabelMap.PartyAddressLine2}</label></div>
- <div class="field-widget"><input id="shipToAddress2" name="shipToAddress2" class="inputBox" type="text" value="${parameters.shipToAddress2?if_exists}" maxlength="255" size="40"/></div>
+ <div><input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2?if_exists}" maxlength="255" size="40"/></div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="shipToCity">${uiLabelMap.CommonCity}<span>*</span><span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
+ <label for="shipToCity">${uiLabelMap.CommonCity}*<span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
</div>
- <div class="field-widget"><input id="shipToCity" name="shipToCity" class="inputBox required" type="text" value="${parameters.shipToCity?if_exists}" maxlength="255" size="40"/></div>
+ <div><input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}" maxlength="255" size="40"/></div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}<span>*</span><span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
+ <label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (required)</span></label>
</div>
- <div class="field-widget"><input id="shipToPostalCode" name="shipToPostalCode" class="inputBox required" type="text" value="${parameters.shipToPostalCode?if_exists}" size="12" maxlength="10"/></div>
+ <div><input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10"/></div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}<span class="requiredLabel"> *</span><span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}<span class="requiredLabel">*<span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
+ <div>
<div>
- <input name="shipToCountryGeo" id="shipToCountryGeo" size="30" class="inputBox required" type="text" value="${parameters.shipToCountryProvinceGeo?if_exists}"/>
- <input name="countryGeoId" id="shipToCountryGeoId" type="hidden" value="${parameters.shipToCountryGeoId?if_exists}"/>
+ <input name="shipToCountryGeo" id="shipToCountryGeo" size="30" class="required" type="text" value="${shipToCountryProvinceGeo?if_exists}"/>
+ <input name="countryGeoId" id="shipToCountryGeoId" type="hidden" value="${shipToCountryGeoId?if_exists}"/>
<div id="shipToCountries" class="autocomplete" style="display:none"></div>
</div>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="state">${uiLabelMap.CommonState}<span>*</span><span id="advice-required-shipToStateProvinceGeo" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="state">${uiLabelMap.CommonState}*<span id="advice-required-shipToStateProvinceGeo" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
+ <div>
<div>
- <input name="shipToStateProvinceGeo" id="shipToStateProvinceGeo" size="30" class="inputBox required" type="text" value="${parameters.shipToStateProvinceGeo?if_exists}"/>
- <input name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" type="hidden" value="${parameters.shipToStateProvinceGeoId?if_exists}"/>
+ <input name="shipToStateProvinceGeo" id="shipToStateProvinceGeo" size="30" class="required" type="text" value="${shipToStateProvinceGeo?if_exists}"/>
+ <input name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" type="hidden" value="${shipToStateProvinceGeoId?if_exists}"/>
<div id="shipToStates" class="autocomplete" style="display:none"></div>
</div>
</div>
@@ -347,17 +347,17 @@
</tr>
</table>
</form>
- <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editShippingOptions">Continue for step 3</a></span></h3></div>
+ <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editShippingOptions">${uiLabelMap.CommonContinue} ${uiLabelMap.CommonFor} ${uiLabelMap.EcommerceStep} 3</a></span></h3></div>
</div>
</div>

<#-- ========================================================================================================================== -->
<div id="shippingOptionPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">Step 3: Shipping Options</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</div></div>
<div id="shippingOptionSummaryPanel" class="screenlet-body">
- <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openShippingOptionPanel">Click here to edit</a></span></h3></div>
+ <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openShippingOptionPanel">${uiLabelMap.CommonClickHere} ${uiLabelMap.CommonTo} ${uiLabelMap.CommonEdit}</a></span></h3></div>
<div class="completed" style="display:none" id="shippingOptionCompleted">
- <a href="javascript:void(0);" id="openShippingOption"><h3>Shipping Option Summary</h3></a>
+ <div align="center" id="openShippingOption"><h3>${uiLabelMap.FacilityShipping} ${uiLabelMap.SurveyOption} ${uiLabelMap.EcommerceSummary}</h3></div>
<table cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -378,7 +378,7 @@
<td>
<div class="form-row">
<div class="field-label">
- <label for="shipmethod">${uiLabelMap.OrderSelectShippingMethod}<span class="requiredLabel"> *</span><span id="advice-required-shipping_method" class="custom-advice" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="shipmethod">${uiLabelMap.OrderSelectShippingMethod}<span class="requiredLabel">*<span id="advice-required-shipping_method" class="custom-advice" style="display:none" class="errorMessage"> (required)</span></label>
</div>
<select id="shipMethod" name="shipMethod" class="required"></select>
</div>
@@ -386,17 +386,17 @@
</tr>
</table>
</form>
- <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editBilling">Continue for step 4</a></span></h3></div>
+ <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="editBilling">${uiLabelMap.CommonContinue} ${uiLabelMap.CommonFor} ${uiLabelMap.EcommerceStep} 4</a></span></h3></div>
</div>
</div>

<#-- ========================================================================================================================== -->
<div id="billingPanel" class="screenlet">
- <div class="screenlet-header"><div class="boxhead">Step 4: Billing</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</div></div>
<div id="billingSummaryPanel" class="screenlet-body">
- <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openBillingPanel">Click here to edit</a></span></h3></div>
+ <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openBillingPanel">${uiLabelMap.CommonClickHere} ${uiLabelMap.CommonTo} ${uiLabelMap.CommonEdit}</a></span></h3></div>
<div class="completed" id="billingCompleted" style="display: none;">
- <a href="javascript:void(0);" id="openBillingAndPersonlDetail"><h3>Billing and Payment Summary</h3></a>
+ <div align="center" id="openBillingAndPersonlDetail"><h3>${uiLabelMap.AccountingBilling} ${uiLabelMap.CommonAnd} ${uiLabelMap.AccountingPayment} ${uiLabelMap.EcommerceSummary}</h3></div>
<table width="35%" align="center">
<tbody>
<tr>
@@ -427,14 +427,15 @@
</div>

<#-- ============================================================= -->
+
<div id="editBillingPanel" class="screenlet-body" style="display: none;">
<form name="billingForm" id="billingForm" class="theform" action="<@ofbizUrl></@ofbizUrl>" method="post">
- <input type="hidden" id ="billToContactMechId" name="billToContactMechId" value="${parameters.billToContactMechId?if_exists}"/>
- <input type="hidden" id="shipToContactMechIdInBillingForm" name="shipToContactMechId" value="${parameters.shipToContactMechId?if_exists}"/>
- <input type="hidden" id="paymentMethodId" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/>
- <input type="hidden" id="paymentMethodTypeId" name="paymentMethodTypeId" value="${parameters.paymentMethodTypeId?if_exists}"/>
+ <input type="hidden" id ="billToContactMechId" name="billToContactMechId" value="${billToContactMechId?if_exists}"/>
+ <input type="hidden" id="shipToContactMechIdInBillingForm" name="shipToContactMechId" value="${shipToContactMechId?if_exists}"/>
+ <input type="hidden" id="paymentMethodId" name="paymentMethodId" value="${paymentMethodId?if_exists}"/>
+ <input type="hidden" id="paymentMethodTypeId" name="paymentMethodTypeId" value="${paymentMethodTypeId?default("CREDIT_CARD")}"/>
<input type="hidden" id="billToPartyId" name="partyId" value="${parameters.partyId?if_exists}"/>
- <input type="hidden" name="expireDate" value="${parameters.expireDate?if_exists}"/>
+ <input type="hidden" name="expireDate" value="${expireDate?if_exists}"/>
<input type="hidden" name="roleTypeId" value="CUSTOMER"/>
<div id="billingFormServerError" class="errorMessage"></div>
<table>
@@ -442,28 +443,28 @@
<td valign="top">
<div class="form-row">
<div class="field-label">
- <label for="cardFirstname">${uiLabelMap.PartyFirstName}<span>*</span><span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (required)</span></label>
+ <label for="cardFirstname">${uiLabelMap.PartyFirstName}*<span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="firstNameOnCard" name="firstNameOnCard" class="inputBox required" type="text" value="${parameters.firstNameOnCard?if_exists}"/>
+ <div>
+ <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard?if_exists}"/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="cardLastName">${uiLabelMap.PartyLastName}<span>*</span><span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (required)</span></label>
+ <label for="cardLastName">${uiLabelMap.PartyLastName}*<span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="lastNameOnCard" name="lastNameOnCard" class="inputBox required" type="text" value="${parameters.lastNameOnCard?if_exists}"/>
+ <div>
+ <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard?if_exists}"/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="cardType">${uiLabelMap.AccountingCardType}<span>*</span><span id="advice-required-cardType" style="display: none;" class="errorMessage"> (required)</span></label>
+ <label for="cardType">${uiLabelMap.AccountingCardType}*<span id="advice-required-cardType" style="display: none;" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
+ <div>
<select name="cardType" id="cardType">
- <#if parameters.cardType?has_content>
- <option label="${parameters.cardType?if_exists}" value="${parameters.cardType?if_exists}">${parameters.cardType?if_exists}</option>
+ <#if cardType?has_content>
+ <option label="${cardType?if_exists}" value="${cardType?if_exists}">${cardType?if_exists}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#cctypes")}
</select>
@@ -471,40 +472,40 @@
</div>
<div class="form-row">
<div class="field-label">
- <label for="cardNumber">${uiLabelMap.AccountingCardNumber}<span>*</span><span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (required)</span></label>
+ <label for="cardNumber">${uiLabelMap.AccountingCardNumber}*<span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="cardNumber" autocomplete="off" name="cardNumber" class="inputBox required" type="text" value="${parameters.cardNumber?if_exists}" size=30 maxlength=16 />
+ <div>
+ <input id="cardNumber" autocomplete="off" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size=30 maxlength=16/>
</div>
</div>
<div class="form-row">
<div class="field-label">
<label for="CVV2">CVV2</label>
</div>
- <div class="field-widget">
- <input id="CVV2" autocomplete="off" name="cardSecurityCode" class="inputBox" size="4" type="text" maxlength="4" value=""/>
+ <div>
+ <input id="CVV2" autocomplete="off" name="cardSecurityCode" size="4" type="text" maxlength="4" value=""/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="expirationdate">${uiLabelMap.AccountingExpirationDate}<span>*</span><span id="advice-validate-expMonth" class="custom-advice" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="expirationdate">${uiLabelMap.AccountingExpirationDate}*<span id="advice-validate-expMonth" class="custom-advice" style="display:none" class="errorMessage"> (required)</span></label>
</div>
</div>
<div class="form-row">
- <span><label for="expMonth">${uiLabelMap.CommonMonth}:<span>*</span><span id="advice-required-expMonth" style="display:none" class="errorMessage"> (required)</span></label></span>
- <span><label for="expYear">     ${uiLabelMap.CommonYear}:<span>*</span><span id="advice-required-expYear" style="display:none" class="errorMessage"> (required)</span></label></span><br>
+ <span><label for="expMonth">${uiLabelMap.CommonMonth}:*<span id="advice-required-expMonth" style="display:none" class="errorMessage"> (required)</span></label></span>
+ <span><label for="expYear">     ${uiLabelMap.CommonYear}:*<span id="advice-required-expYear" style="display:none" class="errorMessage"> (required)</span></label></span><br>
<span>
- <select id="expMonth" name="expMonth" class="inputBox required">
- <#if parameters.expMonth?has_content>
- <option label="${parameters.expMonth?if_exists}" value="${parameters.expMonth?if_exists}">${parameters.expMonth?if_exists}</option>
+ <select id="expMonth" name="expMonth" class="required">
+ <#if expMonth?has_content>
+ <option label="${expMonth?if_exists}" value="${expMonth?if_exists}">${expMonth?if_exists}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccmonths")}
</select>
</span>
<span>
- <select id="expYear" name="expYear" class="inputBox required">
- <#if parameters.expYear?has_content>
- <option value="${parameters.expYear?if_exists}">${parameters.expYear?if_exists}</option>
+ <select id="expYear" name="expYear" class="required">
+ <#if expYear?has_content>
+ <option value="${expYear?if_exists}">${expYear?if_exists}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#ccyears")}
</select>
@@ -514,51 +515,51 @@
<td width="20%"> </td>
<td valign="top">
<div class="form-row">
- <div class="field-widget">
+ <div>
<input class="checkbox" id="useShippingAddressForBilling" name="useShippingAddressForBilling" type="checkbox" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked</#if>> ${uiLabelMap.FacilityBillingAddressSameShipping}
</div>
</div>
<div id="billingAddress" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">style="display:none"</#if>>
<div class="form-row">
<div class="field-label">
- <label for="address1">${uiLabelMap.PartyAddressLine1}<span> *</span><span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="address1">${uiLabelMap.PartyAddressLine1}*<span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="billToAddress1" name="billToAddress1" class="inputBox required" size=30 type="text" value="${parameters.billToAddress1?if_exists}"/>
+ <div>
+ <input id="billToAddress1" name="billToAddress1" class="required" size=30 type="text" value="${billToAddress1?if_exists}"/>
</div>
</div>
<div class="form-row">
<div class="field-label">
<label for="address2" style="margin-top: 9px;">${uiLabelMap.PartyAddressLine2}</label>
</div>
- <div class="field-widget">
- <input id="billToAddress2" name="billToAddress2" class="inputBox" type="text" value="${parameters.billToAddress2?if_exists}" size=30/>
+ <div>
+ <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size=30/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="city">${uiLabelMap.CommonCity}<span>*</span><span id="advice-required-billToCity" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="city">${uiLabelMap.CommonCity}*<span id="advice-required-billToCity" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="billToCity" name="billToCity" class="inputBox required" type="text" value="${parameters.billToCity?if_exists}"/>
+ <div>
+ <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}"/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="billToPostalCode">${uiLabelMap.PartyZipCode}<span>*</span><span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="billToPostalCode">${uiLabelMap.PartyZipCode}*<span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
- <input id="billToPostalCode" name="billToPostalCode" class="inputBox required" type="text" value="${parameters.billToPostalCode?if_exists}" size="12" maxlength="10"/>
+ <div>
+ <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10"/>
</div>
</div>
<div class="form-row">
<div class="field-label">
- <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}<span>*</span><span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*<span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
+ <div>
<select name="countryGeoId" id="billToCountryGeoId" class="required selectBox">
- <#if parameters.billToCountryGeoId?exists>
- <option value="${parameters.billToCountryGeoId}">${parameters.billToCountryProvinceGeo}</option>
+ <#if billToCountryGeoId?exists>
+ <option value="${billToCountryGeoId}">${billToCountryProvinceGeo}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>
@@ -566,12 +567,12 @@
</div>
<div class="form-row">
<div class="field-label">
- <label for="state">${uiLabelMap.CommonState}<span>*</span><span id="advice-required-billToStateProvinceGeoId" style="display:none" class="errorMessage"> (required)</span></label>
+ <label for="state">${uiLabelMap.CommonState}*<span id="advice-required-billToStateProvinceGeoId" style="display:none" class="errorMessage"> (required)</span></label>
</div>
- <div class="field-widget">
+ <div>
<select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId" class="required selectBox">
- <#if parameters.billToStateProvinceGeoId?has_content>
- <option value="${parameters.billToStateProvinceGeoId}">${parameters.billToStateProvinceGeo}</option>
+ <#if billToStateProvinceGeoId?has_content>
+ <option value="${billToStateProvinceGeoId}">${billToStateProvinceGeo}</option>
<#else>
<option value="">${uiLabelMap.PartyNoState}</option>
</#if>
@@ -583,13 +584,13 @@
</tr>
</table>
</form>
- <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="openOrderSubmitPanel">Continue for step 5</a></span></h3></div>
+ <div align="right"><h3><span><a class="buttontext" href="javascript:void(0);" id="openOrderSubmitPanel">${uiLabelMap.CommonContinue} ${uiLabelMap.CommonFor} ${uiLabelMap.EcommerceStep} 5</a></span></h3></div>
</div>
</div>

<#-- ========================================================================================================================== -->
<div class="screenlet">
- <div class="screenlet-header"><div class="boxhead">Step 5: Submit Order</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</div></div>
<div id="orderSubmitPanel" style="display: none;">
<form name="orderSubmitForm" id="orderSubmitForm" action="<@ofbizUrl>onePageProcessOrder</@ofbizUrl>" method="post">
<div align="right">
@@ -605,20 +606,20 @@
<#-- ========================================================================================================================== -->
<div id="emptyCartCheckoutPanel" align="center" <#if shoppingCart?has_content && shoppingCart.size() gt 0> style="display: none;"</#if>>
<div>
- <div class="screenlet-header"><div class="boxhead">Step 1: ${uiLabelMap.PageTitleShoppingCart}</div></div><br/>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}</div></div><br/>
<div>You currently have no items in your cart. Click <a href="<@ofbizUrl>main</@ofbizUrl>">here</a> to view our products.</div>
</div><br/>
<div>
- <div class="screenlet-header"><div class="boxhead">Step 2: Shipping</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}</div></div>
</div><br/>
<div>
- <div class="screenlet-header"><div class="boxhead">Step 3: Shipping Options</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</div></div>
</div><br/>
<div>
- <div class="screenlet-header"><div class="boxhead">Step 4: Billing</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</div></div>
</div><br/>
<div>
- <div class="screenlet-header"><div class="boxhead">Step 5: Submit Order</div></div>
+ <div class="screenlet-header"><div class="boxhead">${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</div></div>
</div>
</div>
</div>