}
}
- if (not C4::Context->preference('AllowMultipleIssuesOnABiblio')) {
+ if (
+ !C4::Context->preference('AllowMultipleIssuesOnABiblio') &&
+ # don't do the multiple loans per bib check if we've
+ # already determined that we've got a loan on the same item
+ !$issuingimpossible{NO_MORE_RENEWALS} &&
+ !$needsconfirmation{RENEW_ISSUE}
+ ) {
# Check if borrower has already issued an item from the same biblio
# Only if it's not a subscription
my $biblionumber = $item->{biblionumber};
biblionumber => $biblionumber,
} );
my @issues = $issues ? @$issues : ();
- # If there is at least one issue on another item than the item we want to checkout
- if (scalar @issues > 0 and $issues[0]->{itemnumber} != $item->{itemnumber}) {
+ # if we get here, we don't already have a loan on this item,
+ # so if there are any loans on this bib, ask for confirmation
+ if (scalar @issues > 0) {
$needsconfirmation{BIBLIO_ALREADY_ISSUED} = 1;
}
}
=head2 AddReturn
($doreturn, $messages, $iteminformation, $borrower) =
- &AddReturn($barcode, $branch, $exemptfine, $dropbox);
+ &AddReturn( $barcode, $branch [,$exemptfine] [,$dropbox] [,$returndate] );
Returns a book.
=item C<$branch> is the code of the branch where the book is being returned.
=item C<$exemptfine> indicates that overdue charges for the item will be
-removed.
+removed. Optional.
=item C<$dropbox> indicates that the check-in date is assumed to be
yesterday, or the last non-holiday as defined in C4::Calendar . If
overdue charges are applied and C<$dropbox> is true, the last charge
will be removed. This assumes that the fines accrual script has run
-for _today_.
+for _today_. Optional.
+
+=item C<$return_date> allows the default return date to be overridden
+by the given return date. Optional.
=back
=cut
sub AddReturn {
- my ( $barcode, $branch, $exemptfine, $dropbox ) = @_;
+ my ( $barcode, $branch, $exemptfine, $dropbox, $return_date ) = @_;
if ($branch and not GetBranchDetail($branch)) {
warn "AddReturn error: branch '$branch' not found. Reverting to " . C4::Context->userenv->{'branch'};
my $borrowernumber = $borrower->{'borrowernumber'} || undef; # we don't know if we had a borrower or not
+ my $yaml = C4::Context->preference('UpdateNotForLoanStatusOnCheckin');
+ if ($yaml) {
+ $yaml = "$yaml\n\n"; # YAML is anal on ending \n. Surplus does not hurt
+ my $rules;
+ eval { $rules = YAML::Load($yaml); };
+ if ($@) {
+ warn "Unable to parse UpdateNotForLoanStatusOnCheckin syspref : $@";
+ }
+ else {
+ foreach my $key ( keys %$rules ) {
+ if ( $item->{notforloan} eq $key ) {
+ $messages->{'NotForLoanStatusUpdated'} = { from => $item->{notforloan}, to => $rules->{$key} };
+ ModItem( { notforloan => $rules->{$key} }, undef, $itemnumber );
+ last;
+ }
+ }
+ }
+ }
+
+
# check if the book is in a permanent collection....
# FIXME -- This 'PE' attribute is largely undocumented. afaict, there's no user interface that reflects this functionality.
if ( $hbr ) {
# case of a return of document (deal with issues and holdingbranch)
my $today = DateTime->now( time_zone => C4::Context->tz() );
+
if ($doreturn) {
- my $datedue = $issue->{date_due};
+ my $datedue = $issue->{date_due};
$borrower or warn "AddReturn without current borrower";
my $circControlBranch;
if ($dropbox) {
# FIXME: check issuedate > returndate, factoring in holidays
#$circControlBranch = _GetCircControlBranch($item,$borrower) unless ( $item->{'issuedate'} eq C4::Dates->today('iso') );;
$circControlBranch = _GetCircControlBranch($item,$borrower);
- $issue->{'overdue'} = DateTime->compare($issue->{'date_due'}, $today ) == -1 ? 1 : 0;
+ $issue->{'overdue'} = DateTime->compare($issue->{'date_due'}, $today ) == -1 ? 1 : 0;
}
if ($borrowernumber) {
- if( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'}){
- # we only need to calculate and change the fines if we want to do that on return
- # Should be on for hourly loans
+ if ( ( C4::Context->preference('CalculateFinesOnReturn') && $issue->{'overdue'} ) || $return_date ) {
+ # we only need to calculate and change the fines if we want to do that on return
+ # Should be on for hourly loans
my $control = C4::Context->preference('CircControl');
my $control_branchcode =
( $control eq 'ItemHomeLibrary' ) ? $item->{homebranch}
: ( $control eq 'PatronLibrary' ) ? $borrower->{branchcode}
: $issue->{branchcode};
+ my $date_returned =
+ $return_date ? dt_from_string($return_date) : $today;
+
my ( $amount, $type, $unitcounttotal ) =
C4::Overdues::CalcFine( $item, $borrower->{categorycode},
- $control_branchcode, $datedue, $today );
+ $control_branchcode, $datedue, $date_returned );
$type ||= q{};
- if ( $amount > 0
- && C4::Context->preference('finesMode') eq 'production' )
- {
- C4::Overdues::UpdateFine( $issue->{itemnumber},
- $issue->{borrowernumber},
- $amount, $type, output_pref($datedue) );
+ if ( C4::Context->preference('finesMode') eq 'production' ) {
+ if ( $amount > 0 ) {
+ C4::Overdues::UpdateFine( $issue->{itemnumber},
+ $issue->{borrowernumber},
+ $amount, $type, output_pref($datedue) );
+ }
+ elsif ($return_date) {
+
+ # Backdated returns may have fines that shouldn't exist,
+ # so in this case, we need to drop those fines to 0
+
+ C4::Overdues::UpdateFine( $issue->{itemnumber},
+ $issue->{borrowernumber},
+ 0, $type, output_pref($datedue) );
+ }
}
}
MarkIssueReturned( $borrowernumber, $item->{'itemnumber'},
- $circControlBranch, '', $borrower->{'privacy'} );
+ $circControlBranch, $return_date, $borrower->{'privacy'} );
# FIXME is the "= 1" right? This could be the borrower hash.
$messages->{'WasReturned'} = 1;
defined($fix) or warn "_FixOverduesOnReturn($borrowernumber, $item->{itemnumber}...) failed!"; # zero is OK, check defined
if ( $issue->{overdue} && $issue->{date_due} ) {
-# fix fine days
- my $debardate =
- _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today );
- $messages->{Debarred} = $debardate if ($debardate);
+ # fix fine days
+ my ($debardate,$reminder) = _debar_user_on_return( $borrower, $item, $issue->{date_due}, $today );
+ if ($reminder){
+ $messages->{'PrevDebarred'} = $debardate;
+ } else {
+ $messages->{'Debarred'} = $debardate if $debardate;
+ }
+ # there's no overdue on the item but borrower had been previously debarred
+ } elsif ( $issue->{date_due} and $borrower->{'debarred'} ) {
+ my $borrower_debar_dt = dt_from_string( $borrower->{debarred} );
+ $borrower_debar_dt->truncate(to => 'day');
+ my $today_dt = $today->clone()->truncate(to => 'day');
+ if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
+ $messages->{'PrevDebarred'} = $borrower->{'debarred'};
+ }
}
}
# grace period is measured in the same units as the loan
my $grace =
DateTime::Duration->new( $unit => $issuingrule->{firstremind} );
+
if ( $deltadays->subtract($grace)->is_positive() ) {
+ my $suspension_days = $deltadays * $finedays;
+
+ # If the max suspension days is < than the suspension days
+ # the suspension days is limited to this maximum period.
+ my $max_sd = $issuingrule->{maxsuspensiondays};
+ if ( defined $max_sd ) {
+ $max_sd = DateTime::Duration->new( days => $max_sd );
+ $suspension_days = $max_sd
+ if DateTime::Duration->compare( $max_sd, $suspension_days ) < 0;
+ }
my $new_debar_dt =
- $dt_today->clone()->add_duration( $deltadays * $finedays );
+ $dt_today->clone()->add_duration( $suspension_days );
Koha::Borrower::Debarments::AddUniqueDebarment({
borrowernumber => $borrower->{borrowernumber},
expiration => $new_debar_dt->ymd(),
type => 'SUSPENSION',
});
-
+ # if borrower was already debarred but does not get an extra debarment
+ if ( $borrower->{debarred} eq Koha::Borrower::Debarments::IsDebarred($borrower->{borrowernumber}) ) {
+ return ($borrower->{debarred},1);
+ }
return $new_debar_dt->ymd();
}
}
projects / koha_fer / blobdiff