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

Fixed the bugfixes to not use stow

Browse source
This commit is contained in:
Roy Johnson 2006-03-19 17:53:49 +00:00
parent 2b5cd42874
commit 18e8de5856
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/WebGUI/Operation/Commerce.pm
View file

@ -285,7 +285,6 @@ sub www_checkoutConfirm {
$shipping = WebGUI::Commerce::Shipping->load($session, $session->scratch->get('shippingMethod')); $shipping = WebGUI::Commerce::Shipping->load($session, $session->scratch->get('shippingMethod'));
$shipping->setOptions(Storable::thaw($session->scratch->get('shippingOptions'))) if ($session->scratch->get('shippingOptions')); $shipping->setOptions(Storable::thaw($session->scratch->get('shippingOptions'))) if ($session->scratch->get('shippingOptions'));
$var{shippingName} = $shipping->name; $var{shippingName} = $shipping->name;
$var{shippingCost} = sprintf('%.2f', $shipping->calc); $var{shippingCost} = sprintf('%.2f', $shipping->calc);
@ -915,9 +914,8 @@ sub www_selectPaymentGateway {
}); });
} }
} elsif (scalar(@$plugins) == 1) { } elsif (scalar(@$plugins) == 1) {
#$session->form->process("paymentGateway") = $plugins->[0]->namespace; my $paymentGateway = $plugins->[0]->namespace;
$session->stow->set("paymentGateway", $plugins->[0]->namespace); return WebGUI::Operation::Commerce::www_selectPaymentGatewaySave($session, $paymentGateway);
return WebGUI::Operation::execute($session,'selectPaymentGatewaySave');
} }
$var{pluginLoop} = \@pluginLoop; $var{pluginLoop} = \@pluginLoop;
@ -945,8 +943,7 @@ Returns the user to the operation C<checkout> when it is done.
sub www_selectPaymentGatewaySave { sub www_selectPaymentGatewaySave {
my $session = shift; my $session = shift;
# shifting stow first because it's only set when one payment gateway is defined my $paymentGateway = shift || $session->form->process("paymentGateway");
my $paymentGateway = $session->stow->get("paymentGateway") || $session->form->process("paymentGateway");
if (WebGUI::Commerce::Payment->load($session, $paymentGateway)->enabled) { if (WebGUI::Commerce::Payment->load($session, $paymentGateway)->enabled) {
$session->scratch->set('paymentGateway', $paymentGateway); $session->scratch->set('paymentGateway', $paymentGateway);
} else { } else {
@ -983,9 +980,9 @@ sub www_selectShippingMethod {
}); });
} }
} elsif (scalar(@$plugins) == 1) { } elsif (scalar(@$plugins) == 1) {
#$session->form->process("shippingMethod") = $plugins->[0]->namespace;
$session->stow->set('shippingMethod', $plugins->[0]->namespace); $session->stow->set('shippingMethod', $plugins->[0]->namespace);
return WebGUI::Operation::execute($session,"selectShippingMethodSave"); my $shippingMethod = $plugins->[0]->namespace;
return WebGUI::Operation::Commerce::www_selectShippingMethodSave($session, $shippingMethod);
} }
$var{pluginLoop} = \@pluginLoop; $var{pluginLoop} = \@pluginLoop;
@ -1016,8 +1013,7 @@ Returns the user to the operation C<checkout> when it is done.
sub www_selectShippingMethodSave { sub www_selectShippingMethodSave {
my $session = shift; my $session = shift;
# Shifting stow first b/c it's only set when one shipping plug-in exists my $shippingMethod = shift || $session->form->process("shippingMethod");
my $shippingMethod = $session->stow->get('shippingMethod') || $session->form->process("shippingMethod");
my $shipping = WebGUI::Commerce::Shipping->load($session, $shippingMethod); my $shipping = WebGUI::Commerce::Shipping->load($session, $shippingMethod);
$shipping->processOptionsForm; $shipping->processOptionsForm;