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

Merge branch 'WebGUI8' of github.com:plainblack/webgui into 8

Browse source 
Conflicts:
	lib/WebGUI.pm
	lib/WebGUI/Auth/WebGUI.pm
	sbin/findBrokenAssets.pl
	sbin/testEnvironment.pl
This commit is contained in:
Doug Bell 2011-05-13 18:20:52 -05:00
commit 677ac978b6
89 changed files with 1064 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Shop/PayDriver.pm
View file

@ -668,7 +668,7 @@ sub www_editSave {
return $session->privilege->insufficient() unless $session->user->isAdmin;
$self->processPropertiesFromFormPost;
$session->http->setRedirect($session->url->page('shop=pay;method=manage'));
$session->response->setRedirect($session->url->page('shop=pay;method=manage'));
return undef;
}

6
lib/WebGUI/Shop/PayDriver/Ogone.pm
View file

@ -350,7 +350,7 @@ sub www_cancelTransaction {
$self->_setPaymentStatus( 0, $form->process('PAYID'), $form->process('STATUS'), 'Cancelled' );
$self->processTransaction( $transaction );
$session->http->setRedirect($self->session->url->getSiteURL.'?shop=cart');
$session->response->setRedirect($self->session->url->getSiteURL.'?shop=cart');
return $session->style->userStyle('Transaction cancelled');
}
@ -373,7 +373,7 @@ sub www_declineTransaction {
$self->_setPaymentStatus( 0, $form->process('PAYID'), $form->process('STATUS'), 'Declined' );
$self->processTransaction( $transaction );
$session->http->setRedirect($self->session->url->getSiteURL.'?shop=cart');
$session->response->setRedirect($self->session->url->getSiteURL.'?shop=cart');
return $session->style->userStyle('Transaction declined');
}
@ -396,7 +396,7 @@ sub www_exceptionTransaction {
$self->_setPaymentStatus( 0, $form->process('PAYID'), $form->process('STATUS'), 'Transaction exception occurred' );
$self->processTransaction( $transaction );
$session->http->setRedirect($self->session->url->getSiteURL.'?shop=cart');
$session->response->setRedirect($self->session->url->getSiteURL.'?shop=cart');
return $session->style->userStyle('A transaction exception occurred.');
}

2
lib/WebGUI/Shop/PayDriver/PayPal/ExpressCheckout.pm
View file

@ -337,7 +337,7 @@ sub www_sendToPayPal {
}
);
return $session->http->setRedirect($dest);
return $session->response->setRedirect($dest);
} ## end sub www_sendToPayPal
=head1 LIMITATIONS

2
lib/WebGUI/Shop/ShipDriver.pm
View file

@ -346,7 +346,7 @@ sub www_editSave {
my $session = $self->session;
return $session->privilege->insufficient() unless $session->user->isAdmin;
$self->processPropertiesFromFormPost;
$session->http->setRedirect($session->url->page('shop=ship;method=manage'));
$session->response->setRedirect($session->url->page('shop=ship;method=manage'));
return undef;
}

2
lib/WebGUI/Shop/TaxDriver/Generic.pm
View file

@ -437,7 +437,7 @@ sub www_exportTax {
return $session->privilege->insufficient unless $self->canManage;
my $storage = $self->exportTaxData();
$self->session->http->setRedirect($storage->getUrl($storage->getFiles->[0]));
$self->session->response->setRedirect($storage->getUrl($storage->getFiles->[0]));
return "redirect";
}