svn commit: r554534 - in /ofbiz/branches/release4.0/applications/order: src/org/ofbiz/order/shoppingcart/CheckOutEvents.java webapp/ordermgr/entry/checkoutoptions.ftl

[lektran]

Author: lektran
Date: Sun Jul  8 23:34:45 2007
New Revision: 554534

URL: http://svn.apache.org/viewvc?view=rev&rev=554534
Log:
Applied fix from trunk for revision: 552145

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

Modified: 
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?view=diff&rev=554534&r1=554533&r2=554534
==============================================================================
--- 
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
 (original)
+++ 
ofbiz/branches/release4.0/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
 Sun Jul  8 23:34:45 2007
@@ -299,7 +299,7 @@
             selectedPaymentMethods.put("EXT_BILLACT", billingAccountAmt);
         }
 
-        if (UtilValidate.isEmpty(selectedPaymentMethods)) {
+        if (selectedPaymentMethods == null) {
             return "error";
         }
 

Modified: 
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?view=diff&rev=554534&r1=554533&r2=554534
==============================================================================
--- 
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
 (original)
+++ 
ofbiz/branches/release4.0/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl
 Sun Jul  8 23:34:45 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>