Attachment #91950 for bug #13552

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

Lines 149-154 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (+8 lines)
149	<th class="title-string">Expiry date</th>	149	<th class="title-string">Expiry date</th>
150	<th>Circulation note</th>	150	<th>Circulation note</th>
151	<th>Opac Note</th>	151	<th>Opac Note</th>
		152	<th>Debarred till</th>
		153	<th>Debarred comment</th>
152	[% FOREACH attrh IN attributes_header %]	154	[% FOREACH attrh IN attributes_header %]
153	<th>[% attrh.attribute \| html %]</th>	155	<th>[% attrh.attribute \| html %]</th>
154	[% END %]	156	[% END %]
Lines 173-178 Link Here
173	<td><span title="[% borrower.dateexpiry \| html %]">[% borrower.dateexpiry \| $KohaDates %]</span></td>	175	<td><span title="[% borrower.dateexpiry \| html %]">[% borrower.dateexpiry \| $KohaDates %]</span></td>
174	<td>[% borrower.borrowernotes \| html %]</td>	176	<td>[% borrower.borrowernotes \| html %]</td>
175	<td>[% borrower.opacnote \| html %]</td>	177	<td>[% borrower.opacnote \| html %]</td>
		178	<td><span title="[% borrower.debarred \| html %]">[% borrower.debarred \| $KohaDates %]</span></td>
		179	<td>[% borrower.debarredcomment \| html %]</td>
176	[% FOREACH pa IN borrower.patron_attributes %]	180	[% FOREACH pa IN borrower.patron_attributes %]
177	[% IF ( pa.code ) %]	181	[% IF ( pa.code ) %]
178	<td>[% pa.code \| html %]=[% pa.value \| html %]</td>	182	<td>[% pa.code \| html %]=[% pa.value \| html %]</td>
Lines 229-234 Link Here
229	Circulation note:	233	Circulation note:
230	[% CASE 'opacnote' %]	234	[% CASE 'opacnote' %]
231	OPAC note:	235	OPAC note:
		236	[% CASE 'debarred' %]
		237	Debarred till:
		238	[% CASE 'debarredcomment' %]
		239	Debarred comment:
232	[% END %]	240	[% END %]
233	</label>	241	</label>
234	[% IF ( field.type == 'text' ) %]	242	[% IF ( field.type == 'text' ) %]




            type => "text",
            mandatory => ( grep /opacnote/, @mandatoryFields ) ? 1 : 0,
        }
        ,
        {
            name => "debarred",
            type => "date",
            mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
        }
        ,
        {
            name => "debarredcomment",
            type => "text",
            mandatory => ( grep /debarredcomment/, @mandatoryFields ) ? 1 : 0,
        },
    );

    $template->param('patron_attributes_codes', \@patron_attributes_codes);


    my @disabled = $input->multi_param('disable_input');
    my $infos;
    for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote debarred debarredcomment/ ) {
        my $value = $input->param($field);
        $infos->{$field} = $value if $value;
        $infos->{$field} = "" if grep { /^$field$/ } @disabled;
    }

    for my $field ( qw( dateenrolled dateexpiry debarred ) ) {
        $infos->{$field} = dt_from_string($infos->{$field}) if $infos->{$field};
    }

- 

Return to bug 13552

Lines 262-267 if ( $op eq 'show' ) { Link Here

(-)a/tools/modborrowers.pl (-3 / +14 lines)
262	type => "text",	262	type => "text",
263	mandatory => ( grep /opacnote/, @mandatoryFields ) ? 1 : 0,	263	mandatory => ( grep /opacnote/, @mandatoryFields ) ? 1 : 0,
264	}	264	}
		265	,
		266	{
		267	name => "debarred",
		268	type => "date",
		269	mandatory => ( grep /debarred/, @mandatoryFields ) ? 1 : 0,
		270	}
		271	,
		272	{
		273	name => "debarredcomment",
		274	type => "text",
		275	mandatory => ( grep /debarredcomment/, @mandatoryFields ) ? 1 : 0,
		276	},
265	);	277	);
266		278
267	$template->param('patron_attributes_codes', \@patron_attributes_codes);	279	$template->param('patron_attributes_codes', \@patron_attributes_codes);
Lines 275-287 if ( $op eq 'do' ) { Link Here
275		287
276	my @disabled = $input->multi_param('disable_input');	288	my @disabled = $input->multi_param('disable_input');
277	my $infos;	289	my $infos;
278	for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote/ ) {	290	for my $field ( qw/surname firstname branchcode categorycode city state zipcode country sort1 sort2 dateenrolled dateexpiry borrowernotes opacnote debarred debarredcomment/ ) {
279	my $value = $input->param($field);	291	my $value = $input->param($field);
280	$infos->{$field} = $value if $value;	292	$infos->{$field} = $value if $value;
281	$infos->{$field} = "" if grep { /^$field$/ } @disabled;	293	$infos->{$field} = "" if grep { /^$field$/ } @disabled;
282	}	294	}
283		295
284	for my $field ( qw( dateenrolled dateexpiry ) ) {	296	for my $field ( qw( dateenrolled dateexpiry debarred ) ) {
285	$infos->{$field} = dt_from_string($infos->{$field}) if $infos->{$field};	297	$infos->{$field} = dt_from_string($infos->{$field}) if $infos->{$field};
286	}	298	}
287		299
288	-