You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2009/09/10 14:49:31 UTC
svn commit: r813409 -
/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
Author: mor
Date: Thu Sep 10 12:49:31 2009
New Revision: 813409
URL: http://svn.apache.org/viewvc?rev=813409&view=rev
Log:
markup improvements.
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=813409&r1=813408&r2=813409&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Thu Sep 10 12:49:31 2009
@@ -18,7 +18,7 @@
-->
<div>
- <#assign shoppingCart = sessionAttributes.shoppingCart?if_exists>
+ <#assign shoppingCart = sessionAttributes.shoppingCart?if_exists />
<h1>${uiLabelMap.OrderCheckout}</h1>
<#if shoppingCart?has_content && shoppingCart.size() gt 0>
<div id="checkoutPanel">
@@ -27,7 +27,7 @@
<div id="cartPanel" class="screenlet">
<h3>${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}</h3>
<div id="cartSummaryPanel" style="display: none;">
- <div class="buttons"><a href="javascript:void(0);" id="openCartPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
+ <a href="javascript:void(0);" id="openCartPanel" class="buttons">${uiLabelMap.EcommerceClickHereToEdit}</a>
<table id="cartSummaryPanel_cartItems">
<thead>
<tr>
@@ -40,16 +40,16 @@
</tr>
</thead>
<tbody>
- <#assign itemCount = 0>
+ <#assign itemCount = 0 />
<#list shoppingCart.items() as cartLine>
- <#assign cartLineIndex = itemCount>
+ <#assign cartLineIndex = itemCount />
<#if cartLine.getProductId()?exists>
<#if cartLine.getParentProductId()?exists>
- <#assign parentProductId = cartLine.getParentProductId()/>
+ <#assign parentProductId = cartLine.getParentProductId() />
<#else>
- <#assign parentProductId = cartLine.getProductId()/>
+ <#assign parentProductId = cartLine.getProductId() />
</#if>
- <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = ""></#if>
</#if>
<tr id="cartItemDisplayRow_${cartLineIndex}">
@@ -57,10 +57,10 @@
<td>${cartLine.getName()?if_exists}</td>
<td>${cartLine.getDisplayPrice()}</td>
<td><span id="completedCartItemQty_${cartLineIndex}">${cartLine.getQuantity()?string.number}</span></td>
- <td><span id="completedCartItemAdjustment_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></span></td>
- <td align="right"><span id="completedCartItemSubTotal_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></span></td>
+ <td><span id="completedCartItemAdjustment_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></span></td>
+ <td><span id="completedCartItemSubTotal_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /></span></td>
</tr>
- <#assign itemCount = itemCount + 1>
+ <#assign itemCount = itemCount + 1 />
</#list>
</tbody>
</table>
@@ -68,27 +68,27 @@
<tbody>
<tr id="completedCartSubtotalRow">
<th scope="row">${uiLabelMap.CommonSubtotal}</th>
- <td><div id="completedCartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="completedCartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td>
</tr>
- <#assign orderAdjustmentsTotal = 0>
+ <#assign orderAdjustmentsTotal = 0 />
<#list shoppingCart.getAdjustments() as cartAdjustment>
<#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal())>
</#list>
<tr id="completedCartDiscountRow">
<th scope="row">${uiLabelMap.ProductDiscount}</th>
- <td><input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount"/><div id="completedCartDiscount"><@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="completedCartDiscount"><input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount" /><@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderShippingAndHandling}</th>
- <td><div id="completedCartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="completedCartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderSalesTax}</th>
- <td><div id="completedCartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="completedCartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderGrandTotal}</th>
- <td><div id="completedCartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="completedCartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></td>
</tr>
</tbody>
</table>
@@ -113,19 +113,19 @@
</tr>
</thead>
<tbody id="updateBody">
- <#assign itemCount = 0>
+ <#assign itemCount = 0 />
<#list shoppingCart.items() as cartLine>
- <#assign cartLineIndex = itemCount>
- <#assign productId = cartLineIndex>
+ <#assign cartLineIndex = itemCount />
+ <#assign productId = cartLineIndex />
<tr id="cartItemRow_${cartLineIndex}">
<td>
<#if cartLine.getProductId()?exists>
<#if cartLine.getParentProductId()?exists>
- <#assign parentProductId = cartLine.getParentProductId()/>
+ <#assign parentProductId = cartLine.getParentProductId() />
<#else>
- <#assign parentProductId = cartLine.getProductId()/>
+ <#assign parentProductId = cartLine.getProductId() />
</#if>
- <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists />
<#if !smallImageUrl?string?has_content><#assign smallImageUrl = ""></#if>
<#if smallImageUrl?string?has_content>
<img src="<@o...@ofbizContentUrl>" alt="Product Image" />
@@ -133,7 +133,7 @@
</#if>
</td>
<td>${cartLine.getName()?if_exists}</td>
- <td><div id="itemUnitPrice_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="itemUnitPrice_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency() /></td>
<td>
<#if cartLine.getIsPromo()>
${cartLine.getQuantity()?string.number}
@@ -144,16 +144,16 @@
</#if>
</td>
<#if !cartLine.getIsPromo()>
- <td><div id="addPromoCode_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="addPromoCode_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td>
<#else>
- <td><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></td>
+ <td><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency() /></td>
</#if>
- <td><div id="displayItem_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="displayItem_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency() /></td>
<#if !cartLine.getIsPromo()>
- <td><a href="javascript:void(0);"><img id="remove_${cartLineIndex?if_exists}" src="<@o...@ofbizContentUrl>" alt="Remove Item Image"/></a></td>
+ <td><a href="javascript:void(0);"><img id="remove_${cartLineIndex?if_exists}" src="<@o...@ofbizContentUrl>" alt="Remove Item Image" /></a></td>
</#if>
</tr>
- <#assign itemCount = itemCount + 1>
+ <#assign itemCount = itemCount + 1 />
</#list>
</tbody>
</table>
@@ -161,40 +161,37 @@
<tbody>
<tr>
<th scope="row">${uiLabelMap.CommonSubtotal}</th>
- <td><div id="cartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="cartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal() isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.ProductDiscount}</th>
- <td>
- <div id="cartDiscountValue">
- <#assign orderAdjustmentsTotal = 0>
+ <td id="cartDiscountValue">
+ <#assign orderAdjustmentsTotal = 0 />
<#list shoppingCart.getAdjustments() as cartAdjustment>
- <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal())>
+ <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal()) />
</#list>
- <@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency()/>
- </div>
+ <@ofbizCurrency amount=orderAdjustmentsTotal isoCode=shoppingCart.getCurrency() />
</td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderShippingAndHandling}</th>
- <td><div id="cartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="cartTotalShipping"><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderSalesTax}</th>
- <td><div id="cartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="cartTotalSalesTax"><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
<th scope="row">${uiLabelMap.OrderGrandTotal}</th>
- <td><div id="cartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></div></td>
+ <td id="cartDisplayGrandTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency() /></td>
</tr>
</tbody>
</table>
</fieldset>
<fieldset id="productPromoCodeFields">
- <legend></legend>
<div>
<label for="productPromoCode">${uiLabelMap.EcommerceEnterPromoCode}</label>
- <input id="productPromoCode" name="productPromoCode" type="text" value=""/>
+ <input id="productPromoCode" name="productPromoCode" type="text" value="" />
</div>
</fieldset>
</form>
@@ -209,7 +206,7 @@
<div id="shippingPanel" class="screenlet">
<h3>${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}</h3>
<div id="shippingSummaryPanel" style="display: none;">
- <div class="buttons"><a href="javascript:void(0);" id="openShippingPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
+ <a href="javascript:void(0);" id="openShippingPanel" class="buttons">${uiLabelMap.EcommerceClickHereToEdit}</a>
<div id="shippingCompleted">
<ul>
<li>
@@ -236,21 +233,21 @@
<div id="editShippingPanel" style="display: none;">
<form id="shippingForm" action="<@o...@ofbizUrl>" method="post">
<fieldset>
- <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="${partyId?if_exists}"/>
- <input type="hidden" id="shipToPhoneContactMechId" name="shipToPhoneContactMechId" value="${(shipToTelecomNumber.contactMechId)?if_exists}"/>
- <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="CUSTOMER"/>
- <input type="hidden" id="shipToPhoneContactMechPurposeTypeId" name="contactMechPurposeTypeId" value="PHONE_SHIPPING"/>
+ <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="${partyId?if_exists}" />
+ <input type="hidden" id="shipToPhoneContactMechId" name="shipToPhoneContactMechId" value="${(shipToTelecomNumber.contactMechId)?if_exists}" />
+ <input type="hidden" id="emailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}" />
+ <input type="hidden" name="roleTypeId" value="CUSTOMER" />
+ <input type="hidden" id="shipToPhoneContactMechPurposeTypeId" name="contactMechPurposeTypeId" value="PHONE_SHIPPING" />
<#if userLogin?exists>
- <input type="hidden" name="keepAddressBook" value="Y"/>
- <input type="hidden" name="setDefaultShipping" value="Y"/>
- <input type="hidden" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId!}"/>
- <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
- <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
+ <input type="hidden" name="keepAddressBook" value="Y" />
+ <input type="hidden" name="setDefaultShipping" value="Y" />
+ <input type="hidden" name="userLoginId" id="userLoginId" value="${userLogin.userLoginId?if_exists}" />
+ <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+ <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
<#else>
- <input type="hidden" name="keepAddressBook" value="N"/>
+ <input type="hidden" name="keepAddressBook" value="N" />
</#if>
</fieldset>
<div id="shippingFormServerError" class="errorMessage"></div>
@@ -259,13 +256,13 @@
<label for="firstName">${uiLabelMap.PartyFirstName}*
<span id="advice-required-firstName" style="display: none" class="errorMessage"> (required)</span>
</label>
- <input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}"/>
+ <input id="firstName" name="firstName" class="required" type="text" value="${firstName?if_exists}" />
</span>
<span>
<label for="lastName">${uiLabelMap.PartyLastName}*
<span id="advice-required-lastName" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}"/>
+ <input id="lastName" name="lastName" class="required" type="text" value="${lastName?if_exists}" />
</span>
</div>
<div>
@@ -274,46 +271,46 @@
<label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="countryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="areaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="contactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
</span>
<span>
<label for="shipToExtension">${uiLabelMap.PartyExtension}</label>
- <input name="extension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="extension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="3" />
</span>
<#else>
<span>
<label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="countryCode" class="required" id="shipToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="countryCode" class="required" id="shipToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="areaCode" class="required" id="shipToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="areaCode" class="required" id="shipToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="contactNumber" class="required" id="shipToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="contactNumber" class="required" id="shipToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
</span>
<span>
<label for="shipToExtension">${uiLabelMap.PartyExtension}</label>
- <input name="extension" id="shipToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="extension" id="shipToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" />
</span>
</#if>
</div>
@@ -322,7 +319,7 @@
<label for="emailAddress">${uiLabelMap.PartyEmailAddress}*
<span id="advice-required-emailAddress" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress?if_exists}"/>
+ <input id="emailAddress" name="emailAddress" class="required validate-email" maxlength="255" size="40" type="text" value="${emailAddress?if_exists}" />
</span>
</div>
<div>
@@ -330,13 +327,13 @@
<label for="shipToAddress1">${uiLabelMap.PartyAddressLine1}*
<span id="advice-required-shipToAddress1" class="custom-advice errorMessage" style="display:none"> (required)</span>
</label>
- <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}" maxlength="255" size="40"/>
+ <input id="shipToAddress1" name="shipToAddress1" class="required" type="text" value="${shipToAddress1?if_exists}" maxlength="255" size="40" />
</span>
</div>
<div>
<span>
<label for="shipToAddress2">${uiLabelMap.PartyAddressLine2}</label>
- <input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2?if_exists}" maxlength="255" size="40"/>
+ <input id="shipToAddress2" name="shipToAddress2" type="text" value="${shipToAddress2?if_exists}" maxlength="255" size="40" />
</span>
</div>
<div>
@@ -344,7 +341,7 @@
<label for="shipToCity">${uiLabelMap.CommonCity}*
<span id="advice-required-shipToCity" class="custom-advice errorMessage" style="display:none"> (required)</span>
</label>
- <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}" maxlength="255" size="40"/>
+ <input id="shipToCity" name="shipToCity" class="required" type="text" value="${shipToCity?if_exists}" maxlength="255" size="40" />
</span>
</div>
<div>
@@ -352,7 +349,7 @@
<label for="shipToPostalCode">${uiLabelMap.PartyZipCode}*
<span id="advice-required-shipToPostalCode" class="custom-advice errorMessage" style="display:none"> (required)</span>
</label>
- <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10"/>
+ <input id="shipToPostalCode" name="shipToPostalCode" class="required" type="text" value="${shipToPostalCode?if_exists}" size="12" maxlength="10" />
</span>
</div>
<div>
@@ -361,8 +358,8 @@
<span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (required)</span>
</label>
<select name="countryGeoId" id="shipToCountryGeoId">
- <#if shipToCountryGeoId??>
- <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(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>
@@ -375,7 +372,7 @@
</label>
<select id="shipToStateProvinceGeoId" name="shipToStateProvinceGeoId">
<#if shipToStateProvinceGeoId?has_content>
- <option value='${shipToStateProvinceGeoId!}'>${shipToStateProvinceGeo!(shipToStateProvinceGeoId!)}</option>
+ <option value='${shipToStateProvinceGeoId?if_exists}'>${shipToStateProvinceGeo?default(shipToStateProvinceGeoId?if_exists)}</option>
<#else>
<option value="_NA_">${uiLabelMap.PartyNoState}</option>
</#if>
@@ -395,7 +392,7 @@
<div id="shippingOptionPanel" class="screenlet">
<h3>${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</h3>
<div id="shippingOptionSummaryPanel" class="screenlet-body" style="display: none;">
- <div class="buttons"><a href="javascript:void(0);" id="openShippingOptionPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
+ <a href="javascript:void(0);" id="openShippingOptionPanel" class="buttons">${uiLabelMap.EcommerceClickHereToEdit}</a>
<div class="completed" id="shippingOptionCompleted">
<ul>
<li>${uiLabelMap.CommonMethod}</li>
@@ -430,7 +427,7 @@
<div id="billingPanel" class="screenlet">
<h3>${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</h3>
<div id="billingSummaryPanel" class="screenlet-body" style="display: none;">
- <div class="buttons"><a href="javascript:void(0);" id="openBillingPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></div>
+ <a href="javascript:void(0);" id="openBillingPanel" class="buttons">${uiLabelMap.EcommerceClickHereToEdit}</a>
<div class="completed" id="billingCompleted">
<ul>
<li>
@@ -460,22 +457,22 @@
<div id="editBillingPanel" class="screenlet-body" style="display: none;">
<form id="billingForm" class="theform" action="<@o...@ofbizUrl>" method="post">
<fieldset class="col">
- <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="${expireDate?if_exists}"/>
- <input type="hidden" name="roleTypeId" value="CUSTOMER"/>
- <input type="hidden" id="billToPhoneContactMechPurposeTypeId" name="contactMechPurposeTypeId" value="PHONE_BILLING"/>
- <input type="hidden" id="billToPhoneContactMechId" name="billToPhoneContactMechId" value="${(billToTelecomNumber.contactMechId)?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="${expireDate?if_exists}" />
+ <input type="hidden" name="roleTypeId" value="CUSTOMER" />
+ <input type="hidden" id="billToPhoneContactMechPurposeTypeId" name="contactMechPurposeTypeId" value="PHONE_BILLING" />
+ <input type="hidden" id="billToPhoneContactMechId" name="billToPhoneContactMechId" value="${(billToTelecomNumber.contactMechId)?if_exists}" />
<#if userLogin?exists>
- <input type="hidden" name="keepAddressBook" value="Y"/>
- <input type="hidden" name="setDefaultBilling" value="Y"/>
- <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request)/>
- <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}"/>
+ <input type="hidden" name="keepAddressBook" value="Y" />
+ <input type="hidden" name="setDefaultBilling" value="Y" />
+ <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) />
+ <input type="hidden" name="productStoreId" value="${productStoreId?if_exists}" />
<#else>
- <input type="hidden" name="keepAddressBook" value="N"/>
+ <input type="hidden" name="keepAddressBook" value="N" />
</#if>
<div id="billingFormServerError" class="errorMessage"></div>
<div>
@@ -483,13 +480,13 @@
<label for="firstNameOnCard">${uiLabelMap.PartyFirstName}*
<span id="advice-required-firstNameOnCard" style="display: none;" class="errorMessage"> (required)</span>
</label>
- <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard?if_exists}"/>
+ <input id="firstNameOnCard" name="firstNameOnCard" class="required" type="text" value="${firstNameOnCard?if_exists}" />
</span>
<span>
<label for="lastNameOnCard">${uiLabelMap.PartyLastName}*
<span id="advice-required-lastNameOnCard" style="display: none;" class="errorMessage"> (required)</span>
</label>
- <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard?if_exists}"/>
+ <input id="lastNameOnCard" name="lastNameOnCard" class="required" type="text" value="${lastNameOnCard?if_exists}" />
</span>
</div>
<div>
@@ -498,46 +495,46 @@
<label for="billToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="countryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="areaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="contactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
</span>
<span>
<label for="billToExtension">${uiLabelMap.PartyExtension}</label>
- <input name="extension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="extension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="3" />
</span>
<#else>
<span>
<label for="billToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="countryCode" class="required" id="billToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="countryCode" class="required" id="billToCountryCode" value="${parameters.countryCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="areaCode" class="required" id="billToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="areaCode" class="required" id="billToAreaCode" value="${parameters.areaCode?if_exists}" size="5" maxlength="3" /> -
</span>
<span>
<label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input name="contactNumber" class="required" id="billToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="contactNumber" class="required" id="billToContactNumber" value="${parameters.contactNumber?if_exists}" size="10" maxlength="7" /> -
</span>
<span>
<label for="billToExtension">${uiLabelMap.PartyExtension}</label>
- <input name="extension" id="billToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="extension" id="billToExtension" value="${parameters.extension?if_exists}" size="5" maxlength="3" />
</span>
</#if>
</div>
@@ -555,11 +552,11 @@
<label for="cardNumber">${uiLabelMap.AccountingCardNumber}*
<span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (required)</span>
</label>
- <input id="cardNumber" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16"/>
+ <input id="cardNumber" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" />
</span>
<span>
<label for="CVV2">CVV2</label>
- <input id="CVV2" name="cardSecurityCode" size="4" type="text" maxlength="4" value=""/>
+ <input id="CVV2" name="cardSecurityCode" size="4" type="text" maxlength="4" value="" />
</span>
</div>
<div>
@@ -575,7 +572,7 @@
</select>
</span>
<span>
- <label for="expYear"> ${uiLabelMap.CommonYear}:*
+ <label for="expYear">${uiLabelMap.CommonYear}:*
<span id="advice-required-expYear" style="display:none" class="errorMessage"> (required)</span>
</label>
<select id="expYear" name="expYear" class="required">
@@ -596,31 +593,31 @@
<label for="billToAddress1">${uiLabelMap.PartyAddressLine1}*
<span id="advice-required-billToAddress1" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}"/>
+ <input id="billToAddress1" name="billToAddress1" class="required" size="30" type="text" value="${billToAddress1?if_exists}" />
</div>
<div>
<label for="billToAddress2" style="margin-top: 9px;">${uiLabelMap.PartyAddressLine2}</label>
- <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30"/>
+ <input id="billToAddress2" name="billToAddress2" type="text" value="${billToAddress2?if_exists}" size="30" />
</div>
<div>
<label for="billToCity">${uiLabelMap.CommonCity}*
<span id="advice-required-billToCity" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}"/>
+ <input id="billToCity" name="billToCity" class="required" type="text" value="${billToCity?if_exists}" />
</div>
<div>
<label for="billToPostalCode">${uiLabelMap.PartyZipCode}*
<span id="advice-required-billToPostalCode" style="display:none" class="errorMessage"> (required)</span>
</label>
- <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10"/>
+ <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10" />
</div>
<div>
<label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (required)</span>
</label>
<select name="countryGeoId" id="billToCountryGeoId">
- <#if billToCountryGeoId??>
- <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(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>
@@ -631,7 +628,7 @@
</label>
<select id="billToStateProvinceGeoId" name="billToStateProvinceGeoId">
<#if billToStateProvinceGeoId?has_content>
- <option value='${billToStateProvinceGeoId!}'>${billToStateProvinceGeo!(billToStateProvinceGeoId!)}</option>
+ <option value='${billToStateProvinceGeoId?if_exists}'>${billToStateProvinceGeo?default(billToStateProvinceGeoId?if_exists)}</option>
<#else>
<option value="_NA_">${uiLabelMap.PartyNoState}</option>
</#if>
@@ -652,10 +649,12 @@
<h3>${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</h3>
<div id="orderSubmitPanel" style="display: none;">
<form id="orderSubmitForm" action="<@o...@ofbizUrl>" method="post">
+ <fieldset>
<div class="buttons">
<input type="button" id="processOrderButton" name="processOrderButton" value="${uiLabelMap.OrderSubmitOrder}" />
<input type="button" style="display: none;" id="processingOrderButton" name="processingOrderButton" value="${uiLabelMap.OrderSubmittingOrder}" />
</div>
+ </fieldset>
</form>
</div>
</div>
@@ -665,20 +664,12 @@
<#-- ========================================================================================================================== -->
<div id="emptyCartCheckoutPanel" <#if shoppingCart?has_content && shoppingCart.size() gt 0> style="display: none;"</#if>>
<div>
- <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="<@o...@ofbizUrl>">here</a> to view our products.</div>
- </div><br/>
- <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">${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</div></div>
- </div><br/>
- <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">${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</div></div>
+ <h3>${uiLabelMap.EcommerceStep} 1: ${uiLabelMap.PageTitleShoppingCart}</h3>
+ <span>You currently have no items in your cart. Click <a href="<@o...@ofbizUrl>">here</a> to view our products.</span>
+ <h3>${uiLabelMap.EcommerceStep} 2: ${uiLabelMap.FacilityShipping}</h3>
+ <h3>${uiLabelMap.EcommerceStep} 3: ${uiLabelMap.PageTitleShippingOptions}</h3>
+ <h3>${uiLabelMap.EcommerceStep} 4: ${uiLabelMap.AccountingBilling}</h3>
+ <h3>${uiLabelMap.EcommerceStep} 5: ${uiLabelMap.OrderSubmitOrder}</h3>
</div>
</div>
</div>
\ No newline at end of file