View | Details | Raw Unified | Return to bug 25711
Collapse All | Expand All

(-)a/Koha/Hold.pm (-8 / +4 lines)
Lines 696-703 sub cancel { Link Here
696
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
696
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
697
697
698
            # and, if desired, charge a cancel fee
698
            # and, if desired, charge a cancel fee
699
            my $charge;
699
            if ( $params->{'charge_cancel_fee'} ) {
700
            if (my $item = $self->item) {
700
                my $charge;
701
                my $item = $self->item;
701
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
702
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
702
703
703
                my $rule = Koha::CirculationRules->get_effective_rule(
704
                my $rule = Koha::CirculationRules->get_effective_rule(
Lines 710-720 sub cancel { Link Here
710
                );
711
                );
711
                my $rule_value = $rule && $rule->rule_value // '';
712
                my $rule_value = $rule && $rule->rule_value // '';
712
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
713
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
713
            } else {
714
                $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
715
            }
716
714
717
            if ( $charge && $params->{'charge_cancel_fee'} ) {
718
                my $account =
715
                my $account =
719
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
716
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
720
                $account->add_debit(
717
                $account->add_debit(
Lines 726-732 sub cancel { Link Here
726
                        type       => 'RESERVE_EXPIRED',
723
                        type       => 'RESERVE_EXPIRED',
727
                        item_id    => $self->itemnumber
724
                        item_id    => $self->itemnumber
728
                    }
725
                    }
729
                );
726
                ) if $charge;
730
            }
727
            }
731
728
732
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self )
729
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, $self )
733
- 

Return to bug 25711