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

(-)a/Koha/Hold.pm (-8 / +4 lines)
Lines 539-546 sub cancel { Link Here
539
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
539
            C4::Reserves::_FixPriority({ biblionumber => $self->biblionumber });
540
540
541
            # and, if desired, charge a cancel fee
541
            # and, if desired, charge a cancel fee
542
            my $charge;
542
            if ( $params->{'charge_cancel_fee'} ) {
543
            if (my $item = $self->item) {
543
                my $charge;
544
                my $item = $self->item;
544
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
545
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
545
546
546
                my $rule = Koha::CirculationRules->get_effective_rule(
547
                my $rule = Koha::CirculationRules->get_effective_rule(
Lines 553-563 sub cancel { Link Here
553
                );
554
                );
554
                my $rule_value = $rule && $rule->rule_value // '';
555
                my $rule_value = $rule && $rule->rule_value // '';
555
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
556
                $charge = $rule_value ne '' ? $rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
556
            } else {
557
                $charge = C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
558
            }
559
557
560
            if ( $charge && $params->{'charge_cancel_fee'} ) {
561
                my $account =
558
                my $account =
562
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
559
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
563
                $account->add_debit(
560
                $account->add_debit(
Lines 569-575 sub cancel { Link Here
569
                        type       => 'RESERVE_EXPIRED',
566
                        type       => 'RESERVE_EXPIRED',
570
                        item_id    => $self->itemnumber
567
                        item_id    => $self->itemnumber
571
                    }
568
                    }
572
                );
569
                ) if $charge;
573
            }
570
            }
574
571
575
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, Dumper($self->unblessed) )
572
            C4::Log::logaction( 'HOLDS', 'CANCEL', $self->reserve_id, Dumper($self->unblessed) )
576
- 

Return to bug 25711