From 1f2c59fb4fb0e9170455a2ae10372166babf5bc1 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Mon, 27 Jul 2020 11:41:55 +0200 Subject: [PATCH] Bug 23258: (follow-up) QA fixes This patch adds relevant informations to the confirmation and results pages: - Patron name (with link) - Pickup location - Biblio title and item barcode (with link) - Link to the holds for the title on the result screen --- circ/batch_holding.pl | 30 +++++++--- .../prog/en/modules/circ/batch_holding.tt | 64 +++++++++++++++------- 2 files changed, 65 insertions(+), 29 deletions(-) diff --git a/circ/batch_holding.pl b/circ/batch_holding.pl index 400eb53..72f63e2 100755 --- a/circ/batch_holding.pl +++ b/circ/batch_holding.pl @@ -87,19 +87,25 @@ if ($op eq "show"){ if (@itemnumbers) { foreach my $itemnumber (@itemnumbers) { my $item = Koha::Items->find({ itemnumber => $itemnumber }); + my $biblio = Koha::Biblios->find({ biblionumber => $item->biblionumber }); my $holdable = CanItemBeReserved($borrowernumber, $item->itemnumber)->{status}; push @holdloop, { - 'itemnumber' => $item->itemnumber, - 'barcode' => $item->barcode, - 'holdable' => ($action eq "cancel" || $holdable eq 'OK') ? 1 : 0, - }; + 'biblionumber' => $biblio->biblionumber, + 'title' => $biblio->title, + 'itemnumber' => $item->itemnumber, + 'barcode' => $item->barcode, + 'holdable' => ($action eq "cancel" || $holdable eq 'OK') ? 1 : 0, + }; } } + my $borrower = Koha::Patrons->find({ borrowernumber => $borrowernumber }); $template->param( show => 1, holdloop => \@holdloop, borrowernumber => $borrowernumber, + borrowersurname => $borrower->surname, + borrowerfirstname => $borrower->firstname, branch => $branch, action => $action, op => $op @@ -116,6 +122,7 @@ elsif ($op eq "result") { if ($action eq "place") { my $item = Koha::Items->find({ itemnumber => $itemnumber }); my $biblionumber = $item->biblionumber; + my $biblio = Koha::Biblios->find({ biblionumber => $item->biblionumber }); my $reserve_id = AddReserve({ branchcode => $branch, borrowernumber => $borrowernumber, @@ -123,9 +130,12 @@ elsif ($op eq "result") { itemnumber => $itemnumber }); push @holdloop, { - 'itemnumber' => $itemnumber, - 'reserve_id' => $reserve_id, - }; + 'biblionumber' => $biblio->biblionumber, + 'title' => $biblio->title, + 'itemnumber' => $itemnumber, + 'barcode' => $item->barcode, + 'reserve_id' => $reserve_id, + }; } else { my $holds = Koha::Holds->search({ itemnumber => $itemnumber, borrowernumber => $borrowernumber }); if ($holds) { @@ -139,10 +149,14 @@ elsif ($op eq "result") { } } } - + my $borrower = Koha::Patrons->find({ borrowernumber => $borrowernumber }); $template->param( result => 1, holdloop => \@holdloop, + borrowernumber => $borrowernumber, + borrowersurname => $borrower->surname, + borrowerfirstname => $borrower->firstname, + branch => $branch, cancel => $action eq "cancel" ? 1 : 0, place => $action eq "place" ? 1 : 0, op => $op diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/batch_holding.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/batch_holding.tt index c46e604..0c72910 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/batch_holding.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/batch_holding.tt @@ -66,7 +66,10 @@ [% ELSE %]

Cancel holds on the following barcodes

[% END %] - +
Select all | Clear all @@ -74,18 +77,23 @@
+ [% FOREACH hold IN holdloop %] + + + @@ -111,25 +119,39 @@ [% IF (holdloop) %]

Results

[% IF place %] - The following items have been placed on hold: -
    - [% FOREACH hold IN holdloop %] -
  • itemnumber [% hold.itemnumber | html %], reserve_id [% hold.reserve_id | html %]
  • - [% END %] -
+

The following items have been placed on hold:

[% END %] [% IF cancel %] - The following holds were cancelled: -
    - [% FOREACH hold IN holdloop %] -
  • itemnumber [% hold.itemnumber | html %]
  • - [% END %] -
+

The following holds were cancelled:

+ [% END %] + +
HoldTitleItemComment
- [% IF hold.holdable %] - - [% ELSE %] + + + [% hold.title | html %] + + [% hold.barcode | html %] + + [% IF !hold.holdable %] - [% hold.barcode | html %] (This item cannot be placed on hold) + This item cannot be placed on hold [% END %]
+ + + [% FOREACH hold IN holdloop %] + + + + + [% END %] + +
TitleItemHolds
+ [% hold.title | html %] + + [% hold.barcode | html %] + + Show holds +
+ [% ELSE %]

No holds could be placed or cancelled.

[% END %] - Batch place or cancel other holds + +

Batch place or cancel other holds

[% ELSE %] -- 2.7.4