@@ -, +, @@ --- C4/Utils/DataTables/Members.pm | 80 +++++++------- .../prog/en/modules/members/member.tt | 81 +++++--------- svc/members/search | 117 ++++++++++++++++----- 3 files changed, 152 insertions(+), 126 deletions(-) --- a/C4/Utils/DataTables/Members.pm +++ a/C4/Utils/DataTables/Members.pm @@ -9,12 +9,14 @@ use C4::Members::Attributes qw(SearchIdMatchingAttribute ); sub search { my ( $params ) = @_; my $searchmember = $params->{searchmember}; + my $firstquery = $params->{firstquery}; my $firstletter = $params->{firstletter}; my $categorycode = $params->{categorycode}; my $branchcode = $params->{branchcode}; my $searchtype = $params->{searchtype} || 'contain'; my $searchfieldstype = $params->{searchfieldstype} || 'standard'; my $dt_params = $params->{dt_params}; + my $searchfiltering = $params->{search_filter}; unless ( $searchmember ) { $searchmember = $dt_params->{sSearch} // ''; @@ -55,46 +57,44 @@ sub search { }; } } - - my $select = "SELECT - borrowers.borrowernumber, borrowers.surname, borrowers.firstname, - borrowers.streetnumber, borrowers.streettype, borrowers.address, - borrowers.address2, borrowers.city, borrowers.state, borrowers.zipcode, - borrowers.country, cardnumber, borrowers.dateexpiry, - borrowers.borrowernotes, borrowers.branchcode, borrowers.email, - borrowers.userid, borrowers.dateofbirth, borrowers.categorycode, - categories.description AS category_description, categories.category_type, - branches.branchname"; - my $from = "FROM borrowers - LEFT JOIN branches ON borrowers.branchcode = branches.branchcode - LEFT JOIN categories ON borrowers.categorycode = categories.categorycode"; - my @where_args; - my @where_strs; - if(defined $firstletter and $firstletter ne '') { - push @where_strs, "borrowers.surname LIKE ?"; - push @where_args, "$firstletter%"; - } - if(defined $categorycode and $categorycode ne '') { - push @where_strs, "borrowers.categorycode = ?"; - push @where_args, $categorycode; - } - if(@restricted_branchcodes ) { - push @where_strs, "borrowers.branchcode IN (" . join( ',', ('?') x @restricted_branchcodes ) . ")"; - push @where_args, @restricted_branchcodes; - } - - my $searchfields = { - standard => C4::Context->preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid', - surname => 'surname', - email => 'email,emailpro,B_email', - borrowernumber => 'borrowernumber', - userid => 'userid', - phone => 'phone,phonepro,B_phone,altcontactphone,mobile', - address => 'streettype,address,address2,city,state,zipcode,country', - dateofbirth => 'dateofbirth', - sort1 => 'sort1', - sort2 => 'sort2', - }; + my $select = "SELECT + borrowers.borrowernumber, borrowers.surname, borrowers.firstname, + borrowers.streetnumber, borrowers.streettype, borrowers.address, + borrowers.address2, borrowers.city, borrowers.state, borrowers.zipcode, + borrowers.country, cardnumber, borrowers.dateexpiry, + borrowers.borrowernotes, borrowers.branchcode, borrowers.email, + borrowers.userid, borrowers.dateofbirth, borrowers.categorycode, + categories.description AS category_description, categories.category_type, + branches.branchname"; + my $from = "FROM borrowers + LEFT JOIN branches ON borrowers.branchcode = branches.branchcode + LEFT JOIN categories ON borrowers.categorycode = categories.categorycode"; + my @where_args; + my @where_strs; + if(defined $firstletter and $firstletter ne '') { + push @where_strs, "borrowers.surname LIKE ?"; + push @where_args, "$firstletter%"; + } + if(defined $categorycode and $categorycode ne '') { + push @where_strs, "borrowers.categorycode = ?"; + push @where_args, $categorycode; + } + if(@restricted_branchcodes ) { + push @where_strs, "borrowers.branchcode IN (" . join( ',', ('?') x @restricted_branchcodes ) . ")"; + push @where_args, @restricted_branchcodes; + } + my $searchfields = { + standard => C4::Context->preference('DefaultPatronSearchFields') || 'surname,firstname,othernames,cardnumber,userid', + surname => 'surname', + email => 'email,emailpro,B_email', + borrowernumber => 'borrowernumber', + userid => 'userid', + phone => 'phone,phonepro,B_phone,altcontactphone,mobile', + address => 'streettype,address,address2,city,state,zipcode,country', + dateofbirth => 'dateofbirth', + sort1 => 'sort1', + sort2 => 'sort2', + }; # * is replaced with % for sql $searchmember =~ s/\*/%/g; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -109,67 +109,14 @@