Bug 26291: Move translatable strings out of z3950_search.inc into z3950_search.js

[koha-ffzg.git] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index 3bf7fee..a7556c7 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -35,6 +35,9 @@ use CGI qw ( -utf8 );
 use DateTime;
 
 use C4::Auth qw/:DEFAULT get_session/;
+use C4::Output;
+use C4::Circulation;
+use C4::Reserves;
 use C4::Biblio;
 use C4::Circulation;
 use C4::Context;
@@ -43,7 +46,6 @@ use C4::Koha;   # FIXME : is it still useful ?
 use C4::Members::Messaging;
 use C4::Members;
 use C4::Output;
-use C4::Print;
 use C4::Reserves;
 use C4::RotatingCollections;
 use Koha::AuthorisedValues;
@@ -63,7 +65,6 @@ my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/returns.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
@@ -75,24 +76,17 @@ my $session = get_session($sessionID);
 if ( $query->param('print_slip') ) {
     $template->param(
         print_slip     => 1,
-        borrowernumber => scalar $query->param('borrowernumber'), # FIXME We should send a Koha::Patron and raise an error if not exist.
-        biblionumber   => scalar $query->param('biblionumber'),
-        itemnumber     => scalar $query->param('itemnumber'),
+        reserve_id => scalar $query->param('reserve_id'),
     );
 }
 
 #####################
 #Global vars
-my $printers = GetPrinters();
 my $userenv = C4::Context->userenv;
 my $userenv_branch = $userenv->{'branch'} // '';
-my $printer = $userenv->{'branchprinter'} // '';
 my $forgivemanualholdsexpire = $query->param('forgivemanualholdsexpire');
 
 my $overduecharges = (C4::Context->preference('finesMode') && C4::Context->preference('finesMode') ne 'off');
- #
-# Some code to handle the error if there is no branch or printer setting.....
-#
 
 # Set up the item stack ....
 my %returneditems;
@@ -232,7 +226,8 @@ if ($dotransfer){
 # An item has been returned to a branch other than the homebranch, and the librarian has chosen to initiate a transfer
     my $transferitem = $query->param('transferitem');
     my $tobranch     = $query->param('tobranch');
-    ModItemTransfer($transferitem, $userenv_branch, $tobranch);
+    my $trigger      = $query->param('trigger');
+    ModItemTransfer($transferitem, $userenv_branch, $tobranch, $trigger);
 }
 
 if ($canceltransfer){
@@ -304,7 +299,7 @@ if ($barcode) {
       AddReturn( $barcode, $userenv_branch, $exemptfine, $return_date );
 
     if ($returned) {
-        my $time_now = DateTime->now( time_zone => C4::Context->tz )->truncate( to => 'minute');
+        my $time_now = dt_from_string()->truncate( to => 'minute');
         my $date_due_dt = dt_from_string( $issue->date_due, 'sql' );
         my $duedate = $date_due_dt->strftime('%Y-%m-%d %H:%M');
         $returneditems{0}      = $barcode;
@@ -313,7 +308,7 @@ if ($barcode) {
         $input{borrowernumber} = $borrower->{'borrowernumber'};
         $input{duedate}        = $duedate;
         unless ( $dropboxmode ) {
-            $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, DateTime->now()) == -1);
+            $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, dt_from_string()) == -1);
         } else {
             $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, $dropboxdate) == -1);
         }
@@ -352,6 +347,7 @@ if ($barcode) {
 }
 $template->param( inputloop => \@inputloop );
 
+
 my $found    = 0;
 my $waiting  = 0;
 my $reserved = 0;
@@ -371,6 +367,7 @@ if ( $messages->{'NeedsTransfer'} ){
     $template->param(
         found          => 1,
         needstransfer  => $messages->{'NeedsTransfer'},
+        trigger        => $messages->{'TransferTrigger'},
         itemnumber     => $itemnumber,
     );
 }
@@ -421,23 +418,19 @@ if ( $messages->{'ResFound'}) {
         ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id} );
         my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
 
-        my $patron = Koha::Patrons->find( $nextreservinfo );
-
         $template->param(
             hold_auto_filled => 1,
             print_slip       => C4::Context->preference('HoldsAutoFillPrintSlip'),
-            patron           => $patron,
-            borrowernumber   => $patron->id,
-            biblionumber     => $biblio->id,
+            reserve_id       => $nextreservinfo->{reserve_id},
+            itemnumber       => $itemnumber,
         );
 
         if ( $messages->{'transfert'} ) {
             $template->param(
-                itemtitle      => $biblio->title,
-                itemnumber     => $item->itemnumber,
+                itemtitle        => $biblio->title,
                 itembiblionumber => $biblio->biblionumber,
-                iteminfo       => $biblio->author,
-                diffbranch     => 1,
+                iteminfo         => $biblio->author,
+                diffbranch       => 1,
             );
         }
     }
@@ -452,6 +445,7 @@ if ( $messages->{'ResFound'}) {
                 transfertodo => $branchCheck ? undef : 1,
                 reserve_id   => $reserve->{reserve_id},
                 reserved     => 1,
+                itemnumber   => $itemnumber,
             );
         }
 
@@ -463,7 +457,6 @@ if ( $messages->{'ResFound'}) {
         patron         => $patron,
         barcode        => $barcode,
         destbranch     => $reserve->{'branchcode'},
-        itemnumber     => $reserve->{'itemnumber'},
         reservenotes   => $reserve->{'reservenotes'},
         reserve_id     => $reserve->{reserve_id},
         bormessagepref => $holdmsgpreferences->{'transports'},
@@ -514,6 +507,9 @@ foreach my $code ( keys %$messages ) {
     }
     elsif ( $code eq 'NeedsTransfer' ) {
     }
+    elsif ( $code eq 'TransferTrigger' ) {
+        ;    # Handled alongside NeedsTransfer
+    }
     elsif ( $code eq 'Wrongbranch' ) {
     }
     elsif ( $code eq 'Debarred' ) {
@@ -570,7 +566,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
             $ri{duedate} = output_pref($duedate);
             my $patron = Koha::Patrons->find( $riborrowernumber{$_} );
             unless ( $dropboxmode ) {
-                $ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1);
+                $ri{return_overdue} = 1 if (DateTime->compare($duedate, dt_from_string()) == -1);
             } else {
                 $ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
             }
@@ -619,7 +615,6 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
 
 $template->param(
     riloop         => \@riloop,
-    printer        => $printer,
     errmsgloop     => \@errmsgloop,
     exemptfine     => $exemptfine,
     dropboxmode    => $dropboxmode,