svn commit: r500739 - in /ofbiz/trunk/applications/ecommerce/webapp/ecommerce: order/checkoutshippingoptions.ftl order/optionsettings.ftl order/quickAnonOptionSettings.ftl order/splitship.ftl shoppinglist/editShoppingList.ftl

[lektran]

Author: lektran
Date: Sat Jan 27 19:10:19 2007
New Revision: 500739

URL: http://svn.apache.org/viewvc?view=rev&rev=500739
Log:
UPS Shipping options no longer show ($1.00) when an estimate is unavailable, OFBIZ-141 reported by Tim Ruppert
(This is also a test for my first commit)

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?view=diff&rev=500739&r1=500738&r2=500739
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Sat Jan 27 19:10:19 2007
@@ -91,7 +91,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>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=500739&r1=500738&r2=500739
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl Sat Jan 27 19:10:19 2007
@@ -37,7 +37,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>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?view=diff&rev=500739&r1=500738&r2=500739
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Sat Jan 27 19:10:19 2007
@@ -85,7 +85,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>

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?view=diff&rev=500739&r1=500738&r2=500739
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Sat Jan 27 19:10:19 2007
@@ -98,7 +98,7 @@
                           ${carrierShipmentMethod.description?if_exists}
                           <#if shippingEst?has_content>
                             &nbsp;-&nbsp;
-                            <#if (shippingEst > -1)?exists>
+                            <#if (shippingEst > -1)>
                               <@ofbizCurrency amount=shippingEst isoCode=cart.getCurrency()/>
                             <#else>
                               ${uiLabelMap.OrderCalculatedOffline}

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?view=diff&rev=500739&r1=500738&r2=500739
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Sat Jan 27 19:10:19 2007
@@ -233,7 +233,7 @@
                           ${shipMeth.description?if_exists}
                           <#if shippingEst?has_content>
                             &nbsp;-&nbsp;
-                            <#if (shippingEst > -1)?exists>
+                            <#if (shippingEst > -1)>
                               <@ofbizCurrency amount=shippingEst isoCode=listCart.getCurrency()/>
                             <#else>
                               ${uiLabelMap.OrderCalculatedOffline}