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