svn commit: r677265 - in /ofbiz/trunk/applications/ecommerce/webapp/ecommerce: images/checkoutProcess.js order/OnePageCheckoutProcess.ftl

[mor-2]

Author: mor
Date: Wed Jul 16 05:44:39 2008
New Revision: 677265

URL: http://svn.apache.org/viewvc?rev=677265&view=rev
Log:
One Page Checkout Fix : If a user selects a shipping method and go back to edit shipping or cart panel, on returning back to Shipping Option panel we loose the selected shipping method + with browser specific fix to the One Page template. Patch from Brajesh Patel and Sumit Pandit.

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl

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=677265&r1=677264&r2=677265&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/images/checkoutProcess.js Wed Jul 16 05:44:39 2008
@@ -255,6 +255,7 @@
 function getShipOptions() {
     var shipOptions = null;
     var optionList = [];
+    if ($F('shipMethod') == "" || $F('shipMethod') == null) {
     new Ajax.Request('/ecommerce/control/getShipOptions', {
         asynchronous: false,
         onSuccess: function(transport) {
@@ -275,6 +276,7 @@
             }
         }, requestHeaders: {Accept: 'application/json'}
     });
+    }
 }
 
 function setDataInShippingCompleted() {

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=677265&r1=677264&r2=677265&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Wed Jul 16 05:44:39 2008
@@ -57,7 +57,7 @@
                         </#if>
                         <tr id="cartItemDisplayRow_${cartLineIndex}">
                           <td align="left"><div><img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="center" height="20" hspace="0" vspace="0" width="20"></div></td>
-                          <td align="left"><div>${cartLine.getName()?if_exists}</div>
+                          <td align="left"><div>${cartLine.getName()?if_exists}</div></td>
                           <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}"><@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/></span></div></td>
@@ -76,8 +76,7 @@
                         <#assign orderAdjustmentsTotal = orderAdjustmentsTotal + Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(cartAdjustment, shoppingCart.getSubTotal())>
                       </#list>
                       <tr id="completedCartDiscountRow">
-                        <input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount"/>
-                        <td colspan="4"></td>
+                        <td colspan="4"><input type="hidden" value="${orderAdjustmentsTotal}" id="initializedCompletedCartDiscount"/></td>
                         <td><div align="right"><b>${uiLabelMap.ProductDiscount}:</b></div></td>
                         <td>
                           <div id="completedCartDiscount" align="right">
@@ -140,7 +139,6 @@
                             <#assign cartLineIndex = itemCount>
                             <#assign productId = cartLineIndex>
                             <tr id="cartItemRow_${cartLineIndex}">
-                              <div id="updateArea">
                                 <td style="padding: 1px;" align="left" valign="top">
                                   <#if cartLine.getProductId()?exists>
                                     <#if cartLine.getParentProductId()?exists>
@@ -183,7 +181,6 @@
                                 <#if !cartLine.getIsPromo()>
                                   <td align="right"><a href="javascript:void(0);"><img id="remove_${cartLineIndex?if_exists}" src="<@ofbizContentUrl>/ecommerce/images/remove.png</@ofbizContentUrl>" border="0" height="30" hspace="0" vspace="0" width="40"></a></td>
                                 </#if>
-                              </div>
                             </tr>
                             <tr><td colspan="7"><hr class="sepbar"/></td></tr>
                             <#assign itemCount = itemCount + 1>