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

(-)a/Koha/Patron/Modification.pm (-1 / +1 lines)
Lines 27-33 use base qw(Koha::Object); Link Here
27
27
28
=head1 NAME
28
=head1 NAME
29
29
30
Koha::Patron::Modification - Class represents a requrest to modify or create a patron
30
Koha::Patron::Modification - Class represents a request to modify or create a patron
31
31
32
=head2 Class Methods
32
=head2 Class Methods
33
33
(-)a/circ/circulation.pl (-1 / +2 lines)
Lines 659-671 $template->param( Link Here
659
my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
659
my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
660
$template->param( picture => 1 ) if $patron_image;
660
$template->param( picture => 1 ) if $patron_image;
661
661
662
my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
662
$template->param(
663
$template->param(
663
    debt_confirmed            => $debt_confirmed,
664
    debt_confirmed            => $debt_confirmed,
664
    SpecifyDueDate            => $duedatespec_allow,
665
    SpecifyDueDate            => $duedatespec_allow,
665
    CircAutocompl             => C4::Context->preference("CircAutocompl"),
666
    CircAutocompl             => C4::Context->preference("CircAutocompl"),
666
    debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
667
    debarments                => GetDebarments({ borrowernumber => $borrowernumber }),
667
    todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
668
    todaysdate                => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
668
    modifications             => Koha::Patron::Modifications->GetModifications({ borrowernumber => $borrowernumber }),
669
    has_modifications         => $has_modifications,
669
    override_high_holds       => $override_high_holds,
670
    override_high_holds       => $override_high_holds,
670
    nopermission              => scalar $query->param('nopermission'),
671
    nopermission              => scalar $query->param('nopermission'),
671
);
672
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 706-712 No patron matched <span class="ex">[% message | html %]</span> Link Here
706
706
707
		<ul>
707
		<ul>
708
708
709
                   [% IF ( modifications ) %]
709
                   [% IF ( has_modifications ) %]
710
                    <li><span class="circ-hlt">Pending modifications:</span> Patron has pending modifications.
710
                    <li><span class="circ-hlt">Pending modifications:</span> Patron has pending modifications.
711
                            [% IF CAN_user_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
711
                            [% IF CAN_user_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') || borrower.branch == branch ) %]
712
                                    <a href="/cgi-bin/koha/members/members-update.pl">View all pending patron modifications</a>
712
                                    <a href="/cgi-bin/koha/members/members-update.pl">View all pending patron modifications</a>
(-)a/t/db_dependent/Koha_borrower_modifications.t (-2 / +1 lines)
Lines 87-92 my $new_borrower = GetMember( borrowernumber => $borr1 ); Link Here
87
87
88
## Check to see that the approved modifications were saved
88
## Check to see that the approved modifications were saved
89
ok( $new_borrower->{'surname'} eq 'Hall',
89
ok( $new_borrower->{'surname'} eq 'Hall',
90
    'Test approve() applys modification to borrower' );
90
    'Test approve() applies modification to borrower' );
91
91
92
$dbh->rollback();
92
$dbh->rollback();
93
- 

Return to bug 16960