diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index b3b07ed0b1..e65029a0a2 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -167,6 +167,8 @@ my $biblionumber; ##################### my $hold; +my $patron; +my $found_biblio; if ($found){ $hold = Koha::Holds->find( { reserve_id => $found->{reserve_id} }, @@ -174,6 +176,8 @@ if ($found){ ); $itemnumber = $found->{'itemnumber'}; $borrowernumber = $found->{'borrowernumber'}; + $patron = Koha::Patrons->find($borrowernumber); + $found_biblio = Koha::Biblios->find( $found->{'biblionumber'} ); if ( $found->{'ResFound'} eq "Waiting" ) { $waiting = 1; @@ -238,7 +242,9 @@ $template->param( settransit => $settransit, trsfitemloop => \@trsfitemloop, errmsgloop => \@errmsgloop, - PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), + PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), + patron => $patron, + found_biblio => $found_biblio, ); # Checking if there is a Fast Cataloging Framework diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index cd66601c2b..121030e70f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1021,6 +1021,21 @@ fieldset { } } + &.barcode_input { + label { + &.hint { + display: block; + margin-bottom: .5em; + } + } + + select { + font-size: 120%; + max-width: 50%; + padding: .5em 0; + } + } + &.brief { div { &.hint { @@ -1575,6 +1590,7 @@ i { } .form-control-group { + margin-bottom: .5rem; white-space: nowrap; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index aef7032444..7ce124d600 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -5,6 +5,7 @@ [% USE AuthorisedValues %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] +[% PROCESS 'member-display-address-style.inc' %] [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] [% t("Transfers") | html %] › @@ -12,8 +13,29 @@ [% t("Koha") | html %] [% END %] [% INCLUDE 'doc-head-close.inc' %] +[% FILTER collapse %] + +[% END %] +[% BLOCK display_holdpatron_address %] + [% PROCESS 'display-address-style' %] +[% END %] + [% WRAPPER 'header.inc' %] [% INCLUDE 'circ-search.inc' %] @@ -40,104 +62,125 @@
[% INCLUDE 'messages.inc' %] -

Transfer items

- [% IF ( found ) %] -

Reserve found

-
- - - - - - - [% IF ( reserved ) %] - - - - - [% END # /IF reserved %] - - - - -
- [% IF ( reserved ) %] - Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). - [% END %] - [% IF ( waiting ) %] - Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). - [% END %] - [% IF ( transferred ) %] - Item has been trapped to fill a hold and is in transit for [% name | html %] ([% borrowernumber | html %]). - [% END %] -
- [% IF ( reserved ) %] - Transfer item to [% Branches.GetName( hold.branchcode ) | html %]: - [% END %] - [% IF ( waiting or transferred ) %]Cancel hold and then attempt transfer: [% END %] - -
- [% INCLUDE 'csrf-token.inc' %] - [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - - - - - - [% IF ( waiting or transferred or processing ) %] - - - [% END %] + [% BLOCK transfer_hidden_fields %] + [% FOREACH trsfitemloo IN trsfitemloop %] + + + + [% END %] + [% END %] + +

Transfers

+ + +
Cancel hold and then attempt transfer: -
- [% INCLUDE 'csrf-token.inc' %] - [% FOREACH trsfitemloo IN trsfitemloop %] - - - +
+ [% INCLUDE 'biblio-title.inc' biblio=found_biblio link=1 %] + [% IF ( barcode ) %] + ([% barcode | html %]) [% END %] + + +
+ [% IF ( reserved || waiting || transferred ) %] +
Hold for:
+
    +
  • + [% INCLUDE 'patron-title.inc' patron=hold.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_reserves" %] + - [% patron.category.description | html %] +
    • + [% INCLUDE display_holdpatron_address %] + [% IF ( patron.phone ) %] +
  • [% patron.phone | html %]
    • + [% END %] + + [% IF ( patron.email ) %] +
  • [% patron.email | html %]
    • + [% END %] + + [% IF ( patron.is_debarred ) %] +
  • Patron is RESTRICTED
    • + [% END %] + + [% IF ( patron.gonenoaddress ) %] +
  • Patron's address is in doubt
    • + [% END %] +
+

Transfer to: [% Branches.GetName( hold.branchcode ) | html %]

+ [% END %] +
+ +
+
+ + [% INCLUDE 'csrf-token.inc' %] + [% PROCESS transfer_hidden_fields %] - + - - - + + [% IF ( waiting or transferred or processing ) %] + + + [% END %] + [% IF ( reserved ) %] + + + [% END %] -
Ignore and return to transfers: -
- - - [% FOREACH trsfitemloo IN trsfitemloop %] - - - - [% END %] - -
-
-
+ + + [% IF ( reserved ) %] +
+
+ [% INCLUDE 'csrf-token.inc' %] + [% PROCESS transfer_hidden_fields %] + + + + + + + +
+
+ [% END # /IF reserved %] + +
+
+ + + [% PROCESS transfer_hidden_fields %] + +
+
+ + + + + [% ELSE # /IF found %] [% IF ( reqmessage ) %]
-
[% END %] @@ -178,22 +221,22 @@ [% END # /errmsgloop %]
-
+ [% INCLUDE 'csrf-token.inc' %] -
- Transfer -
    -
  1. - - -
    2. -
  2. - - -
    3. -
+
+

Transfers

+
+ + + Required +
+
+ + + +
[% FOREACH trsfitemloo IN trsfitemloop %] @@ -201,7 +244,7 @@ [% END %] - +
[% IF ( trsfitemloop ) %] @@ -255,6 +298,7 @@ [% MACRO jsinclude BLOCK %] + [% INCLUDE 'select2.inc' %] [% END %]