Author: mor
Date: Wed Sep 23 11:14:42 2009
New Revision: 818057
URL: http://svn.apache.org/viewvc?rev=818057&view=rev
Log:
Fixed layout of shopping cart (step 1) on One Page Checkout by adding colspan
attribute.
Applied patch from Bharat Soni from jira issue OFBIZ-2960
(https://issues.apache.org/jira/browse/OFBIZ-2960)
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=818057&r1=818056&r2=818057&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
Wed Sep 23 11:14:42 2009
@@ -41,7 +41,7 @@
</thead>
<tfoot>
<tr id="completedCartSubtotalRow">
- <th id="subTotal"
scope="row">${uiLabelMap.CommonSubtotal}</th>
+ <th id="subTotal" scope="row"
colspan="5">${uiLabelMap.CommonSubtotal}</th>
<td headers="subTotal"
id="completedCartSubTotal"><@ofbizCurrency amount=shoppingCart.getSubTotal()
isoCode=shoppingCart.getCurrency() /></td>
</tr>
<#assign orderAdjustmentsTotal = 0 />
@@ -49,19 +49,19 @@
<#assign orderAdjustmentsTotal = orderAdjustmentsTotal +
Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment,
shoppingCart.getSubTotal()) />
</#list>
<tr id="completedCartDiscountRow">
- <th id="productDiscount"
scope="row">${uiLabelMap.ProductDiscount}</th>
+ <th id="productDiscount" scope="row"
colspan="5">${uiLabelMap.ProductDiscount}</th>
<td headers="productDiscount"
id="completedCartDiscount"><input type="hidden"
value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount"
/><@ofbizCurrency amount=orderAdjustmentsTotal
isoCode=shoppingCart.getCurrency() /></td>
</tr>
<tr>
- <th id="shippingAndHandling"
scope="row">${uiLabelMap.OrderShippingAndHandling}</th>
+ <th id="shippingAndHandling" scope="row"
colspan="5">${uiLabelMap.OrderShippingAndHandling}</th>
<td headers="shippingAndHandling"
id="completedCartTotalShipping"><@ofbizCurrency
amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()
/></td>
</tr>
<tr>
- <th id="salesTax"
scope="row">${uiLabelMap.OrderSalesTax}</th>
+ <th id="salesTax" scope="row"
colspan="5">${uiLabelMap.OrderSalesTax}</th>
<td headers="salesTax"
id="completedCartTotalSalesTax"><@ofbizCurrency
amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()
/></td>
</tr>
<tr>
- <th id="grandTotal"
scope="row">${uiLabelMap.OrderGrandTotal}</th>
+ <th id="grandTotal" scope="row"
colspan="5">${uiLabelMap.OrderGrandTotal}</th>
<td headers="grandTotal"
id="completedCartDisplayGrandTotal"><@ofbizCurrency
amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()
/></td>
</tr>
</tfoot>
