Bugzilla – Attachment 135201 Details for
Bug 30807
Use patron-title.inc in patron payments pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30807: Migrate to patron-title in pay and paycollect
Bug-30807-Migrate-to-patron-title-in-pay-and-payco.patch (text/plain), 5.80 KB, created by
Martin Renvoize (ashimema)
on 2022-05-19 11:57:21 UTC
(
hide
)
Description:
Bug 30807: Migrate to patron-title in pay and paycollect
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2022-05-19 11:57:21 UTC
Size:
5.80 KB
patch
obsolete
>From 5a6bfd1aa6e00a57b93232b66ca2b21668f34da0 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 19 May 2022 12:53:18 +0100 >Subject: [PATCH] Bug 30807: Migrate to patron-title in pay and paycollect > >This patch updates the member-flags template to use the patron-title.inc >include wherever patron names are referenced. > >Test plan >1) Navigate to a patron and click through to their accounts tab >2) Note how the patron name displays in the title, breadcrumb and > headings >3) Click through to make a payment >4) Note how the patron name displays in the title, breadcrumb and > headings >5) Apply the patch and reload the page >6) Confirm the patron name still appears in each location and is > consistently formatted and linked as you would expect > >Note: This patch also removes a superflous hidden title form element >that was simply passed to and from the controller but not actually used >in any way. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/members/paycollect.tt | 8 +++----- > members/paycollect.pl | 2 -- > 3 files changed, 6 insertions(+), 10 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 c6978f3cfb..577e552843 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -9,7 +9,7 @@ > [% SET footerjs = 1 %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Make a payment for [% patron.firstname | html %] [% patron.surname | html %] › Patrons › Koha</title> >+<title>Make a payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -27,7 +27,7 @@ > </li> > <li> > <a href="#" aria-current="page"> >- Make a payment for [% patron.firstname | html %] [% patron.surname | html %] >+ Make a payment for [% INCLUDE 'patron-title.inc' %] > </a> > </li> > </ol> >@@ -171,7 +171,7 @@ > </fieldset> > </form> > [% ELSE %] >- <p>[% patron.firstname | html %] [% patron.surname | html %] has no outstanding fines.</p> >+ <p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p> > [% END %] > </div></div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index e97f92d212..4ec3ad28c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -23,9 +23,9 @@ > [% SET registers = Registers.all( filters => { current_branch => 1 } ) %] > <title> > [% IF type == 'WRITEOFF' %] >- Write off an amount for [% patron.firstname | html %] [% patron.surname | html %] >+ Write off an amount for [% INCLUDE 'patron-title.inc' no_html = 1 %] > [% ELSE %] >- Collect fine payment for [% patron.firstname | html %] [% patron.surname | html %] >+ Collect fine payment for [% INCLUDE 'patron-title.inc' no_html = 1 %] > [% END %] › Patrons › Koha > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -44,7 +44,7 @@ > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> > </li> > <li> >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay charges for [% patron.firstname | html %] [% patron.surname | html %]</a> >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay charges for [% INCLUDE 'patron-title.inc' %]</a> > </li> > <li> > <a href="#" aria-current="page"> >@@ -141,7 +141,6 @@ > <input type="hidden" name="amount" id="amount" value="[% amount | html %]" /> > <input type="hidden" name="amountoutstanding" id="amountoutstanding" value="[% amountoutstanding | html %]" /> > <input type="hidden" name="accountlines_id" id="accountlines_id" value="[% accountlines_id | html %]" /> >- <input type="hidden" name="title" id="title" value="[% patron.title | html %]" /> > <input type="hidden" name="change_given" id="change_given" /> > > <fieldset class="rows"> >@@ -235,7 +234,6 @@ > <input type="hidden" name="debit_type_code" id="debit_type_code" value="[% debit_type_code | html %]" /> > <input type="hidden" name="amount" id="amount" value="[% amount | html %]" /> > <input type="hidden" name="accountlines_id" id="accountlines_id" value="[% accountlines_id | html %]" /> >- <input type="hidden" name="title" id="title" value="[% patron.title | html %]" /> > <input type="hidden" name="payment_note" id="payment_note" value="[% payment_note | html %]" /> > <input type="hidden" name="amountoutstanding" id="amountoutstanding" value="[% amountoutstanding | html %]" /> > <input type="hidden" name="confirm_writeoff" id="confirm_writeoff" value="1" /> >diff --git a/members/paycollect.pl b/members/paycollect.pl >index 3f6d1f4c8b..e8301a7660 100755 >--- a/members/paycollect.pl >+++ b/members/paycollect.pl >@@ -87,14 +87,12 @@ if ( $pay_individual || $writeoff_individual ) { > my $amountoutstanding = $input->param('amountoutstanding'); > my $itemnumber = $input->param('itemnumber'); > my $description = $input->param('description'); >- my $title = $input->param('title'); > $total_due = $amountoutstanding; > $template->param( > debit_type_code => $debit_type_code, > accountlines_id => $accountlines_id, > amount => $amount, > amountoutstanding => $amountoutstanding, >- title => $title, > itemnumber => $itemnumber, > individual_description => $description, > payment_note => $payment_note, >-- >2.20.1
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 30807
:
135201
|
135285
|
135470