item rework: various changes

[koha_fer] / circ / returns.pl

diff --git a/circ/returns.pl b/circ/returns.pl
index bf79dea..c97bd60 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -28,19 +28,30 @@ script to execute returns of books
 use strict;
 use CGI;
 use C4::Context;
-use C4::Auth;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
 use C4::Circulation;
 use C4::Dates qw/format_date/;
 use C4::Print;
 use C4::Reserves;
 use C4::Biblio;
+use C4::Items;
 use C4::Members;
 use C4::Branch; # GetBranchName
 use C4::Koha;   # FIXME : is it still useful ?
 
 my $query = new CGI;
 
+if (!C4::Context->userenv){
+       my $sessionID = $query->cookie("CGISESSID");
+       my $session = get_session($sessionID);
+       if ($session->param('branch') eq 'NO_LIBRARY_SET'){
+               # no branch set we can't return
+               print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+               exit;
+       }
+} 
+
 #getting the template
 my ( $template, $librarian, $cookie ) = get_template_and_user(
     {
@@ -59,7 +70,7 @@ my $printers = GetPrinters();
 
 #my $branch  = C4::Context->userenv?C4::Context->userenv->{'branch'}:"";
 my $printer = C4::Context->userenv?C4::Context->userenv->{'branchprinter'}:"";
-
+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.....
 #
@@ -100,7 +111,7 @@ foreach ( $query->param ) {
 # Deal with the requests....
 
 if ($query->param('WT-itemNumber')){
-updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
+       updateWrongTransfer ($query->param('WT-itemNumber'),$query->param('WT-waitingAt'),$query->param('WT-From'));
 }
 
 if ( $query->param('resbarcode') ) {
@@ -153,6 +164,17 @@ my $returned = 0;
 my $messages;
 my $issueinformation;
 my $barcode = $query->param('barcode');
+# strip whitespace
+$barcode =~ s/\s*//g;
+my $exemptfine = $query->param('exemptfine');
+
+my $dotransfer = $query->param('dotransfer');
+if ($dotransfer){
+       # An item has been returned to a branch other than the homebranch, and the librarian has choosen to initiate a transfer
+       my $transferitem=$query->param('transferitem');
+       my $tobranch=$query->param('tobranch');
+       ModItemTransfer($transferitem, C4::Context->userenv->{'branch'}, $tobranch); 
+}
 
 # actually return book and prepare item table.....
 if ($barcode) {
@@ -162,7 +184,7 @@ if ($barcode) {
 # save the return
 #
     ( $returned, $messages, $issueinformation, $borrower ) =
-      AddReturn( $barcode, C4::Context->userenv->{'branch'} );
+      AddReturn( $barcode, C4::Context->userenv->{'branch'}, $exemptfine );
     # get biblio description
     my $biblio = GetBiblioFromItemNumber($issueinformation->{'itemnumber'});
     $template->param(
@@ -227,7 +249,20 @@ if ( $messages->{'WasTransfered'} ) {
         found          => 1,
         transfer       => 1,
     );
+}
 
+if ( $messages->{'NeedsTransfer'} ){
+       $template->param(
+               found          => 1,
+               needstransfer  => 1,
+               itemnumber => $issueinformation->{'itemnumber'}
+       );
+}
+
+if ( $messages->{'Wrongbranch'} ){
+       $template->param(
+               wrongbranch => 1,
+       );
 }
 
 # adding a case of wrong transfert, if the document wasn't transfered in the good library (according to branchtransfer (tobranch) BDD)
@@ -265,7 +300,7 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
 #
 # reserve found and item arrived at the expected branch
 #
-if ( $messages->{'ResFound'} and not $messages->{'WrongTransfer'}) {
+if ( $messages->{'ResFound'}) {
     my $reserve        = $messages->{'ResFound'};
     my $branchname = $branches->{ $reserve->{'branchcode'} }->{'branchname'};
     my ($borr) = GetMemberDetails( $reserve->{'borrowernumber'}, 0 );
@@ -387,6 +422,11 @@ foreach my $code ( keys %$messages ) {
     elsif ( $code eq 'WrongTransferItem' ) {
         ;    # FIXME... anything to do here?
     }
+       elsif ( $code eq 'NeedsTransfer' ) {
+       }
+       elsif ( $code eq 'Wrongbranch' ) {
+       }
+               
     else {
         die "Unknown error code $code";    # XXX
     }
@@ -526,6 +566,8 @@ $template->param(
     branchname              => $branches->{C4::Context->userenv->{'branch'}}->{'branchname'},
     printer                 => $printer,
     errmsgloop              => \@errmsgloop,
+    exemptfine              => $exemptfine,
+       overduecharges          => $overduecharges,
 );
 
 # actually print the page!