From d7c17bb1f1f179f954040be90546f023bb52186c Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Fri, 18 Oct 2019 08:56:21 +0100 Subject: [PATCH] Bug 23838: Add renewals modal This patch adds the display of the renewals modal when appropriate. A "View" link is displayed next to renewals that have logs associated with them. Clicking the link opens the modal that displays the logged renewals. Signed-off-by: Myka Kennedy Stephens https://bugs.koha-community.org/show_bug.cgi?id=23392 --- .../en/includes/patron-renewal-modal-strings.inc | 7 ++++++ .../prog/en/includes/patron-renewal-modal.inc | 18 +++++++++++++++ .../prog/en/modules/members/readingrec.tt | 11 ++++++++- .../intranet-tmpl/prog/js/patron-renewal-modal.js | 26 ++++++++++++++++++++++ members/readingrec.pl | 20 +++++++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/js/patron-renewal-modal.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc new file mode 100644 index 0000000000..c13e6bb8b7 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal-strings.inc @@ -0,0 +1,7 @@ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc new file mode 100644 index 0000000000..096759e68a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-renewal-modal.inc @@ -0,0 +1,18 @@ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 6d7ae6b829..7c94072207 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -87,7 +87,13 @@ [% issue.barcode | html %] - [% issue.renewals | html %] + + [% issue.renewals | html %] + [% itemid = issue.itemnumber %] + [% IF logged_items.$itemid %] + [ View ] + [% END %] + [% issue.issuedate |$KohaDates with_hours => 1 %] @@ -129,6 +135,9 @@ [% Asset.js("js/members-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'patron-renewal-modal.inc' %] + [% INCLUDE 'patron-renewal-modal-strings.inc' %] + [% Asset.js("js/patron-renewal-modal.js") | $raw %]