From afabf473f4a6b183c1ae4054bc99566699c75348 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 24 Mar 2008 15:19:39 -0500 Subject: [PATCH] Removing old patronimages js check, adding missing patron image variable to script. Signed-off-by: Joshua Ferraro --- .../intranet-tmpl/prog/en/modules/members/boraccount.tmpl | 7 ------- .../intranet-tmpl/prog/en/modules/members/mancredit.tmpl | 7 ------- .../intranet-tmpl/prog/en/modules/members/maninvoice.tmpl | 7 ------- .../prog/en/modules/members/member-flags.tmpl | 7 ------- .../prog/en/modules/members/member-password.tmpl | 7 ------- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl | 7 ------- .../intranet-tmpl/prog/en/modules/members/readingrec.tmpl | 7 ------- members/mancredit.pl | 4 +++- members/maninvoice.pl | 2 ++ members/member-password.pl | 2 ++ members/pay.pl | 2 ++ 11 files changed, 9 insertions(+), 50 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl index 10e067cab1..00a8671865 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl @@ -1,13 +1,6 @@ Koha › Patrons › Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl index acbb9c8c21..a72e320340 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl @@ -1,13 +1,6 @@ Koha › Borrowers › Create Manual Credit - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl index 265d9a611f..d59f85e32c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl @@ -1,13 +1,6 @@ Koha › Borrowers › Create Manual Invoice - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl index 93af845334..bee7b09ea3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl @@ -1,13 +1,6 @@ Koha › Patrons › Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl index 1c6bbe2483..1d51ef8d97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl @@ -1,13 +1,6 @@ Koha › Patrons › <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --> - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl index 74e24da6f7..0afee02eee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl @@ -1,13 +1,6 @@ Koha › Patrons › Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl index d341192cb0..09c1fc8d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl @@ -1,13 +1,6 @@ Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> - diff --git a/members/mancredit.pl b/members/mancredit.pl index 59f63367ec..2705b7dae8 100755 --- a/members/mancredit.pl +++ b/members/mancredit.pl @@ -59,7 +59,9 @@ if ($add){ my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} ); my $category_type = $borrowercategory->{'category_type'}; -( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); +( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); +my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; $template->param( borrowernumber => $borrowernumber, diff --git a/members/maninvoice.pl b/members/maninvoice.pl index 25903f1098..fcb59fced9 100755 --- a/members/maninvoice.pl +++ b/members/maninvoice.pl @@ -78,6 +78,8 @@ if ($add){ my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} ); my $category_type = $borrowercategory->{'category_type'}; ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); +my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; $template->param( borrowernumber => $borrowernumber, diff --git a/members/member-password.pl b/members/member-password.pl index 183d2d3484..4bd4f1ff48 100755 --- a/members/member-password.pl +++ b/members/member-password.pl @@ -79,6 +79,8 @@ if ( $newpassword && ! $errormsg ) { my $borrowercategory = GetBorrowercategory( $bor->{'categorycode'} ); my $category_type = $borrowercategory->{'category_type'}; ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); +my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; $template->param( othernames => $bor->{'othernames'}, surname => $bor->{'surname'}, diff --git a/members/pay.pl b/members/pay.pl index 2ec4ac70d5..f9bdd14532 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -134,6 +134,8 @@ if ( $check == 0 ) { my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} ); my $category_type = $borrowercategory->{'category_type'}; ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' ); +my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; $template->param( allfile => \@allfile, -- 2.39.2