Bug 32997: Add REST API endpoint to list authorised values for multiple given categories

[srvgit] / Koha / Item / Transfer.pm

diff --git a/Koha/Item/Transfer.pm b/Koha/Item/Transfer.pm
index aded4e2..286e0fd 100644 (file)
--- a/Koha/Item/Transfer.pm
+++ b/Koha/Item/Transfer.pm
@@ -17,13 +17,11 @@ package Koha::Item::Transfer;
 
 use Modern::Perl;
 
-use Carp;
-use Try::Tiny;
 
-use C4::Items;
+use C4::Items qw( CartToShelf ModDateLastSeen );
 
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Exceptions::Item::Transfer;
 
 use base qw(Koha::Object);
@@ -52,6 +50,34 @@ sub item {
     return Koha::Item->_new_from_dbic($item_rs);
 }
 
+=head3 from_library
+
+  my $from_library = $transfer->from_library;
+
+Returns the associated from_library for this transfer.
+
+=cut
+
+sub from_library {
+    my ($self) = @_;
+    my $from_library_rs = $self->_result->frombranch;
+    return Koha::Library->_new_from_dbic($from_library_rs);
+}
+
+=head3 to_library
+
+  my $to_library = $transfer->to_library;
+
+Returns the associated to_library for this transfer.
+
+=cut
+
+sub to_library {
+    my ($self) = @_;
+    my $to_library_rs = $self->_result->tobranch;
+    return Koha::Library->_new_from_dbic($to_library_rs);
+}
+
 =head3 transit
 
 Set the transfer as in transit by updating the datesent time.
@@ -134,24 +160,14 @@ sub cancel {
         error => "The 'reason' parameter is mandatory" )
       unless defined($params->{reason});
 
-    my $in_transit = $self->in_transit;
-
     # Throw exception if item is in transit already
-    Koha::Exceptions::Item::Transfer::InTransit->throw() if ( !$params->{force} && $in_transit );
+    Koha::Exceptions::Item::Transfer::InTransit->throw() if ( !$params->{force} && $self->in_transit );
 
     # Update the cancelled date
     $self->set(
         { datecancelled => dt_from_string, cancellation_reason => $params->{reason} } )
       ->store;
 
-    # Set up return transfer if transfer was force cancelled whilst in transit
-    # NOTE: We don't catch here, as we're happy to fail if there are already
-    # other transfers in the queue.
-    try {
-        $self->item->request_transfer(
-            { to => $self->frombranch, reason => 'TransferCancellation' } );
-    };
-
     return $self;
 }