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 2008/07/12 12:01:51 UTC
svn commit: r676139 - in /ofbiz/trunk/applications:
ecommerce/webapp/ecommerce/images/checkoutProcess.js
ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
Author: mor
Date: Sat Jul 12 03:01:50 2008
New Revision: 676139
URL: http://svn.apache.org/viewvc?rev=676139&view=rev
Log:
Added Adjustment column on Shopping Cart on One Page Checkout.
Done by Brajesh Patel.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=676139&r1=676138&r2=676139&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Sat Jul 12 03:01:50 2008
@@ -466,10 +466,14 @@
} else {
var itemsHash = $H(data.cartItemData);
var lineTotalId = elementId.sub('qty_','displayItem_');
+ var lineDiscountTotalId = elementId.sub('qty_','addPromoCode_');
var lineItemTotal = itemsHash.get("displayItemSubTotalCurrencyFormatted_"+itemIndex);
+ var lineItemAdjustment = itemsHash.get("displayItemAdjustment_"+itemIndex);
$(lineTotalId).update(lineItemTotal);
+ $(lineDiscountTotalId).update(lineItemAdjustment);
var completedLineItemQtyId = elementId.sub('qty_','completedCartItemQty_');
$(completedLineItemQtyId).update($(elementId).value);
+ $('completedCartItemAdjustment_'+itemIndex).update(lineItemAdjustment);
var completedCartItemSubTotalId = elementId.sub('qty_','completedCartItemSubTotal_');
$(completedCartItemSubTotalId).update(lineItemTotal);
}
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=676139&r1=676138&r2=676139&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sat Jul 12 03:01:50 2008
@@ -37,9 +37,10 @@
<td align="left"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
<td align="center"><div><b>${uiLabelMap.EcommerceUnitPrice}</b></div></td>
<td align="center"><div><b>${uiLabelMap.OrderQuantity}</b></div></td>
+ <td align="center"><div><b>${uiLabelMap.EcommerceAdjustments}</b></div></td>
<td align="right"><div><b>${uiLabelMap.EcommerceItemTotal}</b></div></td>
</tr>
- <tr><td colspan="5"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="6"><hr class="sepbar"/></td></tr>
</thead>
<tbody>
<#assign itemCount = 0>
@@ -59,25 +60,26 @@
<td align="left"><div>${cartLine.getName()?if_exists}</div>
<td align="center"><div>@${cartLine.getDisplayPrice()}</div></td>
<td align="center"><div><span id="completedCartItemQty_${cartLineIndex}">${cartLine.getQuantity()?string.number}</span></div></td>
+ <td align="center"><div><span id="completedCartItemAdjustment_${cartLineIndex}">${cartLine.getOtherAdjustments()?string.number}</span></div></td>
<td align="right"><div id="completedCartItemSubTotal_${cartLineIndex}"><@ofbizCurrency amount=cartLine.getDisplayItemSubTotalNoAdj() isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
- <tr><td colspan="5"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="6"><hr class="sepbar"/></td></tr>
<#assign itemCount = itemCount + 1>
</#list>
<tr id="completedCartSubtotalRow">
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.CommonSubtotal}:</b></div></td>
<#assign initializedSubTotal = shoppingCart.getDisplaySubTotal() - shoppingCart.getProductPromoTotal()>
<td><div id="completedCartSubTotal" align="right"><@ofbizCurrency amount=initializedSubTotal isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
<tr id="completedCartDiscountRow">
<input type="hidden" value="<b>${shoppingCart.getProductPromoTotal()}</b>" id="initializedCompletedCartDiscount"/>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.ProductDiscount}:</b></div></td>
<td><div id="completedCartDiscount" align="right"><@ofbizCurrency amount=shoppingCart.getProductPromoTotal() isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderShippingAndHandling}:</b></div></td>
<td>
<div id="completedCartTotalShipping" align="right">
@@ -89,7 +91,7 @@
</td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderSalesTax}:</b></div></td>
<td>
<div id="completedCartTotalSalesTax" align="right">
@@ -101,7 +103,7 @@
</td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderGrandTotal}:</b></div></td>
<td><div id="completedCartDisplayGrandTotal" align="right"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
@@ -119,10 +121,11 @@
<td align="left"><div><b>${uiLabelMap.CommonDescription}</b></div></td>
<td align="center"><div><b>${uiLabelMap.EcommerceUnitPrice}</b></div></td>
<td align="center"><div><b>${uiLabelMap.OrderQuantity}</b></div></td>
+ <td align="center"><div><b>${uiLabelMap.EcommerceAdjustments}</b></div></td>
<td align="center"><div><b>${uiLabelMap.EcommerceItemTotal}</b></div></td>
<td align="right"><div><b>${uiLabelMap.FormFieldTitle_removeButton}</b></div></td>
</tr>
- <tr><td colspan="6"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
</thead>
<tbody id="updateBody">
<#assign itemCount = 0>
@@ -164,6 +167,11 @@
</div>
</#if>
</td>
+ <#if !cartLine.getIsPromo()>
+ <td nowrap align="center"><div id="addPromoCode_${cartLineIndex}" class="tabletext"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td>
+ <#else>
+ <td nowrap align="center"><div class="tabletext"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></div></td>
+ </#if>
<#if cartLine.getIsPromo()>
<td align="center">FREE</td>
<#else>
@@ -174,17 +182,17 @@
</#if>
</div>
</tr>
- <tr><td colspan="6"><hr class="sepbar"/></td></tr>
+ <tr><td colspan="7"><hr class="sepbar"/></td></tr>
<#assign itemCount = itemCount + 1>
</#list>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.CommonSubtotal}:</b></div></td>
<#assign initializedSubTotal = shoppingCart.getDisplaySubTotal() - shoppingCart.getProductPromoTotal()>
<td><div id="cartSubTotal" align="center"><@ofbizCurrency amount=initializedSubTotal isoCode=shoppingCart.getCurrency()/></div></td>
</tr>
<tr>
- <td colspan="3">
+ <td colspan="4">
<div>${uiLabelMap.EcommerceEnterPromoCode}:
<input id="productPromoCode" class="inputBox" name="productPromoCode" size="22" type="text" value=""/>
</div>
@@ -195,7 +203,7 @@
</td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderShippingAndHandling}:</b></div></td>
<td>
<div id="cartTotalShipping" align="center">
@@ -207,7 +215,7 @@
</td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderSalesTax}:</b></div></td>
<td>
<div id="cartTotalSalesTax" align="center">
@@ -219,7 +227,7 @@
</td>
</tr>
<tr>
- <td colspan="3"></td>
+ <td colspan="4"></td>
<td><div align="right"><b>${uiLabelMap.OrderGrandTotal}:</b></div></td>
<td>
<div id="cartDisplayGrandTotal" align="center">
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=676139&r1=676138&r2=676139&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Sat Jul 12 03:01:50 2008
@@ -859,6 +859,7 @@
int cartLineIndex = shoppingCart.getItemIndex(cartLine);
cartItemData.put("displayItemSubTotal_" + cartLineIndex ,new Double(cartLine.getDisplayItemSubTotal()));
cartItemData.put("displayItemSubTotalCurrencyFormatted_" + cartLineIndex ,org.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getDisplayItemSubTotal(),isoCode,locale));
+ cartItemData.put("displayItemAdjustment_" + cartLineIndex ,org.ofbiz.base.util.UtilFormatOut.formatCurrency(cartLine.getOtherAdjustments(), isoCode, locale));
}
result.put("cartItemData",cartItemData);
}