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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/members-search.tt (-1 / +1 lines)
Lines 114-120 function add_item(borrowernum,batch_id,type_id){ Link Here
114
    <td> <input type="checkbox" name="borrowernumber" id="patron[% resultsloo.borrowernumber %]" value="[% resultsloo.borrowernumber %]" />	</td>
114
    <td> <input type="checkbox" name="borrowernumber" id="patron[% resultsloo.borrowernumber %]" value="[% resultsloo.borrowernumber %]" />	</td>
115
    <td>[% resultsloo.cardnumber %]</td>
115
    <td>[% resultsloo.cardnumber %]</td>
116
    <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">[% resultsloo.surname %], [% resultsloo.firstname %]</a> <br /> [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% END %]</td>
116
    <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resultsloo.borrowernumber %]">[% resultsloo.surname %], [% resultsloo.firstname %]</a> <br /> [% resultsloo.address %][% IF ( resultsloo.address2 ) %]<br />[% resultsloo.address2 %][% END %][% IF ( resultsloo.city ) %]<br />[% resultsloo.city %][% END %]</td>
117
    <td>[% resultsloo.category_description %] ([% resultsloo.category_type %])</td>
117
    <td>[% resultsloo.category_description %] ([% resultsloo.categorycode %])</td>
118
    <td>[% resultsloo.branchcode %]</td>
118
    <td>[% resultsloo.branchcode %]</td>
119
    <td>[% resultsloo.dateexpiry %]</td>
119
    <td>[% resultsloo.dateexpiry %]</td>
120
    <td>[% resultsloo.borrowernotes %]</td>
120
    <td>[% resultsloo.borrowernotes %]</td>
(-)a/patroncards/members-search.pl (-5 / +14 lines)
Lines 33-41 my $batch_id = $cgi->param('batch_id') || 0; Link Here
33
my $startfrom = $cgi->param('startfrom')||1;
33
my $startfrom = $cgi->param('startfrom')||1;
34
my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
34
my $resultsperpage = $cgi->param('resultsperpage')||C4::Context->preference("PatronsPerPage")||20;
35
my $category = $cgi->param('category') || undef;
35
my $category = $cgi->param('category') || undef;
36
my $member = $cgi->param('member') || undef;
36
my $member = $cgi->param('member') || '';
37
my $orderby = $cgi->param('orderby') || undef;
37
my $orderby = $cgi->param('orderby') || undef;
38
38
39
my @categories=C4::Category->all;
40
my %categories_display;
41
42
foreach my $category (@categories) {
43
    my $hash={
44
        category_description=>$$category{description},
45
        category_type=>$$category{category_type}
46
    };
47
    $categories_display{$$category{categorycode}} = $hash;
48
}
49
39
my ($template, $loggedinuser, $cookie) = get_template_and_user({
50
my ($template, $loggedinuser, $cookie) = get_template_and_user({
40
                template_name => "patroncards/members-search.tmpl",
51
                template_name => "patroncards/members-search.tmpl",
41
                query => $cgi,
52
                query => $cgi,
Lines 49-55 $member =~ s/,//g; #remove any commas from search string Link Here
49
$member =~ s/\*/%/g;
60
$member =~ s/\*/%/g;
50
61
51
if ($member || $category) {
62
if ($member || $category) {
52
    my $results = $category ? Search({''=>$member, category_type=>$category}, $orderby)
63
    my $results = $category ? Search({''=>$member, categorycode=>$category}, $orderby)
53
                            : Search($member, $orderby);
64
                            : Search($member, $orderby);
54
    my $count = $results ? @$results : 0;
65
    my $count = $results ? @$results : 0;
55
66
Lines 60-72 if ($member || $category) { Link Here
60
        my ($od,$issue,$fines) = GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
71
        my ($od,$issue,$fines) = GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
61
        my %row = (
72
        my %row = (
62
            count               => $i + 1,
73
            count               => $i + 1,
74
                %{$categories_display{$results->[$i]{categorycode}}},
63
            borrowernumber      => $results->[$i]{'borrowernumber'},
75
            borrowernumber      => $results->[$i]{'borrowernumber'},
64
            cardnumber          => $results->[$i]{'cardnumber'},
76
            cardnumber          => $results->[$i]{'cardnumber'},
65
            surname             => $results->[$i]{'surname'},
77
            surname             => $results->[$i]{'surname'},
66
            firstname           => $results->[$i]{'firstname'},
78
            firstname           => $results->[$i]{'firstname'},
67
            categorycode        => $results->[$i]{'categorycode'},
79
            categorycode        => $results->[$i]{'categorycode'},
68
            category_type       => $results->[$i]{'category_type'},
69
            category_description        => $results->[$i]{'description'},
70
            address             => $results->[$i]{'address'},
80
            address             => $results->[$i]{'address'},
71
            address2            => $results->[$i]{'address2'},
81
            address2            => $results->[$i]{'address2'},
72
            city                => $results->[$i]{'city'},
82
            city                => $results->[$i]{'city'},
73
- 

Return to bug 7318