Bugzilla – Attachment 35918 Details for
Bug 12933
Add ability to print overdue slip from staff intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12933 [QA Followup] - Remove Template plugin and use thereof
Bug-12933-QA-Followup---Remove-Template-plugin-and.patch (text/plain), 33.65 KB, created by
Kyle M Hall
on 2015-02-13 19:11:05 UTC
(
hide
)
Description:
Bug 12933 [QA Followup] - Remove Template plugin and use thereof
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2015-02-13 19:11:05 UTC
Size:
33.65 KB
patch
obsolete
>From d757843c23ba2a2e8d84e7e1b4806439c462f977 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 13 Feb 2015 14:10:35 -0500 >Subject: [PATCH] Bug 12933 [QA Followup] - Remove Template plugin and use thereof > >--- > Koha/Template/Plugin/Borrowers.pm | 10 --- > .../prog/en/includes/members-toolbar.inc | 4 +- > members/boraccount.pl | 59 ++++++++++---------- > members/deletemem.pl | 41 +++++++------ > members/files.pl | 5 +- > members/mancredit.pl | 54 +++++++++--------- > members/maninvoice.pl | 54 +++++++++--------- > members/member-flags.pl | 55 +++++++++--------- > members/member-password.pl | 58 ++++++++++--------- > members/moremember.pl | 1 + > members/notices.pl | 17 +++--- > members/pay.pl | 7 +- > members/paycollect.pl | 13 ++-- > members/readingrec.pl | 59 ++++++++++---------- > members/routing-lists.pl | 52 +++++++++--------- > members/statistics.pl | 15 +++-- > 16 files changed, 257 insertions(+), 247 deletions(-) > >diff --git a/Koha/Template/Plugin/Borrowers.pm b/Koha/Template/Plugin/Borrowers.pm >index 3e2c59b..5220e16 100644 >--- a/Koha/Template/Plugin/Borrowers.pm >+++ b/Koha/Template/Plugin/Borrowers.pm >@@ -23,7 +23,6 @@ use Modern::Perl; > use base qw( Template::Plugin ); > > use Koha::Borrower::Debarments qw(); >-use C4::Members qw(HasOverdues); > > =pod > >@@ -49,13 +48,4 @@ sub IsDebarred { > return Koha::Borrower::Debarments::IsDebarred($borrower->{borrowernumber}); > } > >-sub HasOverdues { >- my ( $self, $borrowernumber ) = @_; >- >- return unless $borrowernumber; >- >- return C4::Members::HasOverdues($borrowernumber); >-} >- >- > 1; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index bcb0a01..80eb9c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -167,8 +167,8 @@ function searchToHold(){ > <ul class="dropdown-menu"> > [% IF ( CAN_user_borrowers ) %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %] > <li><a id="printslip" href="#">Print slip</a></li> >- <li><a id="printquickslip" href="#">Print quick slip[% Borrowers.HasOverdues( borrowernumber ) %]</a></li> >- [% IF Borrowers.HasOverdues( borrowernumber ) %] >+ <li><a id="printquickslip" href="#">Print quick slip</a></li> >+ [% IF has_overdues %] > <li><a id="print_overdues" href="#">Print overdues</a></li> > [% END %] > </ul> >diff --git a/members/boraccount.pl b/members/boraccount.pl >index b9eaad6..79b8e2e 100755 >--- a/members/boraccount.pl >+++ b/members/boraccount.pl >@@ -109,35 +109,36 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettyp > my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; > > $template->param( >- finesview => 1, >- firstname => $data->{'firstname'}, >- surname => $data->{'surname'}, >- othernames => $data->{'othernames'}, >- borrowernumber => $borrowernumber, >- cardnumber => $data->{'cardnumber'}, >- categorycode => $data->{'categorycode'}, >- category_type => $data->{'category_type'}, >- categoryname => $data->{'description'}, >- address => $address, >- address2 => $data->{'address2'}, >- city => $data->{'city'}, >- state => $data->{'state'}, >- zipcode => $data->{'zipcode'}, >- country => $data->{'country'}, >- phone => $data->{'phone'}, >- phonepro => $data->{'phonepro'}, >- mobile => $data->{'mobile'}, >- email => $data->{'email'}, >- emailpro => $data->{'emailpro'}, >- branchcode => $data->{'branchcode'}, >- branchname => GetBranchName($data->{'branchcode'}), >- total => sprintf("%.2f",$total), >- totalcredit => $totalcredit, >- is_child => ($data->{'category_type'} eq 'C'), >- reverse_col => $reverse_col, >- accounts => $accts, >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ has_overdues => HasOverdues($borrowernumber), >+ finesview => 1, >+ firstname => $data->{'firstname'}, >+ surname => $data->{'surname'}, >+ othernames => $data->{'othernames'}, >+ borrowernumber => $borrowernumber, >+ cardnumber => $data->{'cardnumber'}, >+ categorycode => $data->{'categorycode'}, >+ category_type => $data->{'category_type'}, >+ categoryname => $data->{'description'}, >+ address => $address, >+ address2 => $data->{'address2'}, >+ city => $data->{'city'}, >+ state => $data->{'state'}, >+ zipcode => $data->{'zipcode'}, >+ country => $data->{'country'}, >+ phone => $data->{'phone'}, >+ phonepro => $data->{'phonepro'}, >+ mobile => $data->{'mobile'}, >+ email => $data->{'email'}, >+ emailpro => $data->{'emailpro'}, >+ branchcode => $data->{'branchcode'}, >+ branchname => GetBranchName( $data->{'branchcode'} ), >+ total => sprintf( "%.2f", $total ), >+ totalcredit => $totalcredit, >+ is_child => ( $data->{'category_type'} eq 'C' ), >+ reverse_col => $reverse_col, >+ accounts => $accts, >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/members/deletemem.pl b/members/deletemem.pl >index bad636c..1c94dc6 100755 >--- a/members/deletemem.pl >+++ b/members/deletemem.pl >@@ -105,26 +105,29 @@ if ($countissues > 0 or $flags->{'CHARGES'} or $data->{'borrowernumber'} or $de > my ($picture, $dberror) = GetPatronImage($bor->{'borrowernumber'}); > $template->param( picture => 1 ) if $picture; > >- $template->param(borrowernumber => $member, >- surname => $bor->{'surname'}, >- title => $bor->{'title'}, >- cardnumber => $bor->{'cardnumber'}, >- firstname => $bor->{'firstname'}, >- categorycode => $bor->{'categorycode'}, >- category_type => $bor->{'category_type'}, >- categoryname => $bor->{'description'}, >- address => $bor->{'address'}, >- address2 => $bor->{'address2'}, >- city => $bor->{'city'}, >- zipcode => $bor->{'zipcode'}, >- country => $bor->{'country'}, >- phone => $bor->{'phone'}, >- email => $bor->{'email'}, >- branchcode => $bor->{'branchcode'}, >- branchname => GetBranchName($bor->{'branchcode'}), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ $template->param( >+ has_overdues => HasOverdues($borrowernumber), >+ borrowernumber => $member, >+ surname => $bor->{'surname'}, >+ title => $bor->{'title'}, >+ cardnumber => $bor->{'cardnumber'}, >+ firstname => $bor->{'firstname'}, >+ categorycode => $bor->{'categorycode'}, >+ category_type => $bor->{'category_type'}, >+ categoryname => $bor->{'description'}, >+ address => $bor->{'address'}, >+ address2 => $bor->{'address2'}, >+ city => $bor->{'city'}, >+ zipcode => $bor->{'zipcode'}, >+ country => $bor->{'country'}, >+ phone => $bor->{'phone'}, >+ email => $bor->{'email'}, >+ branchcode => $bor->{'branchcode'}, >+ branchname => GetBranchName( $bor->{'branchcode'} ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); >+ > if ($countissues >0) { > $template->param(ItemsOnIssues => $countissues); > } >diff --git a/members/files.pl b/members/files.pl >index efe4ad4..cc6fa2d 100755 >--- a/members/files.pl >+++ b/members/files.pl >@@ -44,7 +44,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > debug => 1, > } > ); >-$template->param( 'borrower_files' => 1 ); >+$template->param( >+ 'borrower_files' => 1, >+ has_overdues => HasOverdues($borrowernumber), >+); > > my $borrowernumber = $cgi->param('borrowernumber'); > my $bf = Koha::Borrower::Files->new( borrowernumber => $borrowernumber ); >diff --git a/members/mancredit.pl b/members/mancredit.pl >index c6ad4de..bc492a2 100755 >--- a/members/mancredit.pl >+++ b/members/mancredit.pl >@@ -96,31 +96,33 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettyp > my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; > > $template->param( >- finesview => 1, >- borrowernumber => $borrowernumber, >- firstname => $data->{'firstname'}, >- surname => $data->{'surname'}, >- othernames => $data->{'othernames'}, >- cardnumber => $data->{'cardnumber'}, >- categorycode => $data->{'categorycode'}, >- category_type => $data->{'category_type'}, >- categoryname => $data->{'description'}, >- address => $address, >- address2 => $data->{'address2'}, >- city => $data->{'city'}, >- state => $data->{'state'}, >- zipcode => $data->{'zipcode'}, >- country => $data->{'country'}, >- phone => $data->{'phone'}, >- phonepro => $data->{'phonepro'}, >- mobile => $data->{'mobile'}, >- email => $data->{'email'}, >- emailpro => $data->{'emailpro'}, >- branchcode => $data->{'branchcode'}, >- branchname => GetBranchName($data->{'branchcode'}), >- is_child => ($data->{'category_type'} eq 'C'), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >- ); >+ has_overdues => HasOverdues($borrowernumber), >+ finesview => 1, >+ borrowernumber => $borrowernumber, >+ firstname => $data->{'firstname'}, >+ surname => $data->{'surname'}, >+ othernames => $data->{'othernames'}, >+ cardnumber => $data->{'cardnumber'}, >+ categorycode => $data->{'categorycode'}, >+ category_type => $data->{'category_type'}, >+ categoryname => $data->{'description'}, >+ address => $address, >+ address2 => $data->{'address2'}, >+ city => $data->{'city'}, >+ state => $data->{'state'}, >+ zipcode => $data->{'zipcode'}, >+ country => $data->{'country'}, >+ phone => $data->{'phone'}, >+ phonepro => $data->{'phonepro'}, >+ mobile => $data->{'mobile'}, >+ email => $data->{'email'}, >+ emailpro => $data->{'emailpro'}, >+ branchcode => $data->{'branchcode'}, >+ branchname => GetBranchName( $data->{'branchcode'} ), >+ is_child => ( $data->{'category_type'} eq 'C' ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), >+ ); >+ > output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/members/maninvoice.pl b/members/maninvoice.pl >index 240c680..1ac0d62 100755 >--- a/members/maninvoice.pl >+++ b/members/maninvoice.pl >@@ -121,32 +121,34 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { > my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); > my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; > >- $template->param( >- finesview => 1, >- borrowernumber => $borrowernumber, >- firstname => $data->{'firstname'}, >- surname => $data->{'surname'}, >- othernames => $data->{'othernames'}, >- cardnumber => $data->{'cardnumber'}, >- categorycode => $data->{'categorycode'}, >- category_type => $data->{'category_type'}, >- categoryname => $data->{'description'}, >- address => $address, >- address2 => $data->{'address2'}, >- city => $data->{'city'}, >- state => $data->{'state'}, >- zipcode => $data->{'zipcode'}, >- country => $data->{'country'}, >- phone => $data->{'phone'}, >- phonepro => $data->{'phonepro'}, >- mobile => $data->{'mobile'}, >- email => $data->{'email'}, >- emailpro => $data->{'emailpro'}, >- branchcode => $data->{'branchcode'}, >- branchname => GetBranchName($data->{'branchcode'}), >- is_child => ($data->{'category_type'} eq 'C'), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ $template->param( >+ has_overdues => HasOverdues($borrowernumber), >+ finesview => 1, >+ borrowernumber => $borrowernumber, >+ firstname => $data->{'firstname'}, >+ surname => $data->{'surname'}, >+ othernames => $data->{'othernames'}, >+ cardnumber => $data->{'cardnumber'}, >+ categorycode => $data->{'categorycode'}, >+ category_type => $data->{'category_type'}, >+ categoryname => $data->{'description'}, >+ address => $address, >+ address2 => $data->{'address2'}, >+ city => $data->{'city'}, >+ state => $data->{'state'}, >+ zipcode => $data->{'zipcode'}, >+ country => $data->{'country'}, >+ phone => $data->{'phone'}, >+ phonepro => $data->{'phonepro'}, >+ mobile => $data->{'mobile'}, >+ email => $data->{'email'}, >+ emailpro => $data->{'emailpro'}, >+ branchcode => $data->{'branchcode'}, >+ branchname => GetBranchName( $data->{'branchcode'} ), >+ is_child => ( $data->{'category_type'} eq 'C' ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); >+ > output_html_with_http_headers $input, $cookie, $template->output; > } >diff --git a/members/member-flags.pl b/members/member-flags.pl >index 68c52aa..cb4fd02 100755 >--- a/members/member-flags.pl >+++ b/members/member-flags.pl >@@ -175,33 +175,34 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { > my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} ); > my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'}; > >-$template->param( >- borrowernumber => $bor->{'borrowernumber'}, >- cardnumber => $bor->{'cardnumber'}, >- surname => $bor->{'surname'}, >- firstname => $bor->{'firstname'}, >- othernames => $bor->{'othernames'}, >- categorycode => $bor->{'categorycode'}, >- category_type => $bor->{'category_type'}, >- categoryname => $bor->{'description'}, >- address => $address, >- address2 => $bor->{'address2'}, >- city => $bor->{'city'}, >- state => $bor->{'state'}, >- zipcode => $bor->{'zipcode'}, >- country => $bor->{'country'}, >- phone => $bor->{'phone'}, >- phonepro => $bor->{'phonepro'}, >- mobile => $bor->{'mobile'}, >- email => $bor->{'email'}, >- emailpro => $bor->{'emailpro'}, >- branchcode => $bor->{'branchcode'}, >- branchname => GetBranchName($bor->{'branchcode'}), >- loop => \@loop, >- is_child => ($bor->{'category_type'} eq 'C'), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >- ); >+ $template->param( >+ has_overdues => HasOverdues($borrowernumber), >+ borrowernumber => $bor->{'borrowernumber'}, >+ cardnumber => $bor->{'cardnumber'}, >+ surname => $bor->{'surname'}, >+ firstname => $bor->{'firstname'}, >+ othernames => $bor->{'othernames'}, >+ categorycode => $bor->{'categorycode'}, >+ category_type => $bor->{'category_type'}, >+ categoryname => $bor->{'description'}, >+ address => $address, >+ address2 => $bor->{'address2'}, >+ city => $bor->{'city'}, >+ state => $bor->{'state'}, >+ zipcode => $bor->{'zipcode'}, >+ country => $bor->{'country'}, >+ phone => $bor->{'phone'}, >+ phonepro => $bor->{'phonepro'}, >+ mobile => $bor->{'mobile'}, >+ email => $bor->{'email'}, >+ emailpro => $bor->{'emailpro'}, >+ branchcode => $bor->{'branchcode'}, >+ branchname => GetBranchName( $bor->{'branchcode'} ), >+ loop => \@loop, >+ is_child => ( $bor->{'category_type'} eq 'C' ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), >+ ); > > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/members/member-password.pl b/members/member-password.pl >index 310d641..9bf3635 100755 >--- a/members/member-password.pl >+++ b/members/member-password.pl >@@ -104,34 +104,36 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { > my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} ); > my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'}; > >- $template->param( othernames => $bor->{'othernames'}, >- surname => $bor->{'surname'}, >- firstname => $bor->{'firstname'}, >- borrowernumber => $bor->{'borrowernumber'}, >- cardnumber => $bor->{'cardnumber'}, >- categorycode => $bor->{'categorycode'}, >- category_type => $bor->{'category_type'}, >- categoryname => $bor->{'description'}, >- address => $address, >- address2 => $bor->{'address2'}, >- city => $bor->{'city'}, >- state => $bor->{'state'}, >- zipcode => $bor->{'zipcode'}, >- country => $bor->{'country'}, >- phone => $bor->{'phone'}, >- phonepro => $bor->{'phonepro'}, >- mobile => $bor->{'mobile'}, >- email => $bor->{'email'}, >- emailpro => $bor->{'emailpro'}, >- branchcode => $bor->{'branchcode'}, >- branchname => GetBranchName($bor->{'branchcode'}), >- userid => $bor->{'userid'}, >- destination => $destination, >- is_child => ($bor->{'category_type'} eq 'C'), >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- minPasswordLength => $minpw, >- RoutingSerials => C4::Context->preference('RoutingSerials'), >- ); >+ $template->param( >+ othernames => $bor->{'othernames'}, >+ has_overdues => HasOverdues($borrowernumber), >+ surname => $bor->{'surname'}, >+ firstname => $bor->{'firstname'}, >+ borrowernumber => $bor->{'borrowernumber'}, >+ cardnumber => $bor->{'cardnumber'}, >+ categorycode => $bor->{'categorycode'}, >+ category_type => $bor->{'category_type'}, >+ categoryname => $bor->{'description'}, >+ address => $address, >+ address2 => $bor->{'address2'}, >+ city => $bor->{'city'}, >+ state => $bor->{'state'}, >+ zipcode => $bor->{'zipcode'}, >+ country => $bor->{'country'}, >+ phone => $bor->{'phone'}, >+ phonepro => $bor->{'phonepro'}, >+ mobile => $bor->{'mobile'}, >+ email => $bor->{'email'}, >+ emailpro => $bor->{'emailpro'}, >+ branchcode => $bor->{'branchcode'}, >+ branchname => GetBranchName( $bor->{'branchcode'} ), >+ userid => $bor->{'userid'}, >+ destination => $destination, >+ is_child => ( $bor->{'category_type'} eq 'C' ), >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ minPasswordLength => $minpw, >+ RoutingSerials => C4::Context->preference('RoutingSerials'), >+ ); > > if( scalar(@errors )){ > $template->param( errormsg => 1 ); >diff --git a/members/moremember.pl b/members/moremember.pl >index 92fe2d9..8be156a 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -358,6 +358,7 @@ my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; > # in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) > $template->param( $data->{'categorycode'} => 1 ); > $template->param( >+ has_overdues => HasOverdues($borrowernumber), > detailview => 1, > AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), > CANDELETEUSER => $candeleteuser, >diff --git a/members/notices.pl b/members/notices.pl >index 113e20c..b39e3fc 100755 >--- a/members/notices.pl >+++ b/members/notices.pl >@@ -67,14 +67,15 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'stre > my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'}; > > $template->param( >- QUEUED_MESSAGES => $queued_messages, >- borrowernumber => $borrowernumber, >- sentnotices => 1, >- branchname => GetBranchName($borrower->{'branchcode'}), >- categoryname => $borrower->{'description'}, >- address => $address, >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ has_overdues => HasOverdues($borrowernumber), >+ QUEUED_MESSAGES => $queued_messages, >+ borrowernumber => $borrowernumber, >+ sentnotices => 1, >+ branchname => GetBranchName( $borrower->{'branchcode'} ), >+ categoryname => $borrower->{'description'}, >+ address => $address, >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/members/pay.pl b/members/pay.pl >index 381cf31..ce13f79 100755 >--- a/members/pay.pl >+++ b/members/pay.pl >@@ -104,9 +104,10 @@ for (@names) { > } > > $template->param( >- finesview => 1, >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ has_overdues => HasOverdues($borrowernumber), >+ finesview => 1, >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > add_accounts_to_template(); >diff --git a/members/paycollect.pl b/members/paycollect.pl >index 692b958..6feec50 100755 >--- a/members/paycollect.pl >+++ b/members/paycollect.pl >@@ -144,12 +144,13 @@ if ( $total_paid and $total_paid ne '0.00' ) { > borrower_add_additional_fields($borrower); > > $template->param( >- borrowernumber => $borrowernumber, # some templates require global >- borrower => $borrower, >- total => $total_due, >- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >- ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'), >+ has_overdues => HasOverdues($borrowernumber), >+ borrowernumber => $borrowernumber, # some templates require global >+ borrower => $borrower, >+ total => $total_due, >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), >+ ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/members/readingrec.pl b/members/readingrec.pl >index de2baec..89dce27 100755 >--- a/members/readingrec.pl >+++ b/members/readingrec.pl >@@ -128,35 +128,36 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettyp > my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; > > $template->param( >- readingrecordview => 1, >- title => $data->{title}, >- initials => $data->{initials}, >- surname => $data->{surname}, >- othernames => $data->{othernames}, >- borrowernumber => $borrowernumber, >- firstname => $data->{firstname}, >- cardnumber => $data->{cardnumber}, >- categorycode => $data->{categorycode}, >- category_type => $data->{category_type}, >- categoryname => $data->{description}, >- address => $address, >- address2 => $data->{address2}, >- city => $data->{city}, >- state => $data->{state}, >- zipcode => $data->{zipcode}, >- country => $data->{country}, >- phone => $data->{phone}, >- phonepro => $data->{phonepro}, >- mobile => $data->{mobile}, >- email => $data->{email}, >- emailpro => $data->{emailpro}, >- branchcode => $data->{branchcode}, >- is_child => ( $data->{category_type} eq 'C' ), >- branchname => $branches->{ $data->{branchcode} }->{branchname}, >- loop_reading => $issues, >- activeBorrowerRelationship => >- ( C4::Context->preference('borrowerRelationship') ne '' ), >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ has_overdues => HasOverdues($borrowernumber), >+ readingrecordview => 1, >+ title => $data->{title}, >+ initials => $data->{initials}, >+ surname => $data->{surname}, >+ othernames => $data->{othernames}, >+ borrowernumber => $borrowernumber, >+ firstname => $data->{firstname}, >+ cardnumber => $data->{cardnumber}, >+ categorycode => $data->{categorycode}, >+ category_type => $data->{category_type}, >+ categoryname => $data->{description}, >+ address => $address, >+ address2 => $data->{address2}, >+ city => $data->{city}, >+ state => $data->{state}, >+ zipcode => $data->{zipcode}, >+ country => $data->{country}, >+ phone => $data->{phone}, >+ phonepro => $data->{phonepro}, >+ mobile => $data->{mobile}, >+ email => $data->{email}, >+ emailpro => $data->{emailpro}, >+ branchcode => $data->{branchcode}, >+ is_child => ( $data->{category_type} eq 'C' ), >+ branchname => $branches->{ $data->{branchcode} }->{branchname}, >+ loop_reading => $issues, >+ activeBorrowerRelationship => ( C4::Context->preference('borrowerRelationship') ne '' ), >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); >+ > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/members/routing-lists.pl b/members/routing-lists.pl >index efd067e..58bb0a8 100755 >--- a/members/routing-lists.pl >+++ b/members/routing-lists.pl >@@ -106,32 +106,32 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree > my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'}; > > $template->param( >- >- findborrower => $findborrower, >- borrower => $borrower, >- borrowernumber => $borrowernumber, >- branch => $branch, >- branchname => GetBranchName($borrower->{'branchcode'}), >- title => $borrower->{'title'}, >- initials => $borrower->{'initials'}, >- firstname => $borrower->{'firstname'}, >- surname => $borrower->{'surname'}, >- othernames => $borrower->{'othernames'}, >- categorycode => $borrower->{'categorycode'}, >- categoryname => $borrower->{description}, >- address => $address, >- address2 => $borrower->{'address2'}, >- phone => $borrower->{'phone'}, >- phonepro => $borrower->{'phonepro'}, >- mobile => $borrower->{'mobile'}, >- email => $borrower->{'email'}, >- emailpro => $borrower->{'emailpro'}, >- borrowernotes => $borrower->{'borrowernotes'}, >- city => $borrower->{'city'}, >- state => $borrower->{'state'}, >- zipcode => $borrower->{'zipcode'}, >- country => $borrower->{'country'}, >- cardnumber => $borrower->{'cardnumber'}, >+ has_overdues => HasOverdues($borrowernumber), >+ findborrower => $findborrower, >+ borrower => $borrower, >+ borrowernumber => $borrowernumber, >+ branch => $branch, >+ branchname => GetBranchName( $borrower->{'branchcode'} ), >+ title => $borrower->{'title'}, >+ initials => $borrower->{'initials'}, >+ firstname => $borrower->{'firstname'}, >+ surname => $borrower->{'surname'}, >+ othernames => $borrower->{'othernames'}, >+ categorycode => $borrower->{'categorycode'}, >+ categoryname => $borrower->{description}, >+ address => $address, >+ address2 => $borrower->{'address2'}, >+ phone => $borrower->{'phone'}, >+ phonepro => $borrower->{'phonepro'}, >+ mobile => $borrower->{'mobile'}, >+ email => $borrower->{'email'}, >+ emailpro => $borrower->{'emailpro'}, >+ borrowernotes => $borrower->{'borrowernotes'}, >+ city => $borrower->{'city'}, >+ state => $borrower->{'state'}, >+ zipcode => $borrower->{'zipcode'}, >+ country => $borrower->{'country'}, >+ cardnumber => $borrower->{'cardnumber'}, > RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > >diff --git a/members/statistics.pl b/members/statistics.pl >index de9a6a3..55f722e 100755 >--- a/members/statistics.pl >+++ b/members/statistics.pl >@@ -101,15 +101,16 @@ my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{stree > my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'}; > > $template->param( >- statisticsview => 1, >- datas => $datas, >- address => $address, >- column_names => \@statistic_column_names, >- count_total_issues => $count_total_issues, >+ has_overdues => HasOverdues($borrowernumber), >+ statisticsview => 1, >+ datas => $datas, >+ address => $address, >+ column_names => \@statistic_column_names, >+ count_total_issues => $count_total_issues, > count_total_issues_returned => $count_total_issues_returned, > count_total_precedent_state => $count_total_precedent_state, >- count_total_actual_state => $count_total_actual_state, >- RoutingSerials => C4::Context->preference('RoutingSerials'), >+ count_total_actual_state => $count_total_actual_state, >+ RoutingSerials => C4::Context->preference('RoutingSerials'), > ); > > output_html_with_http_headers $input, $cookie, $template->output; >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12933
:
31638
|
31667
|
34456
|
34457
|
34467
|
34468
|
34469
|
34470
|
34471
|
34474
|
34475
|
34884
|
34885
|
34886
|
34887
|
34888
|
34889
|
35533
|
35534
|
35535
|
35536
|
35537
|
35538
|
35918
|
41606
|
41607
|
41608
|
41609
|
41610
|
41611
|
43514
|
43515
|
43516
|
43517
|
43518
|
43519
|
43520
|
43521
|
43522
|
43523
|
43904
|
43905
|
43906
|
43907
|
43908
|
43925
|
43926
|
43927
|
43928
|
43929
|
43930
|
43953