Bugzilla – Attachment 68506 Details for
Bug 10021
Remove dead code related to notifys
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10021: Restore "Pay fines" list
Bug-10021-Restore-Pay-fines-list.patch (text/plain), 3.54 KB, created by
Jonathan Druart
on 2017-10-24 21:48:43 UTC
(
hide
)
Description:
Bug 10021: Restore "Pay fines" list
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-10-24 21:48:43 UTC
Size:
3.54 KB
patch
obsolete
>From 08511207d97358bbb242da92d5a4b94a87c5c0cb Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 24 Oct 2017 18:45:31 -0300 >Subject: [PATCH] Bug 10021: Restore "Pay fines" list > >Previous changes were wrong, the notify_id was always equal to 1 and >GetBorNotifyAcctRecord was used to retrieved the account lines to pay >--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 9 ++------- > members/pay.pl | 15 +++++++++++++-- > 2 files changed, 15 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 243f777015..f59a4cf450 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -79,21 +79,18 @@ function enableCheckboxActions(){ > <th>Description</th> > <th>Payment note</th> > <th>Account type</th> >- <th>Notify id</th> >- <th>Level</th> > <th>Amount</th> > <th>Amount outstanding</th> > </tr> > </thead> > <tfoot> > <tr> >- <td class="total" colspan="8">Total due:</td> >+ <td class="total" colspan="6">Total due:</td> > <td style="text-align: right;">[% total | $Price %]</td> > </tr> > </tfoot> > <tbody> >-[% FOREACH account_grp IN accounts %] >- [% FOREACH line IN account_grp.accountlines %] >+[% FOREACH line IN accounts %] > <tr> > <td> > [% IF ( line.amountoutstanding > 0 ) %] >@@ -112,7 +109,6 @@ function enableCheckboxActions(){ > <input type="hidden" name="accountlines_id[% line.accountlines_id %]" value="[% line.accountlines_id %]" /> > <input type="hidden" name="amountoutstanding[% line.accountlines_id %]" value="[% line.amountoutstanding %]" /> > <input type="hidden" name="borrowernumber[% line.accountlines_id %]" value="[% line.borrowernumber %]" /> >- <input type="hidden" name="totals[% line.accountlines_id %]" value="[% line.totals %]" /> > </td> > <td> > [% SWITCH line.accounttype %] >@@ -154,7 +150,6 @@ function enableCheckboxActions(){ > <td style="text-align: right;">[% account_grp.total | $Price %]</td> > </tr> > [% END %] >-[% END %] > </tbody> > </table> > <fieldset class="action"> >diff --git a/members/pay.pl b/members/pay.pl >index 6d60556880..186367d21d 100755 >--- a/members/pay.pl >+++ b/members/pay.pl >@@ -133,7 +133,18 @@ output_html_with_http_headers $input, $cookie, $template->output; > sub add_accounts_to_template { > > my ( $total, undef, undef ) = GetMemberAccountRecords($borrowernumber); >- my $accounts = []; >+ my $accounts = Koha::Account::Lines->search({ borrowernumber => $borrowernumber, }, { order_by => ['accounttype'] }); >+ my @accounts; >+ while ( my $account = $accounts->next ) { >+ $account = $account->unblessed; >+ if ( $account->{itemnumber} ) { >+ my $item = Koha::Items->find( $account->{itemnumber} ); >+ my $biblio = $item->biblio; >+ $account->{biblionumber} = $biblio->biblionumber; >+ $account->{title} = $biblio->title; >+ } >+ push @accounts, $account; >+ } > borrower_add_additional_fields($borrower); > > $template->param(%$borrower); >@@ -141,7 +152,7 @@ sub add_accounts_to_template { > my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); > $template->param( picture => 1 ) if $patron_image; > $template->param( >- accounts => $accounts, >+ accounts => \@accounts, > borrower => $borrower, > categoryname => $borrower->{'description'}, > total => $total, >-- >2.11.0
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 10021
:
54194
|
68262
|
68263
|
68419
|
68420
|
68421
|
68422
|
68477
|
68478
|
68479
|
68480
|
68505
|
68506
|
68793
|
68794
|
68795
|
68796
|
68797
|
68798
|
68920
|
68953
|
68954
|
68955
|
68956
|
68957
|
68958
|
68959
|
69695
|
69696
|
69698