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

More tests, refactor out rate parsing code.

Browse source
This commit is contained in:
Colin Kuskie 2009-10-10 15:06:13 -07:00
parent 829c8ce9d8
commit 4ef66d1a51
2 changed files with 49 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -223,10 +223,9 @@ sub _calculateInsurance {
my ($self, @shippableUnits) = @_;
my $insuranceCost = 0;
return $insuranceCost unless $self->get('addInsurance') && $self->get('insuranceRates');
my @insuranceTable = map { my ($value,$cost) = split /:/, $_; [$value, $cost]; }
split /\r?\n/, $self->get('insuranceRates');
my @insuranceTable = _parseInsuranceRates($self->get('insuranceRates'));
##Sort by decreasing value for easy post processing
@insuranceTable = sort { $b->[0] <=> $a->[0] } @insuranceTable;
@insuranceTable = sort { $a->[0] <=> $b->[0] } @insuranceTable;
foreach my $package (@shippableUnits) {
my $value = 0;
ITEM: foreach my $item (@{ $package }) {
@ -234,18 +233,46 @@ sub _calculateInsurance {
}
my $pricePoint;
POINT: foreach my $point (@insuranceTable) {
if ($value > $point->[0]) {
if ($value < $point->[0]) {
$pricePoint = $point;
last POINT;
}
}
$insuranceCost += defined $pricePoint ? $pricePoint->[1] : 0;
if (!defined $pricePoint) {
$pricePoint = $insuranceTable[-1];
}
$insuranceCost += $pricePoint->[1];
}
return $insuranceCost;
}
#-------------------------------------------------------------------
=head2 _parseInsuranceRates ( $rates )
Take the user entered data, a string, and turn it into an array.
=head3 $rates
The rate data entered by the user. One set of data per line. Each line has the value of
shipment, a colon, and the cost of insuring a shipment of that value.
=cut
sub _parseInsuranceRates {
my $rates = shift;
my @lines = split /\r?\n/, $rates;
my @table = ();
foreach my $line (@lines) {
$line =~ s/\s+//g;
my ($value, $cost) = split /:/, $line;
push @table, [ $value, $cost ];
}
return @table;
}
#-------------------------------------------------------------------
=head2 definition ( $session )
This subroutine returns an arrayref of hashrefs, used to validate data put into