un-b0rk3d the commerce system

This commit is contained in:
Roy Johnson 2006-03-19 23:51:06 +00:00
parent 0ee2d2ad66
commit 84d43b8d19
4 changed files with 10 additions and 9 deletions

View file

@ -383,8 +383,9 @@ sub www_checkoutSubmit {
# Write transaction to the log with status pending
$transaction = WebGUI::Commerce::Transaction->new($session, 'new');
foreach (@{$currentPurchase->{items}}) {
$transaction->addItem($_->{item}, $_->{quantity});
$transaction->addItem($_->{item}, $_->{quantity});
$amount += ($_->{item}->price * $_->{quantity});
$var->{purchaseDescription} .= $_->{quantity}.' x '.$_->{item}->name.'<br />';
}
@ -451,10 +452,10 @@ sub www_checkoutSubmit {
_clearCheckoutScratch($session);
# If everythings ok show the purchase history
return WebGUI::Operation::execute($session,'viewPurchaseHistory') unless ($checkoutError);
return WebGUI::Operation::TransactionLog::www_viewPurchaseHistory($session) unless ($checkoutError);
# If an error has occurred show the template errorlog
return $session->style->userStyle(WebGUI::Asset::Template->new($session,$session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
return $session->style->userStyle(WebGUI::Asset->newByDynamicClass($session,$session->setting->get("commerceTransactionErrorTemplateId"))->process(\%param));
}
#-------------------------------------------------------------------

View file

@ -34,7 +34,7 @@ sub www_viewPurchaseHistory {
$var{errorMessage} = shift;
@history = @{WebGUI::Commerce::Transaction->transactionsByUser($session->user->userId)};
@history = @{WebGUI::Commerce::Transaction->new($session)->transactionsByUser($session->user->userId)};
foreach (@history) {
%properties = %{$_->get};
$properties{initDate} = $session->datetime->epochToHuman($properties{initDate});