Attachment #38524 for bug #11904

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

Lines 551-557 $template->param( Link Here

(-)a/circ/circulation.pl (-1 / +1 lines)
551	surname => $borrower->{'surname'},	551	surname => $borrower->{'surname'},
552	showname => $borrower->{'showname'},	552	showname => $borrower->{'showname'},
553	category_type => $borrower->{'category_type'},	553	category_type => $borrower->{'category_type'},
554	was_renewed => $query->param('was_renewed') ? 1 : 0,
555	expiry => format_date($borrower->{'dateexpiry'}),	554	expiry => format_date($borrower->{'dateexpiry'}),
556	categorycode => $borrower->{'categorycode'},	555	categorycode => $borrower->{'categorycode'},
557	categoryname => $borrower->{description},	556	categoryname => $borrower->{description},
Lines 593-598 $template->param( Link Here
593	if ($stickyduedate) {	592	if ($stickyduedate) {
594	$session->param( 'stickyduedate', $duedatespec );	593	$session->param( 'stickyduedate', $duedatespec );
595	}	594	}
		595	$session->flush;
596		596
597	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});	597	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
598	$template->param( picture => 1 ) if $picture;	598	$template->param( picture => 1 ) if $picture;

Lines 107-113 function update_child() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +1 lines)
107	function confirm_reregistration() {	107	function confirm_reregistration() {
108	var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));	108	var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
109	if (is_confirmed) {	109	if (is_confirmed) {
110	window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&desintation=[% destination %]&reregistration=y';	110	window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&cardnumber=[% cardnumber %]&destination=[% destination %]&reregistration=y';
111	}	111	}
112	}	112	}
113	function export_barcodes() {	113	function export_barcodes() {

Lines 139-144 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
139	[% IF ( borrowernumber ) %]	139	[% IF ( borrowernumber ) %]
140	[% INCLUDE 'members-toolbar.inc' %]	140	[% INCLUDE 'members-toolbar.inc' %]
141	[% END %]	141	[% END %]
		142	[% INCLUDE 'messages.inc' %]
142		143
143	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->	144	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->
144	<div style="display: none;" id="add_message_form">	145	<div style="display: none;" id="add_message_form">
Lines 178-185 $(document).ready(function() { Link Here
178	</form>	179	</form>
179	</div>	180	</div>
180		181
181	[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
182
183	[% IF additional_materials %]	182	[% IF additional_materials %]
184	<div id="materials" class="dialog message">Note about the accompanying materials: <br />	183	<div id="materials" class="dialog message">Note about the accompanying materials: <br />
185	[% additional_materials %]	184	[% additional_materials %]

Lines 76-86 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-5 / +1 lines)
76	<li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>	76	<li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
77	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>	77	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>
78	<li><span class="label">Expiration date: </span>	78	<li><span class="label">Expiration date: </span>
79	[% IF ( was_renewed ) %]	79	[% dateexpiry %]
80	<strong class="reregistrinfo">[% dateexpiry %]</strong>
81	[% ELSE %]
82	[% dateexpiry %]
83	[% END %]
84	</li>	80	</li>
85	<li><span class="label">Library: </span>[% branchname %]</li>	81	<li><span class="label">Library: </span>[% branchname %]</li>
86		82




</div>
[% END %]
<div class="yui-g">
  [% INCLUDE 'messages.inc' %]

[% IF ( unknowuser ) %]
   <div class="dialog message">This patron does not exist.</div>
[% ELSE %]
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]

    [% IF ( flagged ) %]
    <div id="circmessages" class="circmessage attention">
        <ul>

    <li><span class="label">Registration date: </span>[% dateenrolled %]</li>
    
    <li><span class="label">Expiration date: </span>
        [% dateexpiry %]
            <strong class="reregistrinfo">[% dateexpiry %]</strong>
    [% ELSE %]
            [% dateexpiry %]
    [% END %]
    </li>
    
    <li><span class="label">Library: </span>[% branchname %]</li>

Lines 347-353 $template->param( Link Here

(-)a/members/moremember.pl (-1 lines)
347	borrowernumber => $borrowernumber,	347	borrowernumber => $borrowernumber,
348	othernames => $data->{'othernames'},	348	othernames => $data->{'othernames'},
349	categoryname => $data->{'description'},	349	categoryname => $data->{'description'},
350	was_renewed => $input->param('was_renewed') ? 1 : 0,
351	branch => $branch,	350	branch => $branch,
352	todaysdate => C4::Dates->today(),	351	todaysdate => C4::Dates->today(),
353	totalprice => sprintf("%.2f", $totalprice),	352	totalprice => sprintf("%.2f", $totalprice),

Lines 31-36 use C4::Context; Link Here

(-)a/members/setstatus.pl (-11 / +9 lines)
31	use C4::Members;	31	use C4::Members;
32	use C4::Auth;	32	use C4::Auth;
33		33
		34	use Koha::I18N;
		35	use Koha::Messages;
		36	use Koha::DateUtils;
34		37
35	my $input = new CGI;	38	my $input = new CGI;
36		39
Lines 54-69 if ( $reregistration eq 'y' ) { Link Here
54	$sth->finish;	57	$sth->finish;
55	}	58	}
56		59
		60	if ($dateexpiry) {
		61	$dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1});
		62	messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry));
		63	}
57	if($destination eq "circ"){	64	if($destination eq "circ"){
58	if($dateexpiry){	65	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
59	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&was_renewed=1");
60	} else {
61	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
62	}
63	} else {	66	} else {
64	if($dateexpiry){	67	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
65	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
66	} else {
67	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
68	}
69	}	68	}
70	-

Return to bug 11904

Lines 162-173 function validate1(date) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +2 lines)
162	</div>	162	</div>
163	[% END %]	163	[% END %]
164	<div class="yui-g">	164	<div class="yui-g">
		165	[% INCLUDE 'messages.inc' %]
165		166
166	[% IF ( unknowuser ) %]	167	[% IF ( unknowuser ) %]
167	<div class="dialog message">This patron does not exist.</div>	168	<div class="dialog message">This patron does not exist.</div>
168	[% ELSE %]	169	[% ELSE %]
169	[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
170
171	[% IF ( flagged ) %]	170	[% IF ( flagged ) %]
172	<div id="circmessages" class="circmessage attention">	171	<div id="circmessages" class="circmessage attention">
173	<ul>	172	<ul>
Lines 337-347 function validate1(date) { Link Here
337	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>	336	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>
338		337
339	<li><span class="label">Expiration date: </span>	338	<li><span class="label">Expiration date: </span>
340	[% IF ( was_renewed ) %]	339	[% dateexpiry %]
341	<strong class="reregistrinfo">[% dateexpiry %]</strong>
342	[% ELSE %]
343	[% dateexpiry %]
344	[% END %]
345	</li>	340	</li>
346		341
347	<li><span class="label">Library: </span>[% branchname %]</li>	342	<li><span class="label">Library: </span>[% branchname %]</li>