Attachment #29554 for bug #11904

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

Lines 521-527 $template->param( Link Here

(-)a/circ/circulation.pl (-1 / +1 lines)
521	surname => $borrower->{'surname'},	521	surname => $borrower->{'surname'},
522	showname => $borrower->{'showname'},	522	showname => $borrower->{'showname'},
523	category_type => $borrower->{'category_type'},	523	category_type => $borrower->{'category_type'},
524	was_renewed => $query->param('was_renewed') ? 1 : 0,
525	expiry => format_date($borrower->{'dateexpiry'}),	524	expiry => format_date($borrower->{'dateexpiry'}),
526	categorycode => $borrower->{'categorycode'},	525	categorycode => $borrower->{'categorycode'},
527	categoryname => $borrower->{description},	526	categoryname => $borrower->{description},
Lines 562-567 $template->param( Link Here
562	if ($stickyduedate) {	561	if ($stickyduedate) {
563	$session->param( 'stickyduedate', $duedatespec );	562	$session->param( 'stickyduedate', $duedatespec );
564	}	563	}
		564	$session->flush;
565		565
566	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});	566	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
567	$template->param( picture => 1 ) if $picture;	567	$template->param( picture => 1 ) if $picture;

Lines 69-75 function update_child() { Link Here

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

Lines 85-90 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
85	[% IF ( borrowernumber ) %]	85	[% IF ( borrowernumber ) %]
86	[% INCLUDE 'members-toolbar.inc' %]	86	[% INCLUDE 'members-toolbar.inc' %]
87	[% END %]	87	[% END %]
		88	[% INCLUDE 'messages.inc' %]
88		89
89	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->	90	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->
90	<div style="display: none;" id="add_message_form">	91	<div style="display: none;" id="add_message_form">
Lines 124-131 $(document).ready(function() { Link Here
124	</form>	125	</form>
125	</div>	126	</div>
126		127
127	[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]
128
129	[% IF additional_materials %]	128	[% IF additional_materials %]
130	<div id="materials" class="dialog message">Note about the accompanying materials: <br />	129	<div id="materials" class="dialog message">Note about the accompanying materials: <br />
131	[% additional_materials %]	130	[% 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 348-354 $template->param( Link Here

(-)a/members/moremember.pl (-1 lines)
348	borrowernumber => $borrowernumber,	348	borrowernumber => $borrowernumber,
349	othernames => $data->{'othernames'},	349	othernames => $data->{'othernames'},
350	categoryname => $data->{'description'},	350	categoryname => $data->{'description'},
351	was_renewed => $input->param('was_renewed') ? 1 : 0,
352	branch => $branch,	351	branch => $branch,
353	todaysdate => C4::Dates->today(),	352	todaysdate => C4::Dates->today(),
354	totalprice => sprintf("%.2f", $totalprice),	353	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 149-160 function validate1(date) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +2 lines)
149	</div>	149	</div>
150	[% END %]	150	[% END %]
151	<div class="yui-g">	151	<div class="yui-g">
		152	[% INCLUDE 'messages.inc' %]
152		153
153	[% IF ( unknowuser ) %]	154	[% IF ( unknowuser ) %]
154	<div class="dialog message">This patron does not exist.</div>	155	<div class="dialog message">This patron does not exist.</div>
155	[% ELSE %]	156	[% ELSE %]
156	[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry %]</div>[% END %]
157
158	[% IF ( flagged ) %]	157	[% IF ( flagged ) %]
159	<div id="circmessages" class="circmessage attention">	158	<div id="circmessages" class="circmessage attention">
160	<ul>	159	<ul>
Lines 325-335 function validate1(date) { Link Here
325	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>	324	<li><span class="label">Registration date: </span>[% dateenrolled %]</li>
326		325
327	<li><span class="label">Expiration date: </span>	326	<li><span class="label">Expiration date: </span>
328	[% IF ( was_renewed ) %]	327	[% dateexpiry %]
329	<strong class="reregistrinfo">[% dateexpiry %]</strong>
330	[% ELSE %]
331	[% dateexpiry %]
332	[% END %]
333	</li>	328	</li>
334		329
335	<li><span class="label">Library: </span>[% branchname %]</li>	330	<li><span class="label">Library: </span>[% branchname %]</li>