gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 12933: (QA followup) Add missing notice templates and other small fixes 

- Fixes page title of slip print window: Members > Patrons
- Fixes error message if no notice template is found
- Fixes a stray template variable that resulted in the
  borrower number showing in the 'Print' pull down
- Fixes xt/sample_notices.t by adding the sample notice to
  it-IT and es-ES

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Katrin Fischer 2015-10-24 20:58:04 +02:00 committed by Tomas Cohen Arazi
parent f668ca7dae
commit 3efbad2ce9
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/data/mysql/es-ES/mandatory/sample_notices.sql
View File

@ -151,3 +151,9 @@ Your library.'
INSERT INTO letter(module, code, branchcode, name, title, content, message_transport_type)
VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> (<<biblio.title>>) has been received.\n\nYour library.', 'email'),
('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<<borrowers.dateexpiry>>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<<branches.branchname>>','email');
INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type )
VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Overdues Slip', '0', 'OVERDUES_SLIP', 'The following item(s) is/are currently overdue:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item>
', 'print' );

6
installer/data/mysql/it-IT/necessari/notices.sql
View File

@ -149,3 +149,9 @@ Lo staff della biblioteca.'
INSERT INTO letter(module, code, branchcode, name, title, content, message_transport_type)
VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on receiving', 'Order received', 'Dear <<borrowers.firstname>> <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> (<<biblio.title>>) has been received.\n\nYour library.', 'email'),
('members','MEMBERSHIP_EXPIRY','','Account expiration','Account expiration','Dear <<borrowers.title>> <<borrowers.firstname>> <<borrowers.surname>>,.\r\n\r\nYour library card will expire soon, on:\r\n\r\n<<borrowers.dateexpiry>>\r\n\r\nThank you,\r\n\r\nLibrarian\r\n\r\n<<branches.branchname>>','email');
INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type )
VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Overdues Slip', '0', 'OVERDUES_SLIP', 'The following item(s) is/are currently overdue:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item>
', 'print' );

2
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
View File

@ -159,7 +159,7 @@ 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>
<li><a id="printquickslip" href="#">Print quick slip</a></li>
[% IF Borrowers.HasOverdues( borrowernumber ) %]
<li><a id="print_overdues" href="#">Print overdues</a></li>
[% END %]

8
koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
View File

@ -5,9 +5,9 @@
[% ELSIF ( caller == 'transfer' ) %]
<title>Koha &rsaquo; Circulation &rsaquo; Transfers print receipt</title>
[% ELSIF ( caller == 'members' ) %]
<title>Koha &rsaquo; Members &rsaquo; Print receipt for [% borrowernumber %]</title>
<title>Koha &rsaquo; Patrons &rsaquo; Print receipt for [% borrowernumber %]</title>
[% ELSIF ( title ) %]
<title>Koha &rsaquo; Members &rsaquo; [% title %]</title>
<title>Koha &rsaquo; Patrons &rsaquo; [% title %]</title>
[% END %]
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@ -24,10 +24,10 @@
[% IF plain %]
<pre>
[% IF ( slip ) %][% slip %][% ELSE %]No hold found[% END %]
[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %]
</pre>
[% ELSE %]
[% IF ( slip ) %][% slip %][% ELSE %]No hold found[% END %]
[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %]
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]