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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl (+1 lines)
Lines 48-53 Link Here
48
<h3>Search for guarantor</h3>
48
<h3>Search for guarantor</h3>
49
	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
49
	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
50
		<fieldset>
50
		<fieldset>
51
		<input type="hidden" name="category_type" id="category_type" value="<!-- TMPL_VAR NAME="category_type" -->" />
51
		<input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
52
		<input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
52
		<select name="orderby">
53
		<select name="orderby">
53
			<option value="surname,firstname">Surname</option>
54
			<option value="surname,firstname">Surname</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl (-2 / +2 lines)
Lines 340-348 Link Here
340
        <li>
340
        <li>
341
            <span class="label">&nbsp;</span>
341
            <span class="label">&nbsp;</span>
342
            <!-- TMPL_IF NAME="guarantorid" -->
342
            <!-- TMPL_IF NAME="guarantorid" -->
343
            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
343
            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
344
            <!-- TMPL_ELSE -->
344
            <!-- TMPL_ELSE -->
345
            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl');" />
345
            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
346
            <!-- /TMPL_IF -->
346
            <!-- /TMPL_IF -->
347
            <input id="guarantordelete" type="button" value="Delete" />
347
            <input id="guarantordelete" type="button" value="Delete" />
348
        </li>
348
        </li>
(-)a/members/guarantor_search.pl (-3 / +10 lines)
Lines 46-51 my $theme = $input->param('theme') || "default"; Link Here
46
46
47
my $member=$input->param('member');
47
my $member=$input->param('member');
48
my $orderby=$input->param('orderby');
48
my $orderby=$input->param('orderby');
49
my $category_type=$input->param('category_type');
49
$orderby = "surname,firstname" unless $orderby;
50
$orderby = "surname,firstname" unless $orderby;
50
$member =~ s/,//g;   #remove any commas from search string
51
$member =~ s/,//g;   #remove any commas from search string
51
$member =~ s/\*/%/g;
52
$member =~ s/\*/%/g;
Lines 55-60 if ($member eq ''){ Link Here
55
		$template->param(results=>1);
56
		$template->param(results=>1);
56
}	
57
}	
57
58
59
my $search_category = 'A';
60
if ($category_type eq 'P'){
61
	$search_category = 'I';
62
}
63
58
my ($count,$results);
64
my ($count,$results);
59
my @resultsdata;
65
my @resultsdata;
60
my $background = 0;
66
my $background = 0;
Lines 62-77 my $background = 0; Link Here
62
if ($member ne ''){
68
if ($member ne ''){
63
	if(length($member) == 1)
69
	if(length($member) == 1)
64
	{
70
	{
65
		($count,$results)=SearchMember($member,$orderby,"simple",'A');
71
		($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
66
	}
72
	}
67
	else
73
	else
68
	{
74
	{
69
		($count,$results)=SearchMember($member,$orderby,"advanced",'A');
75
		($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
70
	}
76
	}
71
	for (my $i=0; $i < $count; $i++){
77
	for (my $i=0; $i < $count; $i++){
72
	#find out stats
78
	#find out stats
73
	my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowerid'});
79
	my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowerid'});
74
	my $guarantorinfo=uc($results->[$i]{'surname'})." , ".ucfirst($results->[$i]{'firstname'});
80
	my $guarantorinfo=uc($results->[$i]{'surname'})." , ".ucfirst($results->[$i]{'firstname'});
81
	if 
75
	my %row = (
82
	my %row = (
76
		background => $background,
83
		background => $background,
77
		count => $i+1,
84
		count => $i+1,
Lines 101-107 if ($member ne ''){ Link Here
101
$template->param( 
108
$template->param( 
102
			member          => $member,
109
			member          => $member,
103
			numresults		=> $count,
110
			numresults		=> $count,
104
			
111
			category_type   => $category_type,
105
			resultsloop     => \@resultsdata );
112
			resultsloop     => \@resultsdata );
106
113
107
output_html_with_http_headers $input, $cookie, $template->output;
114
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/memberentry.pl (-1 / +1 lines)
Lines 648-653 $template->param( Link Here
648
  dateformat      => C4::Dates->new()->visual(),
648
  dateformat      => C4::Dates->new()->visual(),
649
  C4::Context->preference('dateformat') => 1,
649
  C4::Context->preference('dateformat') => 1,
650
  check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
650
  check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
651
  category_type =>$category_type,
651
  modify          => $modify,
652
  modify          => $modify,
652
  nok     => $nok,#flag to konw if an error 
653
  nok     => $nok,#flag to konw if an error 
653
  CGIbranch => $CGIbranch,
654
  CGIbranch => $CGIbranch,
654
- 

Return to bug 5003