|
Lines 552-559
sub cancel {
Link Here
|
| 552 |
C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber }); |
552 |
C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber }); |
| 553 |
|
553 |
|
| 554 |
# and, if desired, charge a cancel fee |
554 |
# and, if desired, charge a cancel fee |
| 555 |
my $charge; |
555 |
if ( $params->{'charge_cancel_fee'} ) { |
| 556 |
if (my $item = $self->item) { |
556 |
my $charge; |
|
|
557 |
my $item = $self->item; |
| 557 |
my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed); |
558 |
my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed); |
| 558 |
|
559 |
|
| 559 |
my $rule = Koha::CirculationRules->get_effective_rule( |
560 |
my $rule = Koha::CirculationRules->get_effective_rule( |
|
Lines 566-576
sub cancel {
Link Here
|
| 566 |
); |
567 |
); |
| 567 |
my $rule_value = $rule && $rule->rule_value // ''; |
568 |
my $rule_value = $rule && $rule->rule_value // ''; |
| 568 |
$charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge"); |
569 |
$charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge"); |
| 569 |
} else { |
|
|
| 570 |
$charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge"); |
| 571 |
} |
| 572 |
|
570 |
|
| 573 |
if ( $charge && $params->{'charge_cancel_fee'} ) { |
|
|
| 574 |
my $account = |
571 |
my $account = |
| 575 |
Koha::Account->new( { patron_id => $self->borrowernumber } ); |
572 |
Koha::Account->new( { patron_id => $self->borrowernumber } ); |
| 576 |
$account->add_debit( |
573 |
$account->add_debit( |
|
Lines 582-588
sub cancel {
Link Here
|
| 582 |
type => 'RESERVE_EXPIRED', |
579 |
type => 'RESERVE_EXPIRED', |
| 583 |
item_id => $self->itemnumber |
580 |
item_id => $self->itemnumber |
| 584 |
} |
581 |
} |
| 585 |
); |
582 |
) if $charge; |
| 586 |
} |
583 |
} |
| 587 |
|
584 |
|
| 588 |
C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, Dumper($self->unblessed) ) |
585 |
C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, Dumper($self->unblessed) ) |
| 589 |
- |
|
|