=cut
-use strict;
-use warnings;
+use Modern::Perl;
-use Carp 'verbose';
-$SIG{ __DIE__ } = sub { Carp::confess( @_ ) };
+# FIXME There are weird things going on with $patron and $borrowernumber in this script
use CGI qw ( -utf8 );
use DateTime;
use Koha::AuthorisedValues;
use Koha::DateUtils;
use Koha::Calendar;
-use Koha::Checkouts;
use Koha::BiblioFrameworks;
+use Koha::Holds;
+use Koha::Items;
+use Koha::Patrons;
my $query = new CGI;
if ( $query->param('print_slip') ) {
$template->param(
print_slip => 1,
- borrowernumber => scalar $query->param('borrowernumber'),
+ borrowernumber => scalar $query->param('borrowernumber'), # FIXME We should send a Koha::Patron and raise an error if not exist.
biblionumber => scalar $query->param('biblionumber'),
+ itemnumber => scalar $query->param('itemnumber'),
);
}
}
if ( $query->param('reserve_id') ) {
- my $item = $query->param('itemnumber');
+ my $itemnumber = $query->param('itemnumber');
my $borrowernumber = $query->param('borrowernumber');
my $reserve_id = $query->param('reserve_id');
my $diffBranchReturned = $query->param('diffBranch');
- my $iteminfo = GetBiblioFromItemNumber($item);
my $cancel_reserve = $query->param('cancel_reserve');
# fix up item type for display
- $iteminfo->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $iteminfo->{'itype'} : $iteminfo->{'itemtype'};
+ my $item = Koha::Items->find( $itemnumber );
+ my $biblio = $item->biblio;
if ( $cancel_reserve ) {
- CancelReserve({ reserve_id => $reserve_id, charge_cancel_fee => !$forgivemanualholdsexpire });
+ my $hold = Koha::Holds->find( $reserve_id );
+ if ( $hold ) {
+ $hold->cancel( { charge_cancel_fee => !$forgivemanualholdsexpire } );
+ } # FIXME else?
} else {
my $diffBranchSend = ($userenv_branch ne $diffBranchReturned) ? $diffBranchReturned : undef;
# diffBranchSend tells ModReserveAffect whether document is expected in this library or not,
# i.e., whether to apply waiting status
- ModReserveAffect( $item, $borrowernumber, $diffBranchSend, $reserve_id );
+ ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id );
}
# check if we have other reserves for this document, if we have a return send the message of transfer
- my ( $messages, $nextreservinfo ) = GetOtherReserves($item);
+ my ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
- my $borr = GetMember( borrowernumber => $nextreservinfo );
- my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
+ my $patron = Koha::Patrons->find( $nextreservinfo );
+ my $name = $patron ? $patron->surname . ", " . $patron->title . " " . $patron->firstname : '';
if ( $messages->{'transfert'} ) {
$template->param(
- itemtitle => $iteminfo->{'title'},
- itemnumber => $iteminfo->{'itemnumber'},
- itembiblionumber => $iteminfo->{'biblionumber'},
- iteminfo => $iteminfo->{'author'},
+ itemtitle => $biblio->title,
+ itemnumber => $item->itemnumber,
+ itembiblionumber => $biblio->biblionumber,
+ iteminfo => $biblio->author,
name => $name,
- borrowernumber => $borrowernumber,
- borcnum => $borr->{'cardnumber'},
- borfirstname => $borr->{'firstname'},
- borsurname => $borr->{'surname'},
- borcategory => $borr->{'description'},
+ patron => $patron,
diffbranch => 1,
);
}
my $borrower;
my $returned = 0;
my $messages;
-my $issueinformation;
+my $issue;
my $itemnumber;
my $barcode = $query->param('barcode');
my $exemptfine = $query->param('exemptfine');
if ($barcode) {
$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
$barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter');
- $itemnumber = GetItemnumberFromBarcode($barcode);
+ my $item = Koha::Items->find({ barcode => $barcode });
+
+ if ( $item ) {
+ $itemnumber = $item->itemnumber;
+ # Check if we should display a checkin message, based on the the item
+ # type of the checked in item
+ my $itemtype = Koha::ItemTypes->find( $item->effective_itemtype );
+ if ( $itemtype && $itemtype->checkinmsg ) {
+ $template->param(
+ checkinmsg => $itemtype->checkinmsg,
+ checkinmsgtype => $itemtype->checkinmsgtype,
+ );
+ }
-#
-# save the return
-#
+ # make sure return branch respects home branch circulation rules, default to homebranch
+ my $hbr = GetBranchItemRule($item->homebranch, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch";
+ $returnbranch = $hbr ne 'noreturn' ? $item->$hbr : $userenv_branch; # can be noreturn, homebranch or holdingbranch
- # get biblio description
- my $biblio = GetBiblioFromItemNumber($itemnumber);
- # fix up item type for display
- $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
+ my $materials = $item->materials;
+ my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials });
+ $materials = $descriptions->{lib} // $materials;
- # Check if we should display a checkin message, based on the the item
- # type of the checked in item
- my $itemtype = Koha::ItemTypes->find( $biblio->{'itemtype'} );
- if ( $itemtype && $itemtype->checkinmsg ) {
+ my $checkout = $item->checkout;
+ my $biblio = $item->biblio;
$template->param(
- checkinmsg => $itemtype->checkinmsg,
- checkinmsgtype => $itemtype->checkinmsgtype,
+ title => $biblio->title,
+ homebranch => $item->homebranch,
+ holdingbranch => $item->holdingbranch,
+ returnbranch => $returnbranch,
+ author => $biblio->author,
+ itembarcode => $item->barcode,
+ itemtype => $item->effective_itemtype,
+ ccode => $item->ccode,
+ itembiblionumber => $biblio->biblionumber,
+ biblionumber => $biblio->biblionumber,
+ additional_materials => $materials,
+ issue => $checkout,
);
- }
-
- # make sure return branch respects home branch circulation rules, default to homebranch
- my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype ? $itemtype->itemtype : undef )->{'returnbranch'} || "homebranch";
- $returnbranch = $biblio->{$hbr};
-
- my $materials = $biblio->{'materials'};
- my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => '', kohafield =>'items.materials', authorised_value => $materials });
- $materials = $descriptions->{lib} // $materials;
-
- my $issue = GetItemIssue($itemnumber);
-
- $template->param(
- title => $biblio->{'title'},
- homebranch => $biblio->{'homebranch'},
- holdingbranch => $biblio->{'holdingbranch'},
- returnbranch => $returnbranch,
- author => $biblio->{'author'},
- itembarcode => $biblio->{'barcode'},
- itemtype => $biblio->{'itemtype'},
- ccode => $biblio->{'ccode'},
- itembiblionumber => $biblio->{'biblionumber'},
- biblionumber => $biblio->{'biblionumber'},
- borrower => $borrower,
- additional_materials => $materials,
- issue => $issue,
- );
+ } # FIXME else we should not call AddReturn but set BadBarcode directly instead
my %input = (
counter => 0,
barcode => $barcode,
);
+
# do the return
- ( $returned, $messages, $issueinformation, $borrower ) =
+ ( $returned, $messages, $issue, $borrower ) =
AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override, $dropboxdate );
if ($returned) {
my $time_now = DateTime->now( time_zone => C4::Context->tz )->truncate( to => 'minute');
- my $duedate = $issueinformation->{date_due}->strftime('%Y-%m-%d %H:%M');
+ my $date_due_dt = dt_from_string( $issue->date_due, 'sql' );
+ my $duedate = $date_due_dt->strftime('%Y-%m-%d %H:%M');
$returneditems{0} = $barcode;
$riborrowernumber{0} = $borrower->{'borrowernumber'};
$riduedate{0} = $duedate;
$input{borrowernumber} = $borrower->{'borrowernumber'};
$input{duedate} = $duedate;
unless ( $dropboxmode ) {
- $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, DateTime->now()) == -1);
+ $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, DateTime->now()) == -1);
} else {
- $input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $dropboxdate) == -1);
+ $input{return_overdue} = 1 if (DateTime->compare($date_due_dt, $dropboxdate) == -1);
}
push( @inputloop, \%input );
if (C4::Context->preference("WaitingNotifyAtCheckin") ) {
#Check for waiting holds
- my @reserves = GetReservesFromBorrowernumber($borrower->{'borrowernumber'});
- my $waiting_holds = 0;
- foreach my $num_res (@reserves) {
- if ( $num_res->{'found'} eq 'W' && $num_res->{'branchcode'} eq $userenv_branch) {
- $waiting_holds++;
- }
- }
+ my $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
+ my $waiting_holds = $patron->holds->search({ found => 'W', branchcode => $userenv_branch })->count;
if ($waiting_holds > 0) {
$template->param(
waiting_holds => $waiting_holds,
my $reserved = 0;
# new op dev : we check if the document must be returned to his homebranch directly,
-# if the document is transfered, we have warning message .
+# if the document is transferred, we have warning message .
if ( $messages->{'WasTransfered'} ) {
$template->param(
);
}
-# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)
+# case of wrong transfert, if the document wasn't transferred to the right library (according to branchtransfer (tobranch) BDD)
if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
$template->param(
);
my $reserve = $messages->{'ResFound'};
- my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
- my $name = $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'};
+ if ( $reserve ) {
+ my $patron = Koha::Patrons->find( $reserve->{'borrowernumber'} );
+ my $name = $patron->surname . ", " . $patron->title . " " . $patron->firstname;
+ $template->param(
+ patron => $patron,
+ );
+ }
$template->param(
- wname => $name,
- wborfirstname => $borr->{'firstname'},
- wborsurname => $borr->{'surname'},
- wborcategory => $borr->{'description'},
- wbortitle => $borr->{'title'},
- wborphone => $borr->{'phone'},
- wboremail => $borr->{'email'},
- streetnumber => $borr->{streetnumber},
- streettype => $borr->{streettype},
- address => $borr->{'address'},
- address2 => $borr->{'address2'},
- city => $borr->{'city'},
- zipcode => $borr->{'zipcode'},
- state => $borr->{'state'},
- country => $borr->{'country'},
- wborrowernumber => $reserve->{'borrowernumber'},
- wborcnum => $borr->{'cardnumber'},
- wtransfertFrom => $userenv_branch,
+ wtransfertFrom => $userenv_branch,
);
}
#
if ( $messages->{'ResFound'}) {
my $reserve = $messages->{'ResFound'};
- my $borr = C4::Members::GetMember( borrowernumber => $reserve->{'borrowernumber'} );
+ my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } );
- if ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
+
+ if ( $reserve->{'ResFound'} eq "Reserved" && C4::Context->preference('HoldsAutoFill') ) {
+ my $item = Koha::Items->find( $itemnumber );
+ my $biblio = $item->biblio;
+
+ my $diffBranchSend = ($userenv_branch ne $reserve->{branchcode}) ? $reserve->{branchcode} : undef;
+ ModReserveAffect( $reserve->{itemnumber}, $reserve->{borrowernumber}, $diffBranchSend, $reserve->{reserve_id} );
+ my ( $messages, $nextreservinfo ) = GetOtherReserves($reserve->{itemnumber});
+
+ my $patron = Koha::Patrons->find( $nextreservinfo );
+
+ $template->param(
+ hold_auto_filled => 1,
+ print_slip => C4::Context->preference('HoldsAutoFillPrintSlip'),
+ patron => $patron,
+ borrowernumber => $patron->id,
+ biblionumber => $biblio->id,
+ );
+
+ if ( $messages->{'transfert'} ) {
+ $template->param(
+ itemtitle => $biblio->title,
+ itemnumber => $item->itemnumber,
+ itembiblionumber => $biblio->biblionumber,
+ iteminfo => $biblio->author,
+ diffbranch => 1,
+ );
+ }
+ }
+ elsif ( $reserve->{'ResFound'} eq "Waiting" or $reserve->{'ResFound'} eq "Reserved" ) {
if ( $reserve->{'ResFound'} eq "Waiting" ) {
$template->param(
waiting => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ),
);
}
- # same params for Waiting or Reserved
- $template->param(
- found => 1,
- name => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'},
- borfirstname => $borr->{'firstname'},
- borsurname => $borr->{'surname'},
- borcategory => $borr->{'description'},
- bortitle => $borr->{'title'},
- borphone => $borr->{'phone'},
- boremail => $borr->{'email'},
- streetnumber => $borr->{streetnumber},
- streettype => $borr->{streettype},
- address => $borr->{'address'},
- address2 => $borr->{'address2'},
- city => $borr->{'city'},
- zipcode => $borr->{'zipcode'},
- state => $borr->{'state'},
- country => $borr->{'country'},
- borcnum => $borr->{'cardnumber'},
- debarred => $borr->{'debarred'},
- gonenoaddress => $borr->{'gonenoaddress'},
- barcode => $barcode,
- destbranch => $reserve->{'branchcode'},
- borrowernumber => $reserve->{'borrowernumber'},
- itemnumber => $reserve->{'itemnumber'},
- reservenotes => $reserve->{'reservenotes'},
- reserve_id => $reserve->{reserve_id},
- bormessagepref => $holdmsgpreferences->{'transports'},
- );
} # else { ; } # error?
+
+ # same params for Waiting or Reserved
+ $template->param(
+ found => 1,
+ patron => $patron,
+ barcode => $barcode,
+ destbranch => $reserve->{'branchcode'},
+ itemnumber => $reserve->{'itemnumber'},
+ reservenotes => $reserve->{'reservenotes'},
+ reserve_id => $reserve->{reserve_id},
+ bormessagepref => $holdmsgpreferences->{'transports'},
+ );
}
# Error Messages
elsif ( $code eq 'NotIssued' ) {
$err{notissued} = 1;
$err{msg} = '';
- $err{msg} = $messages->{'IsPermanent'} if $messages->{'IsPermanent'};
}
elsif ( $code eq 'LocalUse' ) {
$err{localuse} = 1;
}
elsif ( $code eq 'WasLost' ) {
$err{waslost} = 1;
+ $exit_required_p = 1 if C4::Context->preference("BlockReturnOfLostItems");
}
elsif ( $code eq 'LostItemFeeRefunded' ) {
$template->param( LostItemFeeRefunded => 1 );
$err{withdrawn} = 1;
$exit_required_p = 1 if C4::Context->preference("BlockReturnOfWithdrawnItems");
}
- elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) {
- if ( $messages->{'IsPermanent'} ne $userenv_branch ) {
- $err{ispermanent} = 1;
- $err{msg} = $messages->{'IsPermanent'};
- }
- }
elsif ( $code eq 'WrongTransfer' ) {
; # FIXME... anything to do here?
}
elsif ( $code eq 'NotForLoanStatusUpdated' ) {
$err{NotForLoanStatusUpdated} = $messages->{NotForLoanStatusUpdated};
}
+ elsif ( $code eq 'DataCorrupted' ) {
+ $err{data_corrupted} = 1;
+ }
else {
die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.
# This forces the issue of staying in sync w/ Circulation.pm
$ri{hour} = $duedate->hour();
$ri{minute} = $duedate->minute();
$ri{duedate} = output_pref($duedate);
- my $b = C4::Members::GetMember( borrowernumber => $riborrowernumber{$_} );
+ my $patron = Koha::Patrons->find( $riborrowernumber{$_} );
unless ( $dropboxmode ) {
$ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1);
} else {
$ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1);
}
- $ri{borrowernumber} = $b->{'borrowernumber'};
- $ri{borcnum} = $b->{'cardnumber'};
- $ri{borfirstname} = $b->{'firstname'};
- $ri{borsurname} = $b->{'surname'};
- $ri{bortitle} = $b->{'title'};
- $ri{bornote} = $b->{'borrowernotes'};
- $ri{borcategorycode}= $b->{'categorycode'};
- $ri{borissuescount} = Koha::Checkouts->count( { borrowernumber => $b->{'borrowernumber'} } );
+ $ri{patron} = $patron,
+ $ri{borissuescount} = $patron->checkouts->count;
}
else {
$ri{borrowernumber} = $riborrowernumber{$_};
}
- # my %ri;
- my $biblio = GetBiblioFromItemNumber(GetItemnumberFromBarcode($bar_code));
- my $item = GetItem( GetItemnumberFromBarcode($bar_code) );
- # fix up item type for display
- $biblio->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $biblio->{'itype'} : $biblio->{'itemtype'};
- $ri{itembiblionumber} = $biblio->{'biblionumber'};
- $ri{itemtitle} = $biblio->{'title'};
- $ri{itemauthor} = $biblio->{'author'};
- $ri{itemcallnumber} = $biblio->{'itemcallnumber'};
- $ri{dateaccessioned} = $item->{dateaccessioned};
- $ri{itemtype} = $biblio->{'itemtype'};
- $ri{itemnote} = $biblio->{'itemnotes'};
- $ri{itemnotes_nonpublic} = $item->{'itemnotes_nonpublic'};
- $ri{ccode} = $biblio->{'ccode'};
- $ri{enumchron} = $biblio->{'enumchron'};
- $ri{itemnumber} = $biblio->{'itemnumber'};
+ my $item = Koha::Items->find({ barcode => $bar_code });
+ next unless $item; # FIXME The item has been deleted in the meantime,
+ # we could handle that better displaying a message in the template
+ my $biblio = $item->biblio;
+ # FIXME pass $item to the template and we are done here...
+ $ri{itembiblionumber} = $biblio->biblionumber;
+ $ri{itemtitle} = $biblio->title;
+ $ri{itemauthor} = $biblio->author;
+ $ri{itemcallnumber} = $item->itemcallnumber;
+ $ri{dateaccessioned} = $item->dateaccessioned;
+ $ri{itemtype} = $item->effective_itemtype;
+ $ri{itemnote} = $item->itemnotes;
+ $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
+ $ri{ccode} = $item->ccode;
+ $ri{enumchron} = $item->enumchron;
+ $ri{itemnumber} = $item->itemnumber;
$ri{barcode} = $bar_code;
- $ri{homebranch} = $item->{'homebranch'};
- $ri{holdingbranch} = $item->{'holdingbranch'};
+ $ri{homebranch} = $item->homebranch;
+ $ri{holdingbranch} = $item->holdingbranch;
- $ri{location} = $biblio->{'location'};
+ $ri{location} = $item->location;
my $shelfcode = $ri{'location'};
$ri{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
forgivemanualholdsexpire => $forgivemanualholdsexpire,
overduecharges => $overduecharges,
AudioAlerts => C4::Context->preference("AudioAlerts"),
- BlockReturnOfWithdrawnItems => C4::Context->preference("BlockReturnOfWithdrawnItems"),
);
-$itemnumber = GetItemnumberFromBarcode( $barcode );
-if ( $itemnumber ) {
+my $item_from_barcode = Koha::Items->find({barcode => $barcode }); # How many times do we fetch this item?!?
+if ( $item_from_barcode ) {
+ $itemnumber = $item_from_barcode->itemnumber;
my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber );
if ( $holdingBranch and $collectionBranch ) {
$holdingBranch //= '';
projects / koha.git / blobdiff