svn commit: r552145 - in /ofbiz/trunk/applications/order: src/org/ofbiz/order/shoppingcart/CheckOutEvents.java webapp/ordermgr/entry/checkoutoptions.ftl

[lektran]

Author: lektran
Date: Sat Jun 30 06:20:49 2007
New Revision: 552145

URL: http://svn.apache.org/viewvc?view=rev&rev=552145
Log:
Fixed a problem with the order manager quick checkout not keeping it's ship address selection, also got rid of the -$1 shipping prices

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?view=diff&rev=552145&r1=552144&r2=552145
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Sat Jun 30 06:20:49 2007
@@ -323,7 +323,7 @@
             selectedPaymentMethods.put("EXT_BILLACT", billingAccountAmt);
         }
 
-        if (UtilValidate.isEmpty(selectedPaymentMethods)) {
+        if (selectedPaymentMethods == null) {
             return "error";
         }
 

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?view=diff&rev=552145&r1=552144&r2=552145
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Sat Jun 30 06:20:49 2007
@@ -166,7 +166,7 @@
                             <#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
                           </#if>
                           <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists}&nbsp;</#if>${carrierShipmentMethod.description?if_exists}
-                          <#if shippingEst?has_content> - <#if (shippingEst > -1)?exists><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
+                          <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
                         </div>
                       </td>
                     </tr>