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 --- LedgerSMB/DBObject/Payment.pm | 7 ++++++- UI/lib/elements.html | 2 +- UI/lib/ui-header.html | 4 ++++ UI/payments/check_job.html | 36 +++++++++++++++++++++++++++++++++++ UI/payments/payments_detail.html | 2 +- UI/payments/payments_filter.html | 17 +++++++++++++++++ job.pl | 3 +++ scripts/payment.pl | 32 ++++++++++++++++++++++++++++--- sql/modules/Payment.sql | 2 +- utils/process_queue/config.pl | 18 ------------------ utils/process_queue/config.pl.default | 18 ++++++++++++++++++ 11 files changed, 116 insertions(+), 25 deletions(-) create mode 100644 UI/payments/check_job.html create mode 100755 job.pl delete mode 100644 utils/process_queue/config.pl create mode 100644 utils/process_queue/config.pl.default diff --git a/LedgerSMB/DBObject/Payment.pm b/LedgerSMB/DBObject/Payment.pm index abd45de3..8bf22ee9 100644 --- a/LedgerSMB/DBObject/Payment.pm +++ b/LedgerSMB/DBObject/Payment.pm @@ -416,7 +416,7 @@ sub post_bulk { if ($queue_payments){ my ($job_ref) = $self->exec_method( funcname => 'job__create' - ) + ); $self->{job_id} = $job_ref->{job__create}; $self->exec_method( funcname => 'payment_bulk_queue_entry' @@ -429,4 +429,9 @@ sub post_bulk { return $self->{dbh}->commit; } +sub check_job { + my ($self) = @_; + ($self->{job}) = $self->exec_method(funcname => 'job__status'); +} + 1; diff --git a/UI/lib/elements.html b/UI/lib/elements.html index 8b6900c2..4345e7ee 100644 --- a/UI/lib/elements.html +++ b/UI/lib/elements.html @@ -109,7 +109,7 @@ - + diff --git a/UI/lib/ui-header.html b/UI/lib/ui-header.html index 868b44ab..a3f46629 100644 --- a/UI/lib/ui-header.html +++ b/UI/lib/ui-header.html @@ -5,6 +5,10 @@ <?lsmb form.titlebar ? form.titlebar : titlebar ?> + + + diff --git a/UI/payments/check_job.html b/UI/payments/check_job.html new file mode 100644 index 00000000..18f786cc --- /dev/null +++ b/UI/payments/check_job.html @@ -0,0 +1,36 @@ + + +
+
+
+ +
+
+ +
+
+ +
+ + + + diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html index 39a4f334..f926c041 100644 --- a/UI/payments/payments_detail.html +++ b/UI/payments/payments_detail.html @@ -265,7 +265,7 @@ value = count } ?> @@ -104,6 +105,22 @@ +
+ +
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}); diff --git a/sql/modules/Payment.sql b/sql/modules/Payment.sql index aae4917e..f48bd22f 100644 --- a/sql/modules/Payment.sql +++ b/sql/modules/Payment.sql @@ -230,7 +230,7 @@ BEGIN END; $$ LANGUAGE PLPGSQL; -CREATE OR REPLACE FUNCTION job__process_payments(in_job_id int) +CREATE OR REPLACE FUNCTION job__process_payment(in_job_id int) RETURNS bool AS $$ DECLARE queue_record RECORD diff --git a/utils/process_queue/config.pl b/utils/process_queue/config.pl deleted file mode 100644 index c977a2b8..00000000 --- a/utils/process_queue/config.pl +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/perl - -use vars qw($database $db_user - $db_passwd); - -# The databases containing LedgerSMB -our $database = ("ledgersmb"); - -# The user to connect with. This must be a superuser so that set session auth -# works as expected - -our $db_user = "postgres"; - -# The password for the db user: -our $db_passwd = "mypasswd"; - -1; - diff --git a/utils/process_queue/config.pl.default b/utils/process_queue/config.pl.default new file mode 100644 index 00000000..c977a2b8 --- /dev/null +++ b/utils/process_queue/config.pl.default @@ -0,0 +1,18 @@ +#!/usr/bin/perl + +use vars qw($database $db_user + $db_passwd); + +# The databases containing LedgerSMB +our $database = ("ledgersmb"); + +# The user to connect with. This must be a superuser so that set session auth +# works as expected + +our $db_user = "postgres"; + +# The password for the db user: +our $db_passwd = "mypasswd"; + +1; + -- cgit v1.2.3