From fe7f3e0cb20ba98ecadf1ff2ec28be7d04a79cab Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 26 Apr 2010 16:15:45 -0700 Subject: [PATCH] Recalculate totals based on shipping, now that it works correctly. --- .../default-shopping-cart-template.wgpkg | Bin 4005 -> 3998 bytes lib/WebGUI/Shop/Cart.pm | 2 +- 2 files changed, 1 insertion(+), 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 ebef63d3b7ef976c7bb7d2967d427061272d7086..a76453951ae0e73cb39ed6a4c59fac404ec36196 100644 GIT binary patch literal 3998 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 # calculate price adjusted for in-store credit - $var{totalPrice} = $var{subtotalPrice}; # + $var{shippingPrice} + $var{tax}; + $var{totalPrice} = $var{subtotalPrice} + $var{shippingPrice} + $var{tax}; my $credit = WebGUI::Shop::Credit->new($session, $posUser->userId); $var{ inShopCreditAvailable } = $credit->getSum; $var{ inShopCreditDeduction } = $credit->calculateDeduction($var{totalPrice});