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

Always show a shipping selector dropdown, unless there are no shipping options available.

Browse source
This commit is contained in:
Colin Kuskie 2010-04-28 22:51:05 -07:00
parent f5ecc2f507
commit a9578eec2c
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Shop/Cart.pm
View file

@ -1018,17 +1018,11 @@ sub www_view {
my $ship = WebGUI::Shop::Ship->new($self->session); my $ship = WebGUI::Shop::Ship->new($self->session);
my $options = $ship->getOptions($self); my $options = $ship->getOptions($self);
my $numberOfOptions = scalar keys %{ $options }; my $numberOfOptions = scalar keys %{ $options };
if ($numberOfOptions < 1) { if (! $numberOfOptions) {
$var{shippingOptions} = ''; $var{shippingOptions} = '';
$var{shippingPrice} = 0; $var{shippingPrice} = 0;
$self->error($i18n->get("No shipping plugins configured")); $self->error($i18n->get("No shipping plugins configured"));
} }
elsif ($numberOfOptions == 1) {
my ($option) = keys %{ $options };
$self->update({ shipperId => $option });
$var{shippingPrice} = $options->{$option}->{hasPrice} ? $self->formatCurrency($options->{$option}->{price}) : '';
$var{shippingOptions} = $options->{$option}->{label};
}
else { else {
tie my %formOptions, 'Tie::IxHash'; tie my %formOptions, 'Tie::IxHash';
$formOptions{''} = $i18n->get('Choose a shipping method'); $formOptions{''} = $i18n->get('Choose a shipping method');
@ -1039,6 +1033,11 @@ sub www_view {
} }
} }
my $shipperId = $self->get('shipperId'); my $shipperId = $self->get('shipperId');
if (!$shipperId && $numberOfOptions == 1) {
my ($option) = keys %{ $options };
$self->update({shipperId => $option});
$shipperId = $option;
}
$var{shippingOptions} = WebGUI::Form::selectBox($session, {name=>"shipperId", options=>\%formOptions, value=>$shipperId || ''}); $var{shippingOptions} = WebGUI::Form::selectBox($session, {name=>"shipperId", options=>\%formOptions, value=>$shipperId || ''});
if (!exists $options->{$shipperId}) { if (!exists $options->{$shipperId}) {
$self->update({shipperId => ''}); $self->update({shipperId => ''});