From f1d2a2e8ef5af50ce2ad88c81ccc1032f9c860fa Mon Sep 17 00:00:00 2001 From: Frank Dillon Date: Sat, 15 Nov 2008 12:04:33 +0000 Subject: [PATCH] Forgot one cleanup item. Transactions now properly redirect to the account module when directly called --- lib/WebGUI/Account.pm | 3 -- lib/WebGUI/Account/Shop.pm | 1 - lib/WebGUI/Shop/Transaction.pm | 89 ++-------------------------------- 3 files changed, 5 insertions(+), 88 deletions(-) diff --git a/lib/WebGUI/Account.pm b/lib/WebGUI/Account.pm index 09b9814ea..c16bb65e0 100644 --- a/lib/WebGUI/Account.pm +++ b/lib/WebGUI/Account.pm @@ -77,9 +77,6 @@ sub appendAccountLinks { }); } - #Pluggin - delete eventually - push(@array, {'options.display' => ''.$i18n->get('my purchases', 'Shop').''}); - #Pluggin - delete eventually if ($session->setting->get('userInvitationsEnabled')) { push @array, { diff --git a/lib/WebGUI/Account/Shop.pm b/lib/WebGUI/Account/Shop.pm index 1eb720fbe..87e107310 100644 --- a/lib/WebGUI/Account/Shop.pm +++ b/lib/WebGUI/Account/Shop.pm @@ -223,7 +223,6 @@ sub www_viewTransaction { return $session->insufficient unless ($transaction->get('userId') eq $session->user->userId); - my $i18n = WebGUI::International->new($session, 'Shop'); my $i18n = WebGUI::International->new($session, 'Shop'); my ($style, $url) = $session->quick(qw(style url)); diff --git a/lib/WebGUI/Shop/Transaction.pm b/lib/WebGUI/Shop/Transaction.pm index faef22dac..eba7c8560 100644 --- a/lib/WebGUI/Shop/Transaction.pm +++ b/lib/WebGUI/Shop/Transaction.pm @@ -527,7 +527,6 @@ sub thankYou { my ($self) = @_; my $i18n = WebGUI::International->new($self->session,'Shop'); - #Otherwise wrap the template into the account layout my $args = [$self,$i18n->get('thank you message')]; my $instance = WebGUI::Content::Account->createInstance($self->session,"shop"); return $instance->displayContent($instance->callMethod("viewTransaction",$args)); @@ -836,22 +835,8 @@ each one in the list. sub www_manageMy { my ($class, $session) = @_; - my %var = (); - my $url = $session->url; - - # build list - foreach my $id (@{$class->getTransactionIdsForUser($session)}) { - my $transaction = $class->new($session, $id); - push @{$var{transactions}}, { - %{$transaction->get}, - viewDetailUrl => $url->page('shop=transaction;method=viewMy;transactionId='.$id), - amount => sprintf("%.2f", $transaction->get('amount')), - }; - } - - # render - my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopMyPurchasesTemplateId")); - return $session->style->userStyle($template->process(\%var)); + my $instance = WebGUI::Content::Account->createInstance($session,"shop"); + return $instance->displayContent($instance->callMethod("managePurchases")); } #------------------------------------------------------------------- @@ -1133,74 +1118,10 @@ Displays transaction detail for a user's purchase. sub www_viewMy { my ($class, $session, $transaction, $notice) = @_; - unless (defined $transaction) { - $transaction = $class->new($session, $session->form->get('transactionId')); - } - return $session->privilege->insufficient unless ($transaction->get('userId') eq $session->user->userId || WebGUI::Shop::Admin->new($session)->isCashier); - my $i18n = WebGUI::International->new($session, 'Shop'); - my ($style, $url) = $session->quick(qw(style url)); - my %var = ( - %{$transaction->get}, - notice => $notice, - cancelRecurringUrl => $url->page('shop=transaction;method=cancelRecurring;transactionId='.$transaction->getId), - amount => sprintf("%.2f", $transaction->get('amount')), - inShopCreditDeduction => sprintf("%.2f", $transaction->get('inShopCreditDeduction')), - taxes => sprintf("%.2f", $transaction->get('taxes')), - shippingPrice => sprintf("%.2f", $transaction->get('shippingPrice')), - shippingAddress => $transaction->formatAddress({ - name => $transaction->get('shippingAddressName'), - address1 => $transaction->get('shippingAddress1'), - address2 => $transaction->get('shippingAddress2'), - address3 => $transaction->get('shippingAddress3'), - city => $transaction->get('shippingCity'), - state => $transaction->get('shippingState'), - code => $transaction->get('shippingCode'), - country => $transaction->get('shippingCountry'), - phoneNumber => $transaction->get('shippingPhoneNumber'), - }), - paymentAddress => $transaction->formatAddress({ - name => $transaction->get('paymentAddressName'), - address1 => $transaction->get('paymentAddress1'), - address2 => $transaction->get('paymentAddress2'), - address3 => $transaction->get('paymentAddress3'), - city => $transaction->get('paymentCity'), - state => $transaction->get('paymentState'), - code => $transaction->get('paymentCode'), - country => $transaction->get('paymentCountry'), - phoneNumber => $transaction->get('paymentPhoneNumber'), - }), - ); - - # items - my @items = (); - foreach my $item (@{$transaction->getItems}) { - my $address = ''; - if ($transaction->get('shippingAddressId') ne $item->get('shippingAddressId')) { - $address = $transaction->formatAddress({ - name => $item->get('shippingAddressName'), - address1 => $item->get('shippingAddress1'), - address2 => $item->get('shippingAddress2'), - address3 => $item->get('shippingAddress3'), - city => $item->get('shippingCity'), - state => $item->get('shippingState'), - code => $item->get('shippingCode'), - country => $item->get('shippingCountry'), - phoneNumber => $item->get('shippingPhoneNumber'), - }); - } - push @items, { - %{$item->get}, - viewItemUrl => $url->page('shop=transaction;method=viewItem;transactionId='.$transaction->getId.';itemId='.$item->getId), - price => sprintf("%.2f", $item->get('price')), - itemShippingAddress => $address, - orderStatus => $i18n->get($item->get('orderStatus')), - }; - } - $var{items} = \@items; - # render - my $template = WebGUI::Asset::Template->new($session, $session->setting->get("shopMyPurchasesDetailTemplateId")); - return $style->userStyle($template->process(\%var)); + my $args = [$transaction,$notice]; + my $instance = WebGUI::Content::Account->createInstance($session,"shop"); + return $instance->displayContent($instance->callMethod("viewTransaction",$args)); } #-------------------------------------------------------------------