From 1208d15943738e80e267609aa88f16ec722aaba9 Mon Sep 17 00:00:00 2001 From: einhverfr Date: Thu, 13 Dec 2007 00:13:37 +0000 Subject: More payment fixes git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1976 4979c152-3d1c-0410-bac9-87ea11338e46 --- scripts/payment.pl | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/payment.pl b/scripts/payment.pl index f11a06c7..4f13e395 100644 --- a/scripts/payment.pl +++ b/scripts/payment.pl @@ -82,20 +82,46 @@ sub payments { $template->render($payment); } -sub post_payments_bulk { +sub check_job { my ($request) = @_; my $payment = LedgerSMB::DBObject::Payment->new({'base' => $request}); - $payment->post_bulk(); + $payment->check_job; my $template = LedgerSMB::Template->new( user => $request->{_user}, locale => $request->{_locale}, path => 'UI/payments', - template => 'payments_filter', + template => 'check_job', format => 'HTML', ); $template->render($payment); } +sub post_payments_bulk { + my ($request) = @_; + my $payment = LedgerSMB::DBObject::Payment->new({'base' => $request}); + $payment->post_bulk(); + my $template; + if ($payment->{queue_payments}){ + $payment->{job_label} = 'Payments'; + $template = LedgerSMB::Template->new( + user => $request->{_user}, + locale => $request->{_locale}, + path => 'UI/payments', + template => 'check_job', + format => 'HTML', + ); + } else { + $template = LedgerSMB::Template->new( + user => $request->{_user}, + locale => $request->{_locale}, + path => 'UI/payments', + template => 'payments_filter', + format => 'HTML', + ); + } + $template->render($payment); +} + sub display_payments { my ($request) = @_; my $payment = LedgerSMB::DBObject::Payment->new({'base' => $request}); -- cgit v1.2.3