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

Better UI for changing addresses. Prevent bad things from happening if the user delete required fields.

Browse source
This commit is contained in:
Colin Kuskie 2010-05-10 17:19:01 -07:00
parent 18301e3bfd
commit 22d6806dfe
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -702,8 +702,9 @@ Updates the cart totals, the address fields and the shipping and billing options
=cut
sub updateFromForm {
my $self = shift;
my $form = $self->session->form;
my $self = shift;
my $session = $self->session;
my $form = $session->form;
foreach my $item (@{$self->getItems}) {
if ($form->get("quantity-".$item->getId) ne "") {
eval { $item->setQuantity($form->get("quantity-".$item->getId)) };
@ -740,7 +741,7 @@ sub updateFromForm {
my $address = $self->getBillingAddress();
$address->update(\%billingData);
}
elsif ($billingAddressId ne 'new_address' && $billingAddressId) {
elsif ($billingAddressId ne 'new_address' && $billingAddressId ne 'update_address' && $billingAddressId) {
##User changed the address selector to another address field
$cartProperties->{billingAddressId} = $billingAddressId;
}
@ -775,7 +776,7 @@ sub updateFromForm {
my $address = $self->getBillingAddress();
$address->update(\%shippingData);
}
elsif ($shippingAddressId ne 'new_address' && $shippingAddressId) {
elsif ($shippingAddressId ne 'new_address' && $shippingAddressId ne 'update_address' && $shippingAddressId) {
$cartProperties->{shippingAddressId} = $shippingAddressId;
}
else {
@ -1117,7 +1118,7 @@ sub www_view {
my $billingAddressId = $self->get('billingAddressId');
if ($billingAddressId) {
$billingAddressOptions{'update_address'} = $i18n->get('Update this address');
$billingAddressOptions{'update_address'} = sprintf $i18n->get('Update %s'), $self->getBillingAddress->get('label');
}
%billingAddressOptions = (%billingAddressOptions, %addressOptions);
@ -1133,7 +1134,7 @@ sub www_view {
my $shippingAddressId = $self->get('shippingAddressId');
if ($shippingAddressId) {
$shippingAddressOptions{'update_address'} = $i18n->get('Update this address');
$shippingAddressOptions{'update_address'} = sprintf $i18n->get('Update %s'), $self->getShippingAddress->get('label');
}
%shippingAddressOptions = (%shippingAddressOptions, %addressOptions);

6
lib/WebGUI/i18n/English/Shop.pm
View file

@ -1761,10 +1761,10 @@ our $I18N = {
context => q|form label for the cart. Allows user to build a new address.|
},
'Update this address' => {
message => q|Update this address|,
'Update %s' => {
message => q|Update address: %s|,
lastUpdated => 0,
context => q|form label for the cart. Allows user to build a new address.|
context => q|form label for the cart. Allows user to edit an existing address. %s will be replaced by the label for the currently selected address, if there is one.|
},
'Choose a payment method' => {