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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-15 / +7 lines)
Lines 130-159 function searchToHold(){ Link Here
130
130
131
<div id="toolbar" class="btn-toolbar">
131
<div id="toolbar" class="btn-toolbar">
132
    [% IF ( CAN_user_borrowers ) %]
132
    [% IF ( CAN_user_borrowers ) %]
133
        [% IF ( category_type ) %]
133
        [% IF ( guarantor ) %]
134
            [% IF ( guarantor ) %]
134
            <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;categorycode=[% categorycode %]">
135
                <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;category_type=[% category_type %]">
135
        [% ELSE %]
136
            [% ELSE %]
136
            <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">
137
                <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]">
138
            [% END %]
139
                <i class="icon-pencil"></i> Edit</a>
140
        [% ELSE %] <!-- try with categorycode if no category_type -->
141
            [% IF ( categorycode ) %]
142
                <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="icon-pencil"></i> Edit</a>
143
            [% ELSE %] <!-- if no categorycode, set category_type to A by default -->
144
                <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;category_type=A"><i class="icon-pencil"></i> Edit</a>
145
            [% END %]
146
        [% END %]
137
        [% END %]
138
        <i class="icon-pencil"></i> Edit</a>
147
    [% END %]
139
    [% END %]
148
140
149
    [% IF ( CAN_user_borrowers ) %]
141
    [% IF ( CAN_user_borrowers ) %]
150
        [% IF ( adultborrower AND activeBorrowerRelationship ) %]
142
        [% IF ( adultborrower AND activeBorrowerRelationship ) %]
151
            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]&amp;category_type=C"><i class="icon-plus"></i> Add child</a>
143
            <a id="addchild" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]"><i class="icon-plus"></i> Add child</a>
152
        [% END %]
144
        [% END %]
153
        [% IF ( CAN_user_borrowers ) %]
145
        [% IF ( CAN_user_borrowers ) %]
154
            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="icon-lock"></i> Change password</a>
146
            <a id="changepassword" class="btn btn-small" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="icon-lock"></i> Change password</a>
155
        [% END %]
147
        [% END %]
156
        <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;category_type=[% category_type %]"><i class="icon-copy"></i>Duplicate</a>
148
        <a id="duplicate" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="icon-copy"></i>Duplicate</a>
157
    [% END %]
149
    [% END %]
158
150
159
    <div class="btn-group">
151
    <div class="btn-group">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +7 lines)
Lines 184-190 Link Here
184
			<div class="dialog alert">
184
			<div class="dialog alert">
185
				<h3>Duplicate patron record?</h3>
185
				<h3>Duplicate patron record?</h3>
186
				<p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');" >View existing record</a></p>
186
				<p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');" >View existing record</a></p>
187
				<form action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="op" value="modify" /><input type="hidden" name="borrowernumber" value="[% check_member %]" /><input type="hidden" name="category_type" value="[% check_categorytype %]" /><input class="edit" type="submit" value="It is a duplicate. Edit existing record" /></form>
187
                <form action="/cgi-bin/koha/members/memberentry.pl" method="get">
188
                    <input type="hidden" name="op" value="modify" />
189
                    <input type="hidden" name="borrowernumber" value="[% check_member %]" />
190
                    <input class="edit" type="submit" value="It is a duplicate. Edit existing record" />
191
                </form>
188
192
189
                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
193
                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
190
				<input type="hidden" name="nodouble" value="1" />
194
				<input type="hidden" name="nodouble" value="1" />
Lines 459-467 Link Here
459
        <li>
463
        <li>
460
            <span class="label">&nbsp;</span>
464
            <span class="label">&nbsp;</span>
461
            [% IF ( guarantorid ) %]
465
            [% IF ( guarantorid ) %]
462
            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" />
466
            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
463
            [% ELSE %]
467
            [% ELSE %]
464
            <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" />
468
            <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" />
465
            [% END %]
469
            [% END %]
466
            <input id="guarantordelete" type="button" value="Delete" />
470
            <input id="guarantordelete" type="button" value="Delete" />
467
        </li>
471
        </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/nl-search.tt (-7 / +1 lines)
Lines 32-46 Link Here
32
                    <h3>Existing patrons</h3>
32
                    <h3>Existing patrons</h3>
33
                    <ul>
33
                    <ul>
34
                        [% FOREACH patron IN local_result %]
34
                        [% FOREACH patron IN local_result %]
35
                            [%# Find the category_type %]
36
                            [% FOREACH category IN categories %]
37
                                [% IF category.categorycode == patron.categorycode %]
38
                                    [% patron.category_type = category.category_type %]
39
                                [% END %]
40
                            [% END %]
41
                            <li>[% patron.firstname %] [% patron.surname %] [% patron.cardnumber %] |
35
                            <li>[% patron.firstname %] [% patron.surname %] [% patron.cardnumber %] |
42
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a> |
36
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a> |
43
                                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&category_type=[% patron.category_type %]">Edit</a> |
37
                                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]">Edit</a> |
44
                                <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a>
38
                                <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a>
45
                            </li>
39
                            </li>
46
                        [% END %]
40
                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-1 / +1 lines)
Lines 27-33 Link Here
27
                "dt_borrowernotes":
27
                "dt_borrowernotes":
28
                    "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]",
28
                    "[% data.borrowernotes.replace('\\\\' , '\\\\') |html |html_line_break |collapse %]",
29
                "dt_action":
29
                "dt_action":
30
                    "[% IF data.category_type %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber %]&amp;category_type=[% data.category_type %]'>Edit</a>[% ELSE %][% IF data.categorycode %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber %]&amp;categorycode=[% data.categorycode %]'>Edit</a>[% ELSE %]<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber %]&amp;category_type=A'>Edit</a>[% END %][% END %]",
30
                    "<a href='/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% data.borrowernumber %]'>Edit</a>",
31
                "borrowernumber":
31
                "borrowernumber":
32
                    "[% data.borrowernumber %]"
32
                    "[% data.borrowernumber %]"
33
            }[% UNLESS loop.last %],[% END %]
33
            }[% UNLESS loop.last %],[% END %]
(-)a/members/memberentry.pl (-10 lines)
Lines 90-97 my $guarantorinfo = $input->param('guarantorinfo'); Link Here
90
my $step          = $input->param('step') || 0;
90
my $step          = $input->param('step') || 0;
91
my @errors;
91
my @errors;
92
my $default_city;
92
my $default_city;
93
# $check_categorytype contains the value of duplicate borrowers category type to redirect in good template in step =2
94
my $check_categorytype=$input->param('check_categorytype');
95
# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
93
# NOTE: Alert for ethnicity and ethnotes fields, they are invalid in all borrowers form
96
my $borrower_data;
94
my $borrower_data;
97
my $NoUpdateLogin;
95
my $NoUpdateLogin;
Lines 239-250 if ( ( $op eq 'insert' ) and !$nodouble ) { Link Here
239
    if ( !$check_member ) {
237
    if ( !$check_member ) {
240
        $nodouble = 1;
238
        $nodouble = 1;
241
    }
239
    }
242
243
    #   recover the category type if the borrowers is a doublon
244
    if ($check_category) {
245
        my $tmpborrowercategory = GetBorrowercategory($check_category);
246
        $check_categorytype = $tmpborrowercategory->{'category_type'};
247
    }
248
}
240
}
249
241
250
  #recover all data from guarantor address phone ,fax... 
242
  #recover all data from guarantor address phone ,fax... 
Lines 713-719 $template->param( Link Here
713
  borrotitlepopup => $borrotitlepopup,
705
  borrotitlepopup => $borrotitlepopup,
714
  guarantorinfo   => $guarantorinfo,
706
  guarantorinfo   => $guarantorinfo,
715
  flagloop  => \@flagdata,
707
  flagloop  => \@flagdata,
716
  check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
717
  category_type =>$category_type,
708
  category_type =>$category_type,
718
  modify          => $modify,
709
  modify          => $modify,
719
  nok     => $nok,#flag to konw if an error 
710
  nok     => $nok,#flag to konw if an error 
720
- 

Return to bug 13970