From 9e6f00b142936e548294998ad03750f558b5e223 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 1 Feb 2022 11:06:49 +0100 Subject: [PATCH] Bug 29136: Ajaxify the patron search when placing a hold Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Fridolin Somers --- .../includes/circ-patron-search-results.inc | 45 ------ .../prog/en/modules/reserve/request.tt | 133 ++++++++++++------ .../modules/reserve/tables/members_results.tt | 32 +++++ .../prog/js/circ-patron-search-results.js | 13 -- reserve/request.pl | 20 +-- 5 files changed, 124 insertions(+), 119 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/tables/members_results.tt delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/circ-patron-search-results.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc deleted file mode 100644 index f7ab99ba93..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc +++ /dev/null @@ -1,45 +0,0 @@ -[% USE KohaDates %] - - - - - - - - - - - - - - [% FOREACH borrower IN borrowers %] - [% IF destination == "circ" %] - - - [% ELSIF destination == "holds" %] - [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber %] - [% FOREACH biblionumber IN biblionumbers %] - [% SET data_url = data_url _ "&biblionumber=" _ biblionumber %] - [% END %] - [% IF multi_hold %] - [% SET data_url = data_url _ "&multi_hold=1" %] - [% END %] - - - [% END %] - - - - - - - - [% END %] - -
NameCard numberDate of birthCategoryLibraryAddressPrimary phone
[% borrower.surname | html %], [% borrower.firstname | html %]
[% borrower.surname | html %], [% borrower.firstname | html %][% borrower.cardnumber | html %][% INCLUDE 'patron-age.inc' patron = borrower %][% Categories.GetName( borrower.categorycode ) | html %] - [% IF ( Branches.GetLoggedInBranchcode == borrower.branchcode && !singleBranchMode ) %] - [% Branches.GetName( borrower.branchcode ) | html %] - [% ELSE %] - [% Branches.GetName( borrower.branchcode ) | html %] - [% END %] - [% borrower.address | html %][% borrower.phone | html %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index a7ddc45c8d..51b81e3990 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -163,18 +163,30 @@ [% END %]
-
+
Enter patron card number or partial name:
- + [% FOREACH biblionumber IN biblionumbers %] [% END %] -
- [% IF borrowers %] - [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] - [% END %] + + + + + + + + + + + + + + + +
[% IF clubcount %]
@@ -1146,7 +1158,6 @@ [% INCLUDE 'calendar.inc' %] [% INCLUDE 'columns_settings.inc' %] [% Asset.js("lib/hc-sticky.js") | $raw %] - [% Asset.js("js/circ-patron-search-results.js") | $raw %] [% INCLUDE 'select2.inc' %] [% Asset.js("js/holds.js") | $raw%]