X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=circ%2Fbranchtransfers.pl;h=ab387494aac067b0bb000ac2f1eacd6679f3c9de;hb=b27ef1280a686dca3f9afc89c5d4dc90a2139b7b;hp=70184dc9f98aee78110f54ba18bcbf2b62419a51;hpb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;p=koha.git

diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index 70184dc9f9..ab387494aa 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -17,41 +17,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;
 use C4::Output;
 use C4::Reserves;
 use C4::Biblio;
-use C4::Auth;
+use C4::Items;
+use C4::Auth qw/:DEFAULT get_session/;
 use C4::Branch; # GetBranches
 use C4::Koha;
+use C4::Members;
 
 ###############################################
 #  Getting state
 
 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;
+	}
+}
+
 #######################################################################################
 # Make the page .....
-my ( $template, $cookie );
-my $user;
-( $template, $user, $cookie ) = get_template_and_user(
+my ($template, $user, $cookie) = get_template_and_user(
     {
         template_name   => "circ/branchtransfers.tmpl",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
 
 my $branches = GetBranches;
-my $branch  = GetBranch( $query,  $branches );
 
 my $messages;
 my $found;
@@ -61,50 +72,40 @@ my $reqmessage;
 my $cancelled;
 my $setwaiting;
 
-my $request        = $query->param('request');
-my $borrowernumber = $query->param('borrowernumber');
-my $tobranchcd     = $query->param('tobranchcd');
+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" ) {
     my $item = $query->param('itemnumber');
-
     CancelReserve( 0, $item, $borrowernumber );
     $cancelled   = 1;
     $reqmessage  = 1;
 }
-
-my $ignoreRs = 0;
-if ( $request eq "SetWaiting" ) {
+elsif ( $request eq "SetWaiting" ) {
     my $item = $query->param('itemnumber');
-    $tobranchcd  = ReserveWaiting( $item, $borrowernumber );
+    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, $borrowernumber );
     $cancelled   = 1;
     $reqmessage  = 1;
 }
 
-# set up the branchselect options....
-my @branchoptionloop;
-foreach my $br ( keys %$branches ) {
-    my %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 $transfered;
 my $barcode = $query->param('barcode');
+# strip whitespace
+defined $barcode and $barcode =~ s/\s*//g;  # FIXME: barcodeInputFilter
 # warn "barcode : $barcode";
 if ($barcode) {
 
@@ -170,7 +171,7 @@ if ($found) {
     if ( $res->{'ResFound'} eq "Waiting" ) {
         $waiting = 1;
     }
-    if ( $res->{'ResFound'} eq "Reserved" ) {
+    elsif ( $res->{'ResFound'} eq "Reserved" ) {
         $reserved  = 1;
         $biblionumber = $res->{'biblionumber'};
     }
@@ -178,24 +179,43 @@ if ($found) {
 
 #####################
 
+# Used for branch transfer limits error messages.
+my $codeTypeDescription = 'Collection Code';
+my $codeType = C4::Context->preference("BranchTransferLimitsType");
+if ( $codeType eq 'itemtype' ) {   
+    $codeTypeDescription = 'Item Type';
+}
+
 my @errmsgloop;
 foreach my $code ( keys %$messages ) {
     my %err;
-
     if ( $code eq 'BadBarcode' ) {
         $err{msg}        = $messages->{'BadBarcode'};
         $err{errbadcode} = 1;
     }
-
-    if ( $code eq 'IsPermanent' ) {
+    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'};
     }
-    $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
-
-    if ( $code eq 'WasReturned' ) {
+    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 );
 }
 
@@ -214,18 +234,9 @@ $template->param(
     cancelled               => $cancelled,
     setwaiting              => $setwaiting,
     trsfitemloop            => \@trsfitemloop,
-    branchoptionloop        => \@branchoptionloop,
+    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: