@@ -, +, @@
entering a purchase suggestion
- Apply the patch
- Check that you can change the default creator of the purchase suggestion when
creating a new suggestion by clicking on 'Set to patron'
(Home > Acquisitions > Suggestions management > New purchase suggestion)
- Check that you can also change the creator of the purchase suggestion when
editing an existing suggestion
---
.../prog/en/modules/suggestion/suggestion.tt | 9 ++--
.../modules/suggestion/tables/suggestion_search.tt | 36 ++++++++++++++
koha-tmpl/intranet-tmpl/prog/js/suggestions.js | 17 +++++++
suggestion/suggestion_search.pl | 57 ++++++++++++++++++++++
4 files changed, 116 insertions(+), 3 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/suggestions.js
create mode 100755 suggestion/suggestion_search.pl
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -371,18 +371,20 @@
[% END %]
@@ -1165,6 +1168,6 @@
[% END %]
[% Asset.js("js/acq.js") | $raw %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]
+ [% Asset.js("js/suggestions.js") | $raw %]
[% END %]
-
[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/tables/suggestion_search.tt
@@ -0,0 +1,36 @@
+[% USE raw %]
+[% USE To %]
+[% USE Branches %]
+[% USE KohaDates %]
+{
+ "sEcho": [% sEcho | html %],
+ "iTotalRecords": [% iTotalRecords | html %],
+ "iTotalDisplayRecords": [% iTotalDisplayRecords | html %],
+ "aaData": [
+ [% FOREACH data IN aaData %]
+ {
+ "dt_cardnumber":
+ "[% data.cardnumber | html %]",
+ "dt_name":
+ "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
+ "dt_dateofbirth":
+ "[% data.dateofbirth | $KohaDates %]",
+ "dt_address":
+ "[% INCLUDE escape_address data=data %]",
+ "dt_action":
+ "Select "
+ }[% UNLESS loop.last %],[% END %]
+ [% END %]
+ ]
+}
+[% BLOCK escape_address %]
+[%~ SET address = data.streetnumber _ ' ' %]
+[%~ IF data.address %][% SET address = address _ data.address _ ' ' %][% END %]
+[%~ IF data.address2 %][% SET address = address _ data.address2 _ ' ' %][% END %]
+[%~ IF data.city %][% SET address = address _ data.city _ ' ' %][% END %]
+[%~ IF data.state %][% SET address = address _ data.state _ ' ' %][% END %]
+[%~ IF data.zipcode %][% SET address = address _ data.zipcode _ ' ' %][% END %]
+[%~ IF data.country %][% SET address = address _ data.country _ ' ' %][% END %]
+[%~ SET address = address _ Branches.GetName( data.branchcode ) %]
+[%~ To.json( address ) | $raw ~%]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/js/suggestions.js
+++ a/koha-tmpl/intranet-tmpl/prog/js/suggestions.js
@@ -0,0 +1,17 @@
+function select_user(borrowernumber, borrower) {
+ var suggested = ' ';
+ suggested += '';
+ suggested += borrower.surname + ', ' + borrower.firstname + ' (' + borrower.cardnumber + ')';
+ suggested += ' ';
+ suggested += borrower.branchname + ' (' + borrower.category_description + ')';
+ $("#tdsuggestedby").html(suggested);
+ return 0;
+}
+
+$(document).ready(function(){
+ $('body').on('click', '#suggestion_search', function(e) {
+ e.preventDefault();
+ var newin = window.open('suggestion_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
+ });
+
+});
--- a/suggestion/suggestion_search.pl
+++ a/suggestion/suggestion_search.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Copyright 2020 BibLibre
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see .
+
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
+use C4::Auth;
+use C4::Output;
+use C4::Members;
+
+use Koha::Patron::Categories;
+
+my $input = new CGI;
+
+my $dbh = C4::Context->dbh;
+
+my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
+ { template_name => "common/patron_search.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { suggestions => 'suggestions_manage' },
+ }
+);
+
+my $q = $input->param('q') || '';
+my $op = $input->param('op') || '';
+
+my $referer = $input->referer();
+
+my $patron_categories = Koha::Patron::Categories->search_limited;
+$template->param(
+ view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",
+ columns => ['cardnumber', 'name', 'dateofbirth', 'address', 'action' ],
+ json_template => 'suggestion/tables/suggestion_search.tt',
+ selection_type => 'select',
+ alphabet => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ),
+ categories => $patron_categories,
+ aaSorting => 1,
+);
+output_html_with_http_headers( $input, $cookie, $template->output );
--