|
Lines 241-247
if ($barcode) {
Link Here
|
| 241 |
# save the return |
241 |
# save the return |
| 242 |
# |
242 |
# |
| 243 |
( $returned, $messages, $issueinformation, $borrower ) = |
243 |
( $returned, $messages, $issueinformation, $borrower ) = |
| 244 |
AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override ); |
244 |
AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode, $return_date_override, $dropboxdate ); |
| 245 |
my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn'); |
245 |
my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn'); |
| 246 |
$homeorholdingbranchreturn ||= 'homebranch'; |
246 |
$homeorholdingbranchreturn ||= 'homebranch'; |
| 247 |
|
247 |
|
|
Lines 287-293
if ($barcode) {
Link Here
|
| 287 |
$riduedate{0} = $duedate; |
287 |
$riduedate{0} = $duedate; |
| 288 |
$input{borrowernumber} = $borrower->{'borrowernumber'}; |
288 |
$input{borrowernumber} = $borrower->{'borrowernumber'}; |
| 289 |
$input{duedate} = $duedate; |
289 |
$input{duedate} = $duedate; |
| 290 |
$input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $time_now) == -1); |
290 |
unless ( $dropboxmode ) { |
|
|
291 |
$input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, DateTime->now()) == -1); |
| 292 |
} else { |
| 293 |
$input{return_overdue} = 1 if (DateTime->compare($issueinformation->{date_due}, $dropboxdate) == -1); |
| 294 |
} |
| 291 |
push( @inputloop, \%input ); |
295 |
push( @inputloop, \%input ); |
| 292 |
|
296 |
|
| 293 |
if ( C4::Context->preference("FineNotifyAtCheckin") ) { |
297 |
if ( C4::Context->preference("FineNotifyAtCheckin") ) { |
|
Lines 533-539
foreach ( sort { $a <=> $b } keys %returneditems ) {
Link Here
|
| 533 |
$ri{minute} = $duedate->minute(); |
537 |
$ri{minute} = $duedate->minute(); |
| 534 |
$ri{duedate} = output_pref($duedate); |
538 |
$ri{duedate} = output_pref($duedate); |
| 535 |
my ($b) = GetMemberDetails( $riborrowernumber{$_}, 0 ); |
539 |
my ($b) = GetMemberDetails( $riborrowernumber{$_}, 0 ); |
| 536 |
$ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1 ); |
540 |
unless ( $dropboxmode ) { |
|
|
541 |
$ri{return_overdue} = 1 if (DateTime->compare($duedate, DateTime->now()) == -1); |
| 542 |
} else { |
| 543 |
$ri{return_overdue} = 1 if (DateTime->compare($duedate, $dropboxdate) == -1); |
| 544 |
} |
| 537 |
$ri{borrowernumber} = $b->{'borrowernumber'}; |
545 |
$ri{borrowernumber} = $b->{'borrowernumber'}; |
| 538 |
$ri{borcnum} = $b->{'cardnumber'}; |
546 |
$ri{borcnum} = $b->{'cardnumber'}; |
| 539 |
$ri{borfirstname} = $b->{'firstname'}; |
547 |
$ri{borfirstname} = $b->{'firstname'}; |
| 540 |
- |
|
|