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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+3 lines)
Lines 84-89 Link Here
84
    [% IF ( was_renewed ) %]
84
    [% IF ( was_renewed ) %]
85
        <div class="alert alert-info">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
85
        <div class="alert alert-info">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
86
    [% END %]
86
    [% END %]
87
    [% IF ( was_resetted ) %]
88
        <div class="alert alert-info"> Patron's account has been unlocked </div>
89
    [% END %]
87
90
88
    [% IF autoswitched %]
91
    [% IF autoswitched %]
89
        <div id="autoswitched" class="alert alert-info">Patron was automatically switched by reading the patron card during checking out. Ensure you are working with the right patron.</div>
92
        <div id="autoswitched" class="alert alert-info">Patron was automatically switched by reading the patron card during checking out. Ensure you are working with the right patron.</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 90-95 Link Here
90
        [% IF ( was_renewed ) %]
90
        [% IF ( was_renewed ) %]
91
            <div class="alert alert-info"> Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] </div>
91
            <div class="alert alert-info"> Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %] </div>
92
        [% END %]
92
        [% END %]
93
        [% IF ( was_resetted ) %]
94
            <div class="alert alert-info"> Patron's account has been unlocked </div>
95
        [% END %]
93
96
94
        [% messages = INCLUDE 'patron_messages.inc' moremember = 1 | trim %]
97
        [% messages = INCLUDE 'patron_messages.inc' moremember = 1 | trim %]
95
        [% IF messages %]
98
        [% IF messages %]
(-)a/members/moremember.pl (-10 / +11 lines)
Lines 292-307 my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber = Link Here
292
my $patron_lists_count = $patron->get_lists_with_patron->count();
292
my $patron_lists_count = $patron->get_lists_with_patron->count();
293
293
294
$template->param(
294
$template->param(
295
    patron                 => $patron,
295
    patron                    => $patron,
296
    issuecount             => $patron->checkouts->count,
296
    issuecount                => $patron->checkouts->count,
297
    holds_count            => $patron->holds->count_holds,
297
    holds_count               => $patron->holds->count_holds,
298
    fines                  => $patron->account->balance,
298
    fines                     => $patron->account->balance,
299
    translated_language    => $translated_language,
299
    translated_language       => $translated_language,
300
    detailview             => 1,
300
    detailview                => 1,
301
    was_renewed            => scalar $input->param('was_renewed') ? 1 : 0,
301
    was_renewed               => scalar $input->param('was_renewed')  ? 1 : 0,
302
    $category_type         => 1,                                           # [% IF ( I ) %] = institutional/organisation
302
    was_resetted              => scalar $input->param('was_resetted') ? 1 : 0,
303
    housebound_role        => scalar $patron->housebound_role,
303
    $category_type            => 1,                                 # [% IF ( I ) %] = institutional/organisation
304
    relatives_issues_count => $relatives_issues_count,
304
    housebound_role           => scalar $patron->housebound_role,
305
    relatives_issues_count    => $relatives_issues_count,
305
    relatives_borrowernumbers => \@relatives,
306
    relatives_borrowernumbers => \@relatives,
306
    logged_in_user            => $logged_in_user,
307
    logged_in_user            => $logged_in_user,
307
    files                     => Koha::Patron::Files->new( borrowernumber => $borrowernumber )->GetFilesInfo(),
308
    files                     => Koha::Patron::Files->new( borrowernumber => $borrowernumber )->GetFilesInfo(),
(-)a/members/setstatus.pl (-2 / +4 lines)
Lines 69-75 if ( $logged_in_user->can_see_patron_infos($patron) ) { Link Here
69
    } elsif ( $op == "cud-reset_login_attempts" ) {
69
    } elsif ( $op == "cud-reset_login_attempts" ) {
70
        try {
70
        try {
71
            $patron->login_attempts(0)->store;
71
            $patron->login_attempts(0)->store;
72
            $dateexpiry = $patron->renew_account;
73
        } catch {
72
        } catch {
74
            if ( ref($_) eq 'Koha::Exceptions::Patron::Relationship::NoGuarantor' ) {
73
            if ( ref($_) eq 'Koha::Exceptions::Patron::Relationship::NoGuarantor' ) {
75
                $cannot_reset = '1';
74
                $cannot_reset = '1';
Lines 91-96 if ( $destination eq "circ" ) { Link Here
91
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&noresetnoguarantor=1");
90
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&noresetnoguarantor=1");
92
    } elsif ($dateexpiry) {
91
    } elsif ($dateexpiry) {
93
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1");
92
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1");
93
    } elsif ( $op == "cud-reset_login_attempts" ) {
94
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_resetted=1");
94
    } else {
95
    } else {
95
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
96
        print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
96
    }
97
    }
Lines 101-106 if ( $destination eq "circ" ) { Link Here
101
        );
102
        );
102
    } elsif ($dateexpiry) {
103
    } elsif ($dateexpiry) {
103
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
104
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
105
    } elsif ( $op == "cud-reset_login_attempts" ) {
106
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_resetted=1");
104
    } else {
107
    } else {
105
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
108
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
106
    }
109
    }
107
- 

Return to bug 37512