|
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 |
- |
|
|