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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt (+9 lines)
Lines 81-86 Link Here
81
                                            [% PROCESS options_for_libraries libraries => Branches.all() %]
81
                                            [% PROCESS options_for_libraries libraries => Branches.all() %]
82
                                        </select>
82
                                        </select>
83
                                    </li>
83
                                    </li>
84
                                    <li>
85
                                        <label for="deleted_from">Deleted after:</label>
86
                                        <input type="text" size="10" id="deleted_from" name="deleted_from" value="[% deleted_from | html %]" class="flatpickr" />
87
                                    </li>
88
                                    <li>
89
                                        <label for="deleted_to">Deleted before:</label>
90
                                        <input type="text" size="10" id="deleted_to" name="deleted_to" value="[% deleted_to | html %]" class="flatpickr" />
91
                                    </li>
84
                                </ol>
92
                                </ol>
85
                            </fieldset>
93
                            </fieldset>
86
                            <fieldset class="action">
94
                            <fieldset class="action">
Lines 209-214 Link Here
209
<!-- /.main.container-fluid -->
217
<!-- /.main.container-fluid -->
210
218
211
[% MACRO jsinclude BLOCK %]
219
[% MACRO jsinclude BLOCK %]
220
    [% INCLUDE 'calendar.inc' %]
212
    [% Asset.js("js/tools-menu.js") | $raw %]
221
    [% Asset.js("js/tools-menu.js") | $raw %]
213
    [% INCLUDE 'datatables.inc' %]
222
    [% INCLUDE 'datatables.inc' %]
214
    <script>
223
    <script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-1 / +1 lines)
Lines 43-49 Link Here
43
                    <dd>Manage patron clubs</dd>
43
                    <dd>Manage patron clubs</dd>
44
                [% END %]
44
                [% END %]
45
45
46
                [% IF (CAN_user_borrowers_restore_deleted_borrowers) %]
46
                [% IF (CAN_user_borrowers_restore_deleted_borrowers && Koha.Preference('AllowDeletedPatronRestoration')) %]
47
                    <dt><a href="/cgi-bin/koha/tools/restore_deleted_borrowers.pl">Restore deleted patrons</a></dt>
47
                    <dt><a href="/cgi-bin/koha/tools/restore_deleted_borrowers.pl">Restore deleted patrons</a></dt>
48
                    <dd>Restore deleted patrons from the deletedborrowers table</dd>
48
                    <dd>Restore deleted patrons from the deletedborrowers table</dd>
49
                [% END %]
49
                [% END %]
(-)a/tools/restore_deleted_borrowers.pl (-2 / +23 lines)
Lines 53-61 if ( $op eq 'search' ) { Link Here
53
    my $email          = $input->param('email');
53
    my $email          = $input->param('email');
54
    my $categorycode   = $input->param('categorycode');
54
    my $categorycode   = $input->param('categorycode');
55
    my $branchcode     = $input->param('branchcode');
55
    my $branchcode     = $input->param('branchcode');
56
    my $deleted_from   = $input->param('deleted_from');
57
    my $deleted_to     = $input->param('deleted_to');
56
58
57
    # No empty searches, if no search critrea is added, do nothing.
59
    # No empty searches, if no search critrea is added, do nothing.
58
    if ( $cardnumber || $borrowernumber || $surname || $firstname || $email || $categorycode || $branchcode ) {
60
    if (   $cardnumber
61
        || $borrowernumber
62
        || $surname
63
        || $firstname
64
        || $email
65
        || $categorycode
66
        || $branchcode
67
        || $deleted_from
68
        || $deleted_to )
69
    {
59
70
60
        # empty search parameters
71
        # empty search parameters
61
        my %search_params;
72
        my %search_params;
Lines 71-76 if ( $op eq 'search' ) { Link Here
71
        $search_params{firstname} = { 'like' => "%$firstname%" } if $firstname;
82
        $search_params{firstname} = { 'like' => "%$firstname%" } if $firstname;
72
        $search_params{email}     = { 'like' => "%$email%" }     if $email;
83
        $search_params{email}     = { 'like' => "%$email%" }     if $email;
73
84
85
        #date parameters
86
        if ( $deleted_from && $deleted_to ) {
87
            $search_params{updated_on} = { -between => [ $deleted_from, $deleted_to ] };
88
        } elsif ($deleted_from) {
89
            $search_params{updated_on} = { '>=' => $deleted_from };
90
        } elsif ($deleted_to) {
91
            $search_params{updated_on} = { '<=' => $deleted_to };
92
        }
93
74
        my $deleted_patrons_rs = Koha::Old::Patrons->search(
94
        my $deleted_patrons_rs = Koha::Old::Patrons->search(
75
            \%search_params,
95
            \%search_params,
76
            {
96
            {
Lines 105-110 if ( $op eq 'search' ) { Link Here
105
            surname         => $surname,
125
            surname         => $surname,
106
            firstname       => $firstname,
126
            firstname       => $firstname,
107
            email           => $email,
127
            email           => $email,
128
            deleted_from    => $deleted_from,
129
            deleted_to      => $deleted_to,
108
        );
130
        );
109
    } else {
131
    } else {
110
        $template->param( view => 'search' );
132
        $template->param( view => 'search' );
111
- 

Return to bug 34069