Attachment #48418 for bug #11904

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

Lines 600-606 $template->param( Link Here

(-)a/circ/circulation.pl (-1 / +2 lines)
600	branchname => GetBranchName($borrower->{'branchcode'}),	600	branchname => GetBranchName($borrower->{'branchcode'}),
601	printer => $printer,	601	printer => $printer,
602	printername => $printer,	602	printername => $printer,
603	was_renewed => $query->param('was_renewed') ? 1 : 0,
604	expiry => $borrower->{'dateexpiry'},	603	expiry => $borrower->{'dateexpiry'},
605	roadtype => $roadtype,	604	roadtype => $roadtype,
606	amountold => $amountold,	605	amountold => $amountold,
Lines 625-630 $template->param( Link Here
625	relatives_borrowernumbers => \@relatives,	624	relatives_borrowernumbers => \@relatives,
626	);	625	);
627		626
		627	$session->flush;
		628
628	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});	629	my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
629	$template->param( picture => 1 ) if $picture;	630	$template->param( picture => 1 ) if $picture;
630		631

Lines 152-157 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +1 lines)
152	[% IF ( borrowernumber ) %]	152	[% IF ( borrowernumber ) %]
153	[% INCLUDE 'members-toolbar.inc' %]	153	[% INCLUDE 'members-toolbar.inc' %]
154	[% END %]	154	[% END %]
		155	[% INCLUDE 'messages.inc' %]
155		156
156	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->	157	<!-- INITIAL BLOC : PARAMETERS & BORROWER INFO -->
157	<div style="display: none;" id="add_message_form">	158	<div style="display: none;" id="add_message_form">
Lines 191-198 $(document).ready(function() { Link Here
191	</form>	192	</form>
192	</div>	193	</div>
193		194
194	[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry \| $KohaDates %]</div>[% END %]
195
196	[% IF additional_materials %]	195	[% IF additional_materials %]
197	<div id="materials" class="dialog message">Note about the accompanying materials: <br />	196	<div id="materials" class="dialog message">Note about the accompanying materials: <br />
198	[% additional_materials %]	197	[% additional_materials %]

Lines 73-83 Link Here

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




</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 | $KohaDates %]</div>[% END %]

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

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

Lines 340-346 $template->param( Link Here

(-)a/members/moremember.pl (-1 lines)
340	borrowernumber => $borrowernumber,	340	borrowernumber => $borrowernumber,
341	othernames => $data->{'othernames'},	341	othernames => $data->{'othernames'},
342	categoryname => $data->{'description'},	342	categoryname => $data->{'description'},
343	was_renewed => $input->param('was_renewed') ? 1 : 0,
344	branch => $branch,	343	branch => $branch,
345	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),	344	todaysdate => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
346	totalprice => sprintf("%.2f", $totalprice),	345	totalprice => sprintf("%.2f", $totalprice),




use C4::Members;
use C4::Auth;

use Koha::I18N;
use Koha::Messages;
use Koha::DateUtils;

my $input = new CGI;


	$sth->finish;
	}

if ($dateexpiry) {
    $dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1});
    messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry));
}

if ($destination eq "circ") {
    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
} else {
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
    } else {
        print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
    }
}
- 

Return to bug 11904

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

(-)a/members/setstatus.pl (-12 / +11 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 53-68 if ( $reregistration eq 'y' ) { Link Here
53	$sth->finish;	56	$sth->finish;
54	}	57	}
55		58
56	if($destination eq "circ"){	59	if ($dateexpiry) {
57	if($dateexpiry){	60	$dateexpiry = output_pref({dt => dt_from_string($dateexpiry, 'iso'), dateonly => 1});
58	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber&was_renewed=1");	61	messages_set(gettext("Patron's account has been renewed until %1", $dateexpiry));
59	} else {	62	}
60	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");	63
61	}	64	if ($destination eq "circ") {
		65	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
62	} else {	66	} else {
63	if($dateexpiry){	67	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
64	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber&was_renewed=1");
65	} else {
66	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
67	}
68	}	68	}
69	-