X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fbranchtransfers.pl;h=85ad30e838e885f9add8c558d82fbb0a8c8a0799;hb=a5edf5011a599108311bb2569d4bfffd6a222ef3;hp=dd4db984200bac901a672a0c7ecab73afdb2cdc7;hpb=7e52a5665c02d76c9f99e64d841be795ca6f0546;p=koha.git

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index dd4db98420..85ad30e838 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -4,7 +4,6 @@
 #written 11/3/2002 by Finlay
 #script to execute branch transfers of books
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -24,36 +23,49 @@
 
 use strict;
 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;
 use C4::Members;
-###############################################
-# constants
-
-my %env;
-my $linecolor1='#ffffcc';
-my $linecolor2='white';
-
-my $branches = getbranches();
-my $printers = getprinters(\%env);
-
 
 ###############################################
 #  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);
 
-my $genbrname = $branches->{$branch}->{'branchname'} ;
-my $genprname = $printers->{$printer}->{'printername'};
+#######################################################################################
+# Make the page .....
+my ( $template, $cookie );
+my $user;
+( $template, $user, $cookie ) = get_template_and_user(
+    {
+        template_name   => "circ/branchtransfers.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
+    }
+);
+
+my $branches = GetBranches;
+my $branch  = GetBranch( $query,  $branches );
 
 my $messages;
 my $found;
@@ -62,222 +74,179 @@ my $waiting;
 my $reqmessage;
 my $cancelled;
 my $setwaiting;
-my $reqbrchname;
-my $user=$query->param('loggedinuser');
-my $request=$query->param('request');
-my $borrnum = $query->param('borrowernumber');
 
-my $tobranchcd=$query->param('tobranchcd');
-my $frbranchcd='';
-my $dbh=C4::Context->dbh;
+my $request        = $query->param('request');
+my $borrowernumber = $query->param('borrowernumber');
+my $tobranchcd     = $query->param('tobranchcd');
+
 ############
 # 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;
+
+    CancelReserve( 0, $item, $borrowernumber );
+    $cancelled   = 1;
+    $reqmessage  = 1;
 }
 
 my $ignoreRs = 0;
-if ($request eq "SetWaiting") {
+if ( $request eq "SetWaiting" ) {
     my $item = $query->param('itemnumber');
-    $tobranchcd = ReserveWaiting($item, $borrnum);
-	$reqbrchname = $branches->{$tobranchcd}->{'branchname'};
-    $ignoreRs = 1;
-	$setwaiting = 1;
-	$reqmessage =1;
+    ModReserveAffect( $item, $borrowernumber );
+    $ignoreRs    = 1;
+    $setwaiting  = 1;
+    $reqmessage  = 1;
 }
-if ($request eq 'KillReserved'){
+if ( $request eq 'KillReserved' ) {
     my $biblio = $query->param('biblionumber');
-    CancelReserve($biblio, 0, $borrnum);
-	$cancelled = 1;
-	$reqmessage =1;
+    CancelReserve( $biblio, 0, $borrowernumber );
+    $cancelled   = 1;
+    $reqmessage  = 1;
 }
 
-
-
 # set up the branchselect options....
 my @branchoptionloop;
-foreach my $br (keys %$branches) {
-    #(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
+foreach my $br (sort {$branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}} keys %$branches ) {
     my %branch;
-    $branch{selected}=($br eq $tobranchcd);
-	$branch{code}=$br;
-	$branch{name}=$branches->{$br}->{'branchname'};
-	push (@branchoptionloop, \%branch);
+    $branch{selected} = ( $br eq $tobranchcd );
+    $branch{code}     = $br;
+    $branch{name}     = $branches->{$br}->{'branchname'};
+    push( @branchoptionloop, \%branch );
 }
 
-
 # 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
+$barcode =~ s/\s*//g;
+# warn "barcode : $barcode";
 if ($barcode) {
-	my $transfered;
-	my $iteminformation;
-	($transfered, $messages, $iteminformation)
-			= transferbook($tobranchcd, $barcode, $ignoreRs,$user);
-	$found = $messages->{'ResFound'};
-	if ($transfered) {
-		my %item;
-		my $frbranchcd = $iteminformation->{'holdingbranch'};
-		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);
-	}
-}
 
-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);
+    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{'title'}        = $iteminformation->{'title'};
+        $item{'author'}       = $iteminformation->{'author'};
+        $item{'itemtype'}     = $iteminformation->{'itemtype'};
+        $item{'ccode'}        = $iteminformation->{'ccode'};
+        $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) = GetBiblioFromItemNumber( GetItemnumberFromBarcode($bc) );
+    $item{'biblionumber'} = $iteminformation->{'biblionumber'};
+    $item{'title'}        = $iteminformation->{'title'};
+    $item{'author'}       = $iteminformation->{'author'};
+    $item{'itemtype'}     = $iteminformation->{'itemtype'};
+    $item{'ccode'}        = $iteminformation->{'ccode'};
+    $item{'frbrname'}     = $branches->{$frbcd}->{'branchname'};
+    $item{'tobrname'}     = $branches->{$tobcd}->{'branchname'};
+    push( @trsfitemloop, \%item );
+}
 
-my $name;
-my $bornum;
-my $borcnum;
 my $itemnumber;
-my $biblionum;
-my $branchname;
-
+my $biblionumber;
 
 #####################
 
 if ($found) {
     my $res = $messages->{'ResFound'};
-	$branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
-	my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
-	$name = name($borr);
-	$bornum = $borr->{'borrowernumber'}; #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;
+    }
+    if ( $res->{'ResFound'} eq "Reserved" ) {
+        $reserved  = 1;
+        $biblionumber = $res->{'biblionumber'};
+    }
 }
 
 #####################
 
 my @errmsgloop;
-foreach my $code (keys %$messages) {
-	my %err;
-    $err{errbadcode} = ($code eq 'BadBarcode');
-	if ($code eq 'BadBarcode') {
-		$err{msg}=$messages->{'BadBarcode'};
-	}
+foreach my $code ( keys %$messages ) {
+    my %err;
 
-    $err{errispermanent} = ($code eq 'IsPermanent');
-    if ($code eq 'IsPermanent'){
-		$err{msg} = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
-		# Here, msg contains the branchname
-		# Not so satisfied with this... But should work
+    if ( $code eq 'BadBarcode' ) {
+        $err{msg}        = $messages->{'BadBarcode'};
+        $err{errbadcode} = 1;
     }
-    $err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
 
-	$err{errwasreturned} = ($code eq 'WasReturned');
-	if ($code eq 'WasReturned') {
-		my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
-		$name =name($borrowerinfo);
-		$bornum =$borrowerinfo->{'borrowernumber'};
-		$borcnum =$borrowerinfo->{'cardnumber'};
+    if ( $code eq 'IsPermanent' ) {
+        $err{errispermanent} = 1;
+        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
     }
-    if ($code eq 'WasTransfered'){
-# Put code here if you want to notify the user that item was transfered...
+    $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
+
+    if ( $code eq 'WasReturned' ) {
+        $err{errwasreturned} = 1;
+		$err{borrowernumber}=$messages->{'WasReturned'};
+		my $borrower = GetMember($messages->{'WasReturned'},'borrowernumber');
+		$err{title}=$borrower->{'title'};
+		$err{firstname}=$borrower->{'firstname'};
+		$err{surname}=$borrower->{'surname'};
+		$err{cardnumber} =$borrower->{'cardnumber'};
     }
-	push (@errmsgloop, \%err);
+    push( @errmsgloop, \%err );
 }
 
-
-#######################################################################################
-# Make the page .....
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "circ/branchtransfers.tmpl",
-							query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {editcatalogue => 1},
-                         });
-$template->param(	genbrname => $genbrname,
-								genprname => $genprname,
-								branch => $branch,
-								printer => $printer,
-								found => $found,
-								reserved => $reserved,
-								waiting => $waiting,
-								name => $name,
-								bornum => $bornum,
-								borcnum => $borcnum,
-								branchname => $branchname,
-								itemnumber => $itemnumber,
-								barcode => $barcode,
-								biblionumber => $biblionum,
-								tobranchcd => $tobranchcd,
-								reqmessage => $reqmessage,
-								cancelled => $cancelled,
-								setwaiting => $setwaiting,
-								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        => \@branchoptionloop,
+    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'};
+    my ($borinfo) = @_;
+    return $borinfo->{'surname'} . " "
+      . $borinfo->{'title'} . " "
+      . $borinfo->{'firstname'};
 }
 
 # Local Variables: