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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +12 lines)
Lines 177-183 function checkMultiHold() { Link Here
177
      <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, please, try another</p> </div>
177
      <div class="dialog alert"><h3>Patron Not Found</h3><p>No patron with this name, please, try another</p> </div>
178
    [% END %]
178
    [% END %]
179
    <form action="request.pl?biblionumber=[% biblionumber %]" method="post">
179
    <form action="request.pl?biblionumber=[% biblionumber %]" method="post">
180
        [% UNLESS ( CGIselectborrower ) %]
180
        [% UNLESS borrower_list %]
181
			<fieldset class="brief">
181
			<fieldset class="brief">
182
		        <label for="patron">Patron: </label>
182
		        <label for="patron">Patron: </label>
183
				<div class="hint">Enter patron card number or partial name:</div>
183
				<div class="hint">Enter patron card number or partial name:</div>
Lines 186-194 function checkMultiHold() { Link Here
186
                <input type="submit" value="Search" />
186
                <input type="submit" value="Search" />
187
			</fieldset>
187
			</fieldset>
188
        [% ELSE %]
188
        [% ELSE %]
189
			<fieldset>
189
          <fieldset>
190
			[% CGIselectborrower %]
190
            <select size="7" name="borrowernumber">
191
			<input type="hidden" name="biblionumber" value="[% biblionumber %]" /><fieldset class="action"><input type="submit" value="Select" /></fieldset></fieldset>
191
            [% FOREACH borrower IN borrower_list %]
192
                <option value="[% borrower.borrowernumber %]">
193
[% borrower.surname -%], [% borrower.firstname -%]
194
 ... ( [% borrower.cardnumber -%] - [% borrower.categorycode -%]
195
) ... [% borrower.address %]
196
                </option>
197
            [% END %]
198
            </select>
199
            <input type="hidden" name="biblionumber" value="[% biblionumber %]" /><fieldset class="action"><input type="submit" value="Select" /></fieldset></fieldset>
192
200
193
        [% END %]
201
        [% END %]
194
        [% IF ( multi_hold ) %]
202
        [% IF ( multi_hold ) %]
(-)a/reserve/request.pl (-36 / +11 lines)
Lines 76-82 my $findborrower = $input->param('findborrower'); Link Here
76
$findborrower = '' unless defined $findborrower;
76
$findborrower = '' unless defined $findborrower;
77
$findborrower =~ s|,| |g;
77
$findborrower =~ s|,| |g;
78
my $borrowernumber_hold = $input->param('borrowernumber') || '';
78
my $borrowernumber_hold = $input->param('borrowernumber') || '';
79
my $borrowerslist;
80
my $messageborrower;
79
my $messageborrower;
81
my $warnings;
80
my $warnings;
82
my $messages;
81
my $messages;
Lines 113-119 if ($findborrower) { Link Here
113
            $borrowernumber_hold = $borrowers->[0]->{'borrowernumber'};
112
            $borrowernumber_hold = $borrowers->[0]->{'borrowernumber'};
114
        }
113
        }
115
        else {
114
        else {
116
            $borrowerslist = $borrowers;
115
            $template->param( borrower_list => sort_borrowerlist($borrowers));
117
        }
116
        }
118
    } else {
117
    } else {
119
        $messageborrower = "'$findborrower'";
118
        $messageborrower = "'$findborrower'";
Lines 179-216 if ($borrowernumber_hold && !$action) { Link Here
179
178
180
$template->param( messageborrower => $messageborrower );
179
$template->param( messageborrower => $messageborrower );
181
180
182
my $CGIselectborrower;
183
if ($borrowerslist) {
184
    my @values;
185
    my %labels;
186
187
    foreach my $borrower (
188
        sort {
189
                uc($a->{surname}
190
              . $a->{firstname}) cmp uc($b->{surname}
191
              . $b->{firstname})
192
        } @{$borrowerslist}
193
      )
194
    {
195
        push @values, $borrower->{borrowernumber};
196
197
        $labels{ $borrower->{borrowernumber} } = sprintf(
198
            '%s, %s ... (%s - %s) ... %s',
199
            $borrower->{surname} ||'',    $borrower->{firstname} || '',
200
            $borrower->{cardnumber} || '', $borrower->{categorycode} || '',
201
            $borrower->{address} || '',
202
        );
203
    }
204
205
    $CGIselectborrower = CGI::scrolling_list(
206
        -name     => 'borrowernumber',
207
        -values   => \@values,
208
        -labels   => \%labels,
209
        -size     => 7,
210
        -multiple => 0,
211
    );
212
}
213
214
# FIXME launch another time GetMember perhaps until
181
# FIXME launch another time GetMember perhaps until
215
my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold );
182
my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold );
216
183
Lines 608-614 foreach my $biblionumber (@biblionumbers) { Link Here
608
                     borrower_branchcode => $borrowerinfo->{'branchcode'},
575
                     borrower_branchcode => $borrowerinfo->{'branchcode'},
609
        );
576
        );
610
    }
577
    }
611
    $template->param(CGIselectborrower => $CGIselectborrower) if defined $CGIselectborrower;
612
578
613
    $biblioloopiter{biblionumber} = $biblionumber;
579
    $biblioloopiter{biblionumber} = $biblionumber;
614
    $biblioloopiter{title} = $dat->{title};
580
    $biblioloopiter{title} = $dat->{title};
Lines 640-642 $template->param( Link Here
640
606
641
# printout the page
607
# printout the page
642
output_html_with_http_headers $input, $cookie, $template->output;
608
output_html_with_http_headers $input, $cookie, $template->output;
643
- 
609
610
sub sort_borrowerlist {
611
    my $borrowerslist = shift;
612
    my $ref           = [];
613
    push @{$ref}, sort {
614
        uc( $a->{surname} . $a->{firstname} ) cmp
615
          uc( $b->{surname} . $b->{firstname} )
616
    } @{$borrowerslist};
617
    return $ref;
618
}

Return to bug 766