Bug 15407: Koha::Patron::Categories - replace GetborCatFromCatType

[srvgit] / circ / transferstoreceive.pl

diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index f3cdd8d..4be2bcb 100755 (executable)
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -5,26 +5,27 @@
 #
 # This file is part of Koha.
 #
-# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
-use CGI;
+use warnings;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Output;
-use C4::Branch;
+use C4::Branch;     # GetBranches
 use C4::Auth;
-use C4::Dates qw/format_date/;
+use Koha::DateUtils;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Members;
@@ -38,17 +39,15 @@ use C4::Koha;
 use C4::Reserves;
 
 my $input = new CGI;
-
-my $theme = $input->param('theme');    # only used if allowthemeoverride is set
 my $itemnumber = $input->param('itemnumber');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/transferstoreceive.tmpl",
+        template_name   => "circ/transferstoreceive.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
 );
@@ -59,6 +58,7 @@ my $default = C4::Context->userenv->{'branch'};
 # get the all the branches for reference
 my $branches = GetBranches();
 my @branchesloop;
+my $latetransfers;
 foreach my $br ( keys %$branches ) {
     my @transferloop;
     my %branchloop;
@@ -79,33 +79,34 @@ foreach my $br ( keys %$branches ) {
                 C4::Context->preference('TransfersMaxDaysWarning'));
             my $calcDate = Date_to_Days( $sent_year, $sent_month, $sent_day );
             my $today    = Date_to_Days(&Today);
-            my $warning  = ( $today > $calcDate );
+                       my $diff = $today - $calcDate;
 
-            if ( $warning > 0 ) {
+            if ($today > $calcDate) {
+                               $latetransfers = 1;
                 $getransf{'messcompa'} = 1;
+                               $getransf{'diff'} = $diff;
             }
             my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
-            my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );
+            my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $gettitle->{'itype'} : $gettitle->{'itemtype'} );
 
-            $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
-            $getransf{'itemtype'} = $itemtypeinfo->{'description'};
-                       foreach (qw(title biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
+            $getransf{'datetransfer'} = $num->{'datesent'};
+            $getransf{'itemtype'} = $itemtypeinfo ->{'description'};
+                       foreach (qw(title author biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
                $getransf{$_} = $gettitle->{$_};
                        }
 
-            #                          we check if we have a reserv for this transfer
-            my @checkreserv = GetReservesFromItemnumber($num->{'itemnumber'} );
+            my $record = GetMarcBiblio($gettitle->{'biblionumber'});
+            $getransf{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($gettitle->{'biblionumber'}));
+
+            # we check if we have a reserv for this transfer
+            my @checkreserv = GetReservesFromItemnumber($num->{'itemnumber'});
             if ( $checkreserv[0] ) {
-                my $getborrower =
-                  GetMemberDetails( $checkreserv[1] );
-                $getransf{'borrowernum'}  = $getborrower->{'borrowernumber'};
-                $getransf{'borrowername'} = $getborrower->{'surname'};
+                my $getborrower = C4::Members::GetMember( borrowernumber => $checkreserv[1] );
+                $getransf{'borrowernum'}       = $getborrower->{'borrowernumber'};
+                $getransf{'borrowername'}      = $getborrower->{'surname'};
                 $getransf{'borrowerfirstname'} = $getborrower->{'firstname'};
-                if ( $getborrower->{'emailaddress'} ) {
-                    $getransf{'borrowermail'} = $getborrower->{'emailaddress'};
-                }
-                $getransf{'borrowerphone'} = $getborrower->{'phone'};
-
+                $getransf{'borrowermail'}      = $getborrower->{'email'} if $getborrower->{'email'};
+                $getransf{'borrowerphone'}     = $getborrower->{'phone'};
             }
             push( @transferloop, \%getransf );
         }
@@ -118,8 +119,9 @@ foreach my $br ( keys %$branches ) {
 
 $template->param(
     branchesloop => \@branchesloop,
-    show_date    => format_date(C4::Dates->today('iso')),
-       dateformat    => C4::Context->preference("dateformat"),
+    show_date    => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
+       TransfersMaxDaysWarning => C4::Context->preference('TransfersMaxDaysWarning'),
+       latetransfers => $latetransfers ? 1 : 0,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;