From 78fab2dcaf26651143add2c80f9859dd78a2fdda Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 23 Apr 2010 10:51:17 -0700 Subject: [PATCH] Do not display any shipping information unless a product in the cart requires it. Code with template changes. --- .../default-shopping-cart-template.wgpkg | Bin 3761 -> 3856 bytes lib/WebGUI/Shop/Cart.pm | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/upgrades/packages-7.9.4/default-shopping-cart-template.wgpkg b/docs/upgrades/packages-7.9.4/default-shopping-cart-template.wgpkg index 5ea9fc86778b3f005ab3d61681f686453ffcf3a9..dcd1953ae16fd345d033e4eeec64ba5269e49612 100644 GIT binary patch literal 3856 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 ST>>kWz<&U4l1=phQUCyYTxwDP literal 3761 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 biJxyczDeMl1inciD1rY0ow^wl08jt`F1S*C diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm index 9cbcc3cd1..41230b8ba 100644 --- a/lib/WebGUI/Shop/Cart.pm +++ b/lib/WebGUI/Shop/Cart.pm @@ -785,6 +785,7 @@ sub www_view { } # generate template variables for the items in the cart + my $shippableItemsInCart = 0; foreach my $item (@cartItems) { my $sku = $item->getSku; $sku->applyOptions($item->get("options")); @@ -800,6 +801,7 @@ sub www_view { extras=>q|onclick="this.form.method.value='removeItem';this.form.itemId.value='|.$item->getId.q|';this.form.submit;"|}), shipToButton => WebGUI::Form::submit($session, {value=>$i18n->get("Special shipping"), }), ); + $shippableItemsInCart ||= $properties{isShippable}; my $itemAddress = eval {$item->getShippingAddress}; if ((!WebGUI::Error->caught) && $itemAddress && $address && $itemAddress->getId ne $address->getId) { $properties{shippingAddress} = $itemAddress->getHtmlFormatted; @@ -833,7 +835,8 @@ sub www_view { ? sprintf( '%.2f', $session->setting->get( 'shopCartCheckoutMinimum' ) ) : 0 , - ); + shippableItemsInCart => $shippableItemsInCart, + ); # if there is no shipping address we can't check out # if (WebGUI::Error->caught) {