oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix shop credit display and calculations in the PayDriver. Fixes bug #11891

Browse source
This commit is contained in:
Colin Kuskie 2010-10-04 14:20:45 -07:00
parent 7f0657927d
commit 82ed3f03b8
3 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -6,6 +6,7 @@
- fixed #11789: Date form reports 1 day earlier on Edit for the time zone corresponding to Europe/Berlin. - fixed #11789: Date form reports 1 day earlier on Edit for the time zone corresponding to Europe/Berlin.
- fixed #11894: Europe London timezone decrements birth date - fixed #11894: Europe London timezone decrements birth date
- fixed #11857: make page printable? - fixed #11857: make page printable?
- fixed #11891: Shop credit not displayed in payment method screen
7.10.1 7.10.1
- fixed #11851: Story Topic: top story variables should be available all the time - fixed #11851: Story Topic: top story variables should be available all the time

2
lib/WebGUI/Shop/PayDriver.pm
View file

@ -101,7 +101,7 @@ sub appendCartVariables {
my $session = $self->session; my $session = $self->session;
my $credit = WebGUI::Shop::Credit->new($session, $cart->getPosUser->userId); my $credit = WebGUI::Shop::Credit->new($session, $cart->getPosUser->userId);
$var->{inShopCreditAvailable} = $credit->getSum; $var->{inShopCreditAvailable} = $credit->getSum;
$var->{inShopCreditDeduction} = $credit->calculateDeduction($var->{totalPrice}); $var->{inShopCreditDeduction} = $credit->calculateDeduction($totalPrice);
$var->{totalPrice } = $cart->formatCurrency($totalPrice + $var->{inShopCreditDeduction}); $var->{totalPrice } = $cart->formatCurrency($totalPrice + $var->{inShopCreditDeduction});
return $self; return $self;
} }

30
t/Shop/PayDriver.t
View file

@ -24,7 +24,10 @@ use HTML::Form;
use WebGUI::Test; # Must use this before any other WebGUI modules use WebGUI::Test; # Must use this before any other WebGUI modules
use WebGUI::Session; use WebGUI::Session;
use WebGUI::Shop::Cart;
use WebGUI::Shop::Credit;
use WebGUI::Shop::PayDriver; use WebGUI::Shop::PayDriver;
use WebGUI::User;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Init # Init
@ -33,7 +36,7 @@ my $session = WebGUI::Test->session;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Tests # Tests
plan tests => 55; plan tests => 56;
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# figure out if the test can actually run # figure out if the test can actually run
@ -475,8 +478,10 @@ my $blue_widget = $widget->setCollateral('variantsJSON', 'variantId', 'new',
); );
$versionTag->commit; $versionTag->commit;
my $credited_user = WebGUI::User->create($session);
$session->user({user => $credited_user});
my $cart = WebGUI::Shop::Cart->newBySession($session); my $cart = WebGUI::Shop::Cart->newBySession($session);
WebGUI::Test->addToCleanup($versionTag, $cart); WebGUI::Test->addToCleanup($versionTag, $cart, $credited_user);
my $addressBook = $cart->getAddressBook; my $addressBook = $cart->getAddressBook;
my $workAddress = $addressBook->addAddress({ my $workAddress = $addressBook->addAddress({
label => 'work', label => 'work',
@ -493,7 +498,6 @@ $widget->addToCart($widget->getCollateral('variantsJSON', 'variantId', $blue_wid
my $cart_variables = {}; my $cart_variables = {};
$driver->appendCartVariables($cart_variables); $driver->appendCartVariables($cart_variables);
diag Dumper($cart_variables);
cmp_deeply( cmp_deeply(
$cart_variables, $cart_variables,
@ -510,6 +514,26 @@ cmp_deeply(
'appendCartVariables: checking shippableItemsInCart and totalPrice & subtotal formatting' 'appendCartVariables: checking shippableItemsInCart and totalPrice & subtotal formatting'
); );
my $credit = WebGUI::Shop::Credit->new($session, $credited_user->userId);
$credit->adjust('1', 'credit for testing');
$cart_variables = {};
$driver->appendCartVariables($cart_variables);
cmp_deeply(
$cart_variables,
{
taxes => ignore(),
shippableItemsInCart => 1,
subtotal => '5.00',
inShopCreditDeduction => '-1.00',
inShopCreditAvailable => '1.00',
totalPrice => '4.00',
shipping => ignore(),
},
'... checking credit display'
);
####################################################################### #######################################################################
# #
# delete # delete