finished session changes to Commerce
This commit is contained in:
parent
991f4bea9f
commit
1f55efc92d
8 changed files with 46 additions and 27 deletions
|
|
@ -92,7 +92,7 @@ sub www_cancelTransaction {
|
|||
my $session = shift;
|
||||
my ($transaction, %var);
|
||||
|
||||
$transaction = WebGUI::Commerce::Transaction->new($session->form->process("tid"));
|
||||
$transaction = WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"));
|
||||
unless ($transaction->status eq 'Completed') {
|
||||
$transaction->cancelTransaction;
|
||||
}
|
||||
|
|
@ -249,7 +249,7 @@ sub www_checkoutSubmit {
|
|||
$plugin->shippingDescription($shippingDescription);
|
||||
|
||||
# Write transaction to the log with status pending
|
||||
$transaction = WebGUI::Commerce::Transaction->new('new');
|
||||
$transaction = WebGUI::Commerce::Transaction->new($session, 'new');
|
||||
foreach (@{$currentPurchase->{items}}) {
|
||||
$transaction->addItem($_->{item}, $_->{quantity});
|
||||
$amount += ($_->{item}->price * $_->{quantity});
|
||||
|
|
@ -329,7 +329,7 @@ sub www_completePendingTransaction {
|
|||
my $session = shift;
|
||||
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
|
||||
|
||||
WebGUI::Commerce::Transaction->new($session->form->process("tid"))->completeTransaction;
|
||||
WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->completeTransaction;
|
||||
|
||||
return WebGUI::Operation::execute('listPendingTransactions');
|
||||
}
|
||||
|
|
@ -352,7 +352,7 @@ sub www_confirmTransaction {
|
|||
$plugin = WebGUI::Commerce::Payment->load($session, $session->form->process("pg"));
|
||||
|
||||
if ($plugin->confirmTransaction) {
|
||||
WebGUI::Commerce::Transaction->new($plugin->getTransactionId)->completeTransaction;
|
||||
WebGUI::Commerce::Transaction->new($session, $plugin->getTransactionId)->completeTransaction;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -540,7 +540,7 @@ sub www_listPendingTransactions {
|
|||
$i18n = WebGUI::International->new($session, "Commerce");
|
||||
|
||||
$p = WebGUI::Paginator->new($session,$session->url->page('op=listPendingTransactions'));
|
||||
$p->setDataByArrayRef(WebGUI::Commerce::Transaction->pendingTransactions);
|
||||
$p->setDataByArrayRef(WebGUI::Commerce::Transaction->pendingTransactions($session));
|
||||
|
||||
$transactions = $p->getPageData;
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ sub www_cancelRecurringTransaction {
|
|||
|
||||
my $i18n = WebGUI::International->new($session, "TransactionLog");
|
||||
|
||||
$transaction = WebGUI::Commerce::Transaction->new($session->form->process("tid"));
|
||||
$transaction = WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"));
|
||||
if ($transaction->isRecurring) {
|
||||
$error = $transaction->cancelTransaction;
|
||||
$message = $i18n->get('cancel error').$error if ($error);
|
||||
|
|
@ -96,7 +96,7 @@ sub www_deleteTransaction {
|
|||
|
||||
$transactionId = $session->form->process("tid");
|
||||
|
||||
WebGUI::Commerce::Transaction->new($transactionId)->delete;
|
||||
WebGUI::Commerce::Transaction->new($session, $transactionId)->delete;
|
||||
|
||||
return WebGUI::Operation::execute('listTransactions');
|
||||
}
|
||||
|
|
@ -106,7 +106,7 @@ sub www_deleteTransactionItem {
|
|||
my $session = shift;
|
||||
return $session->privilege->insufficient unless ($session->user->isInGroup(3));
|
||||
|
||||
WebGUI::Commerce::Transaction->new($session->form->process("tid"))->deleteItem($session->form->process("iid"), $session->form->process("itype"));
|
||||
WebGUI::Commerce::Transaction->new($session, $session->form->process("tid"))->deleteItem($session->form->process("iid"), $session->form->process("itype"));
|
||||
|
||||
return WebGUI::Operation::execute('listTransactions');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue