X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fbranchtransfers.pl;h=3be7bb4387a22c8b2c98144df06c556797ace9d4;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=175b7bfb9dddbb38b4f17e0071312b5624f8c8f5;hpb=92d88b35a76ca002f01daad597bc179c1ade6378;p=koha_fer

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index 175b7bfb9d..3be7bb4387 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -1,11 +1,9 @@
 #!/usr/bin/perl
-# WARNING: This file uses 4-character tabs!
 
-#written 11/3/2002 by Finlay
 #script to execute branch transfers of books
 
-
 # Copyright 2000-2002 Katipo Communications
+# copyright 2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -18,42 +16,52 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+use warnings;
 use CGI;
-use C4::Circulation::Circ2;
+use C4::Circulation;
 use C4::Output;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use HTML::Template;
+use C4::Reserves;
+use C4::Biblio;
+use C4::Items;
+use C4::Auth qw/:DEFAULT get_session/;
+use C4::Branch; # GetBranches
 use C4::Koha;
-
-###############################################
-# constants
-
-my %env;
-my $linecolor1= 0;
-my $linecolor2= 1;
-
-my $branches = getbranches();
-my $printers = getprinters(\%env);
-
+use C4::Members;
 
 ###############################################
 #  Getting state
 
-my $query=new CGI;
+my $query = new CGI;
 
+if (!C4::Context->userenv){
+	my $sessionID = $query->cookie("CGISESSID");
+    my $session;
+	$session = get_session($sessionID) if $sessionID;
+	if (!$session or $session->param('branch') eq 'NO_LIBRARY_SET'){
+		# no branch set we can't transfer
+		print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
+		exit;
+	}
+}
 
-my $branch = getbranch($query, $branches);
-my $printer = getprinter($query, $printers);
+#######################################################################################
+# Make the page .....
+my ($template, $user, $cookie) = get_template_and_user(
+    {
+        template_name   => "circ/branchtransfers.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
+    }
+);
 
-my $genbrname = $branches->{$branch}->{'branchname'} ;
-my $genprname = $printers->{$printer}->{'printername'};
+my $branches = GetBranches;
 
 my $messages;
 my $found;
@@ -62,263 +70,186 @@ my $waiting;
 my $reqmessage;
 my $cancelled;
 my $setwaiting;
-my $reqbrchname;
-my $allmessages;
 
-my $request=$query->param('request');
-my $borrnum = $query->param('borrowernumber');
-
-my $tobranchcd=$query->param('tobranchcd');
-my $frbranchcd='';
+my $request        = $query->param('request')        || '';
+my $borrowernumber = $query->param('borrowernumber') ||  0;
+my $tobranchcd     = $query->param('tobranchcd')     || '';
 
+my $ignoreRs = 0;
 ############
 # Deal with the requests....
-if ($request eq "KillWaiting") {
+if ( $request eq "KillWaiting" ) {
     my $item = $query->param('itemnumber');
-    CancelReserve(0, $item, $borrnum);
-	$cancelled = 1;
-	$reqmessage =1;
-	$allmessages = 1;
+    CancelReserve({
+        itemnumber     => $item,
+        borrowernumber => $borrowernumber
+    });
+    $cancelled   = 1;
+    $reqmessage  = 1;
 }
-
-my $ignoreRs = 0;
-if ($request eq "SetWaiting") {
+elsif ( $request eq "SetWaiting" ) {
     my $item = $query->param('itemnumber');
-    $tobranchcd = ReserveWaiting($item, $borrnum);
-	$reqbrchname = $branches->{$tobranchcd}->{'branchname'};
-    $ignoreRs = 1;
-	$setwaiting = 1;
-	$reqmessage =1;
-	$allmessages = 1;
+    ModReserveAffect( $item, $borrowernumber );
+    $ignoreRs    = 1;
+    $setwaiting  = 1;
+    $reqmessage  = 1;
 }
-if ($request eq 'KillReserved'){
+elsif ( $request eq 'KillReserved' ) {
     my $biblio = $query->param('biblionumber');
-    CancelReserve($biblio, 0, $borrnum);
-	$cancelled = 1;
-	$reqmessage =1;
-	$allmessages = 1;
-}
-
-
-
-# set up the branchselect options....
-my @branchoptionloop;
-foreach my $br (keys %$branches) {
-    #(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
-    my %branch;
-    $branch{selected}=($br eq $tobranchcd);
-	$branch{code}=$br;
-	$branch{name}=$branches->{$br}->{'branchname'};
-	push (@branchoptionloop, \%branch);
+    CancelReserve({
+        biblionumber   => $biblio,
+        borrowernumber => $borrowernumber
+    });
+    $cancelled   = 1;
+    $reqmessage  = 1;
 }
 
-
 # collect the stack of books already transfered so they can printed...
 my @trsfitemloop;
 my %transfereditems;
-my %frbranchcds;
-my %tobranchcds;
-my $color=$linecolor2;
 my $transfered;
 my $barcode = $query->param('barcode');
+# strip whitespace
+defined $barcode and $barcode =~ s/\s*//g;  # FIXME: barcodeInputFilter
+# warn "barcode : $barcode";
 if ($barcode) {
 
-	my $iteminformation;
-	($transfered, $messages, $iteminformation)
-			= transferbook($tobranchcd, $barcode, $ignoreRs);
-	$found = $messages->{'ResFound'};
-	if ($transfered) {
-		my %item;
-		my $frbranchcd = $iteminformation->{'frbranchcd'};
-		if (not ($found)) {
-			($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-			$item{'color'}=$color;
-			$item{'biblionumber'}=$iteminformation->{'biblionumber'};
-			$item{'title'}=$iteminformation->{'title'};
-			$item{'author'}=$iteminformation->{'author'};
-			$item{'itemtype'}=$iteminformation->{'itemtype'};
-			$item{'frbrname'}=$branches->{$frbranchcd}->{'branchname'};
-			$item{'tobrname'}=$branches->{$tobranchcd}->{'branchname'};
-		}
-		$item{counter}=0;
-		$item{barcode}=$barcode;
-		$item{frombrcd}=$frbranchcd;
-		$item{tobrcd}=$tobranchcd;
-##########
-#Are these lines still useful ???
-		$transfereditems{0}=$barcode;
-		$frbranchcds{0}=$frbranchcd;
-		$tobranchcds{0}=$tobranchcd;
-##########
-		push (@trsfitemloop, \%item);
-	}
+    my $iteminformation;
+    ( $transfered, $messages, $iteminformation ) =
+      transferbook( $tobranchcd, $barcode, $ignoreRs );
+#       use Data::Dumper;
+#       warn "Transfered : $transfered / ".Dumper($messages);
+    $found = $messages->{'ResFound'};
+    if ($transfered) {
+        my %item;
+        my $frbranchcd =  C4::Context->userenv->{'branch'};
+#         if ( not($found) ) {
+        $item{'biblionumber'}          = $iteminformation->{'biblionumber'};
+        $item{'itemnumber'}            = $iteminformation->{'itemnumber'};
+        $item{'title'}                 = $iteminformation->{'title'};
+        $item{'author'}                = $iteminformation->{'author'};
+        $item{'itemtype'}              = $iteminformation->{'itemtype'};
+        $item{'ccode'}                 = $iteminformation->{'ccode'};
+        $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
+        $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
+        $item{'frbrname'}              = $branches->{$frbranchcd}->{'branchname'};
+        $item{'tobrname'}              = $branches->{$tobranchcd}->{'branchname'};
+#         }
+        $item{counter}  = 0;
+        $item{barcode}  = $barcode;
+        $item{frombrcd} = $frbranchcd;
+        $item{tobrcd}   = $tobranchcd;
+        push( @trsfitemloop, \%item );
+#         warn Dumper(@trsfitemloop);
+    }
 }
 
-foreach ($query->param){
-	(next) unless (/bc-(\d*)/);
-	my $counter=$1;
-	my %item;
-	my $bc=$query->param("bc-$counter");
-	my $frbcd=$query->param("fb-$counter");
-	my $tobcd=$query->param("tb-$counter");
-	$counter++;
-	$item{counter}=$counter;
-	$item{barcode}=$bc;
-	$item{frombrcd}=$frbcd;
-	$item{tobrcd}=$tobcd;
-	my ($iteminformation) = getiteminformation(\%env, 0, $bc);
-	($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
-	$item{'color'}=$color;
-	$item{'biblionumber'}=$iteminformation->{'biblionumber'};
-	$item{'title'}=$iteminformation->{'title'};
-	$item{'author'}=$iteminformation->{'author'};
-	$item{'itemtype'}=$iteminformation->{'itemtype'};
-	$item{'frbrname'}=$branches->{$frbcd}->{'branchname'};
-	$item{'tobrname'}=$branches->{$tobcd}->{'branchname'};
-##########
-#Are these lines still useful ???
-	$transfereditems{$counter}=$bc;
-	$frbranchcds{$counter}=$frbcd;
-	$tobranchcds{$counter}=$tobcd;
-#########
-	push (@trsfitemloop, \%item);
+foreach ( $query->param ) {
+    (next) unless (/bc-(\d*)/);
+    my $counter = $1;
+    my %item;
+    my $bc    = $query->param("bc-$counter");
+    my $frbcd = $query->param("fb-$counter");
+    my $tobcd = $query->param("tb-$counter");
+    $counter++;
+    $item{counter}  = $counter;
+    $item{barcode}  = $bc;
+    $item{frombrcd} = $frbcd;
+    $item{tobrcd}   = $tobcd;
+    my ($iteminformation) = GetBiblioFromItemNumber( GetItemnumberFromBarcode($bc) );
+    $item{'biblionumber'}          = $iteminformation->{'biblionumber'};
+    $item{'itemnumber'}            = $iteminformation->{'itemnumber'};
+    $item{'title'}                 = $iteminformation->{'title'};
+    $item{'author'}                = $iteminformation->{'author'};
+    $item{'itemtype'}              = $iteminformation->{'itemtype'};
+    $item{'ccode'}                 = $iteminformation->{'ccode'};
+    $item{'itemcallnumber'}        = $iteminformation->{'itemcallnumber'};
+    $item{'location'}              = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'});
+    $item{'frbrname'}              = $branches->{$frbcd}->{'branchname'};
+    $item{'tobrname'}              = $branches->{$tobcd}->{'branchname'};
+    push( @trsfitemloop, \%item );
 }
 
-my $title;
-my $surname;
-my $firstname;
-my $bornum;
-my $borphone;
-my $borstraddress;
-my $borcity;
-my $borzip;
-my $boremail;
-my $bornum;
-my $borcnum;
 my $itemnumber;
-my $biblionum;
-my $branchname;
-my $wastransferred;
-
+my $biblionumber;
 
 #####################
 
 if ($found) {
     my $res = $messages->{'ResFound'};
-	$branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
-	my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
-	$title = $borr->{'title'};
-	$surname = $borr->{'surname'};
-	$firstname = $borr->{'firstname'};
-	$bornum = $borr->{'borrowernumber'};
-    $borphone = $borr->{'phone'};
-    $borstraddress = $borr->{'streetaddress'};
-	$borcity = $borr->{'city'};
-	$borzip = $borr->{'zipcode'};
-	$boremail = $borr->{'emailadress'};
-	
-	#Hopefully, borr->{borrowernumber}=res->{borrowernumber}
-	$borcnum = $borr->{'cardnumber'};
-	$itemnumber = $res->{'itemnumber'};
+    $itemnumber = $res->{'itemnumber'};
 
-	if ($res->{'ResFound'} eq "Waiting") {
-		$waiting = 1;
-	}
-	if ($res->{'ResFound'} eq "Reserved") {
-		$reserved = 1;
-		$biblionum = $res->{'biblionumber'};
-	}
+    if ( $res->{'ResFound'} eq "Waiting" ) {
+        $waiting = 1;
+    }
+    elsif ( $res->{'ResFound'} eq "Reserved" ) {
+        $reserved  = 1;
+        $biblionumber = $res->{'biblionumber'};
+    }
 }
 
 #####################
 
-my @errmsgloop;
-foreach my $code (keys %$messages) {
-	my %err;
-
-	if ($code eq 'BadBarcode') {
-		$err{msg}=$messages->{'BadBarcode'};
-		$err{errbadcode} = 1;
-		$allmessages = 1;
-	}
-
-    if ($code eq 'IsPermanent'){
-		$err{errispermanent} = 1;
-		$err{msg} = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
-		# Here, msg contains the branchname
-		# Not so satisfied with this... But should work
-		$allmessages = 1;
-    }
-    $err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
-
-	if ($code eq 'WasReturned') {
-		$err{errwasreturned} = 1;
-		$allmessages = 1;
-		my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
-		$title = $borrowerinfo->{'title'};
-		$surname = $borrowerinfo->{'surname'};
-		$firstname = $borrowerinfo->{'firstname'};
-		$bornum =$borrowerinfo->{'borrowernumber'};
-		$borcnum =$borrowerinfo->{'cardnumber'};
-    }
-#    if ($code eq 'WasTransfered'){
-# Put code here if you want to notify the user that item was transfered...
-#		$wastransferred = 1;
-#    }
-	push (@errmsgloop, \%err);
+# Used for branch transfer limits error messages.
+my $codeTypeDescription = 'Collection Code';
+my $codeType = C4::Context->preference("BranchTransferLimitsType");
+if ( $codeType eq 'itemtype' ) {   
+    $codeTypeDescription = 'Item Type';
 }
 
-#######################################################################################
-# Make the page .....
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "circ/branchtransfers.tmpl",
-							query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {circulate => 1},
-                         });
-if($allmessages){
-	$template->param(allmessages => 1);
+my @errmsgloop;
+foreach my $code ( keys %$messages ) {
+    if ( $code ne 'WasTransfered' ) {
+        my %err;
+        if ( $code eq 'BadBarcode' ) {
+            $err{msg}        = $messages->{'BadBarcode'};
+            $err{errbadcode} = 1;
+        }
+        elsif ( $code eq "NotAllowed" ) {
+            warn "NotAllowed: $messages->{'NotAllowed'} to  " . $branches->{ $messages->{'NotAllowed'} }->{'branchname'};
+            # Do we really want a error log message here? --atz
+            $err{errnotallowed} =  1;
+            my ( $tbr, $typecode ) = split( /::/,  $messages->{'NotAllowed'} );
+            $err{tbr}      = $branches->{ $tbr }->{'branchname'};
+            $err{code}     = $typecode;
+            $err{codeType} = $codeTypeDescription;
+        }
+        elsif ( $code eq 'IsPermanent' ) {
+            $err{errispermanent} = 1;
+            $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
+        }
+        elsif ( $code eq 'WasReturned' ) {
+            $err{errwasreturned} = 1;
+            $err{borrowernumber} = $messages->{'WasReturned'};
+            my $borrower = GetMember('borrowernumber'=>$messages->{'WasReturned'});
+            $err{title}      = $borrower->{'title'};
+            $err{firstname}  = $borrower->{'firstname'};
+            $err{surname}    = $borrower->{'surname'};
+            $err{cardnumber} = $borrower->{'cardnumber'};
+        }
+        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
+        push( @errmsgloop, \%err );
+    }
 }
 
-$template->param(	genbrname => $genbrname,
-								genprname => $genprname,
-								branch => $branch,
-								printer => $printer,
-								found => $found,
-								reserved => $reserved,
-								waiting => $waiting,
-								title => $title,
-								surname => $surname,
-								firstname => $firstname,
-								borphone => $borphone,
-								borstraddress => $borstraddress,
-								borcity => $borcity,
-								borzip => $borzip,
-								boremail => $boremail,
-								bornum => $bornum,
-								borcnum => $borcnum,
-								branchname => $branchname,
-								itemnumber => $itemnumber,
-								barcode => $barcode,
-								biblionumber => $biblionum,
-								tobranchcd => $tobranchcd,
-								reqmessage => $reqmessage,
-								cancelled => $cancelled,
-								setwaiting => $setwaiting,
-								wastransferred => $wastransferred,
-								trsfitemloop => \@trsfitemloop,
-								branchoptionloop => \@branchoptionloop,
-								errmsgloop => \@errmsgloop
-							);
+# use Data::Dumper;
+# warn "FINAL ============= ".Dumper(@trsfitemloop);
+$template->param(
+    found                   => $found,
+    reserved                => $reserved,
+    waiting                 => $waiting,
+    borrowernumber          => $borrowernumber,
+    itemnumber              => $itemnumber,
+    barcode                 => $barcode,
+    biblionumber            => $biblionumber,
+    tobranchcd              => $tobranchcd,
+    reqmessage              => $reqmessage,
+    cancelled               => $cancelled,
+    setwaiting              => $setwaiting,
+    trsfitemloop            => \@trsfitemloop,
+    branchoptionloop        => GetBranchesLoop($tobranchcd),
+    errmsgloop              => \@errmsgloop,
+    CircAutocompl           => C4::Context->preference("CircAutocompl")
+);
 output_html_with_http_headers $query, $cookie, $template->output;
 
-
-sub name {
-	my ($borinfo) = @_;
-	return $borinfo->{'surname'}." ".$borinfo->{'title'}." ".$borinfo->{'firstname'};
-}
-
-# Local Variables:
-# tab-width: 4
-# End: