Summary for [% firstname %] [% surname %] ([% cardnumber %])

From a7bdc6eb3e2fc7de7158d938e37552eb75bd0cc7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 1 Aug 2016 12:33:24 -0400 Subject: [PATCH] Bug 17014 - Remove more event attributes from patron templates There are many patron-related templates which still use event attributes to define events. This patch updates these templates so that events are defined in JavaScript. To test apply the patch and check out to a patron. - From the Print menu in the toolbar, choose "Print summary." The patron summary page should open and the print dialog should be automatically triggered. - From the Print menu in the toolbar, choose "Print slip." The patron slip page should open and the print dialog should be automatically triggered. - From the Print menu in the toolbar, choose "Print quick slip." The patron quick slip page should open and the print dialog should be automatically triggered. - Click the patron's "Fines" tab in the left-hand sidebar and then choose the "Account" tab. -- Click the "Print" button for an account payment (the link should point to printfeercpt.pl). A print receipt page should open and the print dialog should be automatically triggered. -- Follow the same procedure for a transaction which is not an account payment (the link should point to printinvoice.pl). - Click the "Create manual invoice" tab. -- Select one of the "type" choices. Doing so should automatically populate the "Description" field with the corresponding code. -- If necessary, define one or more values for the MANUAL_INV authorized value and confirm that those invoice types work as well. - From the patron's "Pay fines" tab, click the "Pay amount" button. In the "collect from patron" field, enter any combination of letters, numbers, and symbols. When you tab away from that field your text should be reformatted to currency format. - From the patrons home page, change the filter in the left-hand sidebar and submit it. The correct results should be returned. Signed-off-by: EricGosselin Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../prog/en/includes/slip-print.inc | 6 ++--- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/members/maninvoice.tt | 26 ++++++++++--------- .../prog/en/modules/members/member.tt | 5 +++- .../en/modules/members/moremember-print.tt | 5 +--- .../en/modules/members/moremember-receipt.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 16 ++++++------ .../prog/en/modules/members/printfeercpt.tt | 4 +-- .../prog/en/modules/members/printinvoice.tt | 7 +++-- 9 files changed, 36 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc index 413f4bbbcf..689375b75b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/slip-print.inc @@ -2,9 +2,9 @@ [% IF ( Koha.Preference('IntranetSlipPrinterJS') ) %] [% Koha.Preference('IntranetSlipPrinterJS') %] [% ELSE %] - function printThenClose() { + $( window ).load(function() { window.print(); setTimeout('window.close()', 1); - } + }); [% END %] - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt index 93ff49b577..09b550b924 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt @@ -19,7 +19,7 @@ [% INCLUDE 'slip-print.inc' #printThenClose %] - +

[% IF plain %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 7d35c73d51..6cda5d1a14 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -4,9 +4,22 @@ [% INCLUDE 'doc-head-close.inc' %] @@ -44,19 +57,8 @@ $(document).ready(function(){ Manual invoice

- Type: - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index 6938f57a18..7d5e7e397f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -109,6 +109,9 @@ $(document).ready(function() { e.preventDefault(); clearFilters(true); }); + $("#searchform").on("submit",function(){ + return filter(); + }); }); var dtMemberResults; @@ -409,7 +412,7 @@ function filterByFirstLetterSurname(letter) {

-