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

(-)a/Koha/CirculationRules.pm (+26 lines)
Lines 579-584 sub get_effective_daysmode { Link Here
579
579
580
}
580
}
581
581
582
=head3 get_effective_expire_reserves_charge
583
584
Return the value for expire_reserves_charge defined in the circulation rules.
585
If not defined (or empty string), the value of the system preference ExpireReservesMaxPickUpDelayCharge is returned
586
587
=cut
588
589
sub get_effective_expire_reserves_charge {
590
    my ( $class, $params ) = @_;
591
592
    my $itemtype     = $params->{itemtype};
593
    my $branchcode   = $params->{branchcode};
594
    my $categorycode = $params->{categorycode};
595
596
    my $expire_reserves_charge_rule = $class->get_effective_rule(
597
        {
598
            itemtype     => $itemtype,
599
            branchcode   => $branchcode,
600
            categorycode => $categorycode,
601
            rule_name    => 'expire_reserves_charge',
602
        }
603
    );
604
605
    return $expire_reserves_charge_rule ? $expire_reserves_charge_rule->rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
606
607
}
582
608
583
=head3 type
609
=head3 type
584
610
(-)a/Koha/Hold.pm (-9 / +3 lines)
Lines 553-571 sub cancel { Link Here
553
553
554
            # and, if desired, charge a cancel fee
554
            # and, if desired, charge a cancel fee
555
            if ( $params->{'charge_cancel_fee'} ) {
555
            if ( $params->{'charge_cancel_fee'} ) {
556
                my $charge;
557
                my $item = $self->item;
556
                my $item = $self->item;
558
                my $branchcode = C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed);
557
                my $charge = Koha::CirculationRules->get_effective_expire_reserves_charge(
559
560
                my $rule = Koha::CirculationRules->get_effective_rule(
561
                    {
558
                    {
559
                        itemtype => $item->effective_itemtype,
560
                        branchcode => C4::Reserves::GetReservesControlBranch($item->unblessed, $self->borrower->unblessed),
562
                        categorycode => $self->borrower->categorycode,
561
                        categorycode => $self->borrower->categorycode,
563
                        itemtype     => $item->effective_itemtype,
564
                        branchcode   => $branchcode,
565
                        rule_name    => 'expire_reserves_charge',
566
                    }
562
                    }
567
                );
563
                );
568
                $charge = $rule ? $rule->rule_value : C4::Context->preference("ExpireReservesMaxPickUpDelayCharge");
569
564
570
                my $account =
565
                my $account =
571
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
566
                  Koha::Account->new( { patron_id => $self->borrowernumber } );
572
- 

Return to bug 25711