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

The current USPS driver only works on domestic shipments.

Browse source
This commit is contained in:
Colin Kuskie 2009-11-05 08:18:10 -08:00
parent 40cec4b855
commit c871c0372d
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@
- fixed #11202: USPS driver does not log authentication errors - fixed #11202: USPS driver does not log authentication errors
- fixed #10985: Survey: can't add multiple choice answer - fixed #10985: Survey: can't add multiple choice answer
- fixed #11197: Survey Edit Console is not i18n'ed - fixed #11197: Survey Edit Console is not i18n'ed
- fixed USPS driver only works on domestic addresses.
7.8.3 7.8.3
- Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows. - Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows.

8
lib/WebGUI/Shop/ShipDriver/USPS.pm
View file

@ -14,7 +14,7 @@ Package WebGUI::Shop::ShipDriver::USPS
=head1 DESCRIPTION =head1 DESCRIPTION
Shipping driver for the United States Postal Service. Shipping driver for the United States Postal Service, domestic shipping services.
=head1 SYNOPSIS =head1 SYNOPSIS
@ -127,6 +127,9 @@ sub calculate {
if (! $self->get('userId')) { if (! $self->get('userId')) {
WebGUI::Error::InvalidParam->throw(error => q{Driver configured without a USPS userId.}); WebGUI::Error::InvalidParam->throw(error => q{Driver configured without a USPS userId.});
} }
if ($cart->getShippingAddress->get('country') ne 'United States') {
WebGUI::Error::InvalidParam->throw(error => q{Driver only handles domestic shipping});
}
my $cost = 0; my $cost = 0;
##Sort the items into shippable bundles. ##Sort the items into shippable bundles.
my @shippableUnits = $self->_getShippableUnits($cart); my @shippableUnits = $self->_getShippableUnits($cart);
@ -428,6 +431,9 @@ sub _getShippableUnits {
} }
else { else {
my $zip = $item->getShippingAddress->get('code'); my $zip = $item->getShippingAddress->get('code');
if ($item->getShippingAddress->get('country') ne 'United States') {
WebGUI::Error::InvalidParam->throw(error => q{Driver only handles domestic shipping});
}
push @{ $looseUnits{$zip} }, $item; push @{ $looseUnits{$zip} }, $item;
} }
} }

20
t/Shop/ShipDriver/USPS.t
View file

@ -23,10 +23,9 @@ use Data::Dumper;
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::ShipDriver::USPS;
plan tests => 65; plan tests => 65;
use_ok('WebGUI::Shop::ShipDriver::USPS')
or die 'Unable to load module WebGUI::Shop::ShipDriver::USPS';
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# Init # Init
@ -224,14 +223,14 @@ my $workAddress = $addressBook->addAddress({
organization => 'Plain Black Corporation', organization => 'Plain Black Corporation',
address1 => '1360 Regent St. #145', address1 => '1360 Regent St. #145',
city => 'Madison', state => 'WI', code => '53715', city => 'Madison', state => 'WI', code => '53715',
country => 'USA', country => 'United States',
}); });
my $wucAddress = $addressBook->addAddress({ my $wucAddress = $addressBook->addAddress({
label => 'wuc', label => 'wuc',
organization => 'Madison Concourse Hotel', organization => 'Madison Concourse Hotel',
address1 => '1 W Dayton St', address1 => '1 W Dayton St',
city => 'Madison', state => 'WI', code => '53703', city => 'Madison', state => 'WI', code => '53703',
country => 'USA', country => 'United States',
}); });
$cart->update({shippingAddressId => $workAddress->getId}); $cart->update({shippingAddressId => $workAddress->getId});
@ -838,6 +837,19 @@ isa_ok($e, 'WebGUI::Error::Shop::RemoteShippingRate', 'calculate throws an excep
$properties->{userId} = $userId; $properties->{userId} = $userId;
$driver->update($properties); $driver->update($properties);
my $dutchAddress = $addressBook->addAddress({
label => 'dutch',
address1 => 'Rotterdamseweg 183C',
city => 'Delft', code => '2629HD',
country => 'Netherlands',
});
$cart->update({shippingAddressId => $dutchAddress->getId});
$cost = eval { $driver->calculate($cart); };
$e = Exception::Class->caught();
isa_ok($e, 'WebGUI::Error::InvalidParam', "calculate won't calculate for foreign countries");
$cart->update({shippingAddressId => $workAddress->getId});
####################################################################### #######################################################################
# #
# _calculateInsurance edge case # _calculateInsurance edge case