Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v
diff -u -N -r1.12.2.7 -r1.12.2.8
--- openacs-4/packages/ecommerce/www/shopping-cart.tcl	9 Mar 2005 06:32:50 -0000	1.12.2.7
+++ openacs-4/packages/ecommerce/www/shopping-cart.tcl	9 Mar 2005 07:25:05 -0000	1.12.2.8
@@ -198,7 +198,7 @@
             set total_exp_shipping_price [expr $total_exp_shipping_price + ( [lindex $shipping_prices_for_more_line_items 1] * ( $quantity - 1 ) ) ]
 
         }
-    } elseif { $shipping_gateway_in_use && $shipping_address_id > 0} {
+    } elseif { $shipping_gateway_in_use && $shipping_address_id > 0 && [string equal $no_shipping_avail_p "f"] } {
         set shipment_value [expr $shipment_value + [lindex [ec_lowest_price_and_price_name_for_an_item $product_id $user_id $offer_code] 0]]
     }