Attachment #147740 for bug #33056

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

Lines 187-193 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +2 lines)
187	</fieldset>	187	</fieldset>
188	</form>	188	</form>
189	[% ELSE %]	189	[% ELSE %]
190	<p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>	190	<p>[% INCLUDE 'patron-title.inc' %] has no outstanding charges.</p>
191	[% END %]	191	[% END %]
192	</div> <!-- /.tab-pane -->	192	</div> <!-- /.tab-pane -->
193	</div> <!-- /.tab-content -->	193	</div> <!-- /.tab-content -->
Lines 225-231 Link Here
225		225
226	$('#pay-fines-form').preventDoubleFormSubmit();	226	$('#pay-fines-form').preventDoubleFormSubmit();
227	$("#woall").click(function(event){	227	$("#woall").click(function(event){
228	var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total \| $Price %]" );	228	var msg = _("Are you sure you want to write off %s in outstanding charges? This cannot be undone!").format( "[% total \| $Price %]" );
229	var answer = confirm(msg);	229	var answer = confirm(msg);
230	if (!answer){	230	if (!answer){
231	event.preventDefault();	231	event.preventDefault();




    [% IF type == 'WRITEOFF' %]
        Write off an amount for [% INCLUDE 'patron-title.inc' no_html = 1 %]
    [% ELSE %]
        Collect payment for [% INCLUDE 'patron-title.inc' no_html = 1 %]
    [% END %] &rsaquo; Patrons &rsaquo; Koha
</title>
[% INCLUDE 'doc-head-close.inc' %]

        <li>
            <a href="#" aria-current="page">
                [% IF ( pay_individual ) %]
                    <span>Pay an individual charge</span>
                [% ELSIF ( writeoff_individual ) %]
                    <span>Write off an individual charge</span>
                [% ELSE %]
                    [% IF ( selected_accts ) %]
                        [% IF type == 'WRITEOFF' %]
                            <span>Write off an amount toward selected charges</span>
                        [% ELSE %]
                            <span>Pay an amount toward selected charges</span>
                        [% END %]
                    [% ELSE %]
                        <span>Pay an amount toward all charges</span>
                    [% END %]
                [% END %]
            </a>


            <h1>
                [% IF ( pay_individual ) %]
                    <span>Pay an individual charge</span>
                [% ELSIF ( writeoff_individual ) %]
                    <span>Write off an individual charge</span>
                [% ELSE %]
                    [% IF ( selected_accts ) %]
                        [% IF type == 'WRITEOFF' %]
                            <span>Write off an amount toward selected charges</span>
                        [% ELSE %]
                            <span>Pay an amount toward selected charges</span>
                        [% END %]
                    [% ELSE %]
                        <span>Pay an amount toward all charges</span>
                    [% END %]
                [% END %]
            </h1>

    <input type="hidden" name="change_given" id="change_given" />

<fieldset class="rows">
    <legend>Pay an individual charge</legend>
    <input type="hidden" name="payment_note" id="payment_note" value="[% payment_note | html %]" />
    <table>
    <thead><tr>

    <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
    <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
    <fieldset class="rows">
    <legend>Write off an individual charge</legend>
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual | html %]" />
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber | html %]" />

    <fieldset class="rows">
    [% IF ( selected_accts ) %]
        [% IF type == 'WRITEOFF' %]
            <legend>Write off an amount toward selected charges</legend>
        [% ELSE %]
            <legend>Pay an amount toward selected charges</legend>
        [% END %]
    [% ELSE %]
        <legend>Pay an amount toward all charges</legend>
    [% END %]

    <ol>
- 

Return to bug 33056

Lines 25-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-17 / +16 lines)
25	[% IF type == 'WRITEOFF' %]	25	[% IF type == 'WRITEOFF' %]
26	Write off an amount for [% INCLUDE 'patron-title.inc' no_html = 1 %]	26	Write off an amount for [% INCLUDE 'patron-title.inc' no_html = 1 %]
27	[% ELSE %]	27	[% ELSE %]
28	Collect fine payment for [% INCLUDE 'patron-title.inc' no_html = 1 %]	28	Collect payment for [% INCLUDE 'patron-title.inc' no_html = 1 %]
29	[% END %] &rsaquo; Patrons &rsaquo; Koha	29	[% END %] &rsaquo; Patrons &rsaquo; Koha
30	</title>	30	</title>
31	[% INCLUDE 'doc-head-close.inc' %]	31	[% INCLUDE 'doc-head-close.inc' %]
Lines 51-68 Link Here
51	<li>	51	<li>
52	<a href="#" aria-current="page">	52	<a href="#" aria-current="page">
53	[% IF ( pay_individual ) %]	53	[% IF ( pay_individual ) %]
54	<span>Pay an individual fine</span>	54	<span>Pay an individual charge</span>
55	[% ELSIF ( writeoff_individual ) %]	55	[% ELSIF ( writeoff_individual ) %]
56	<span>Write off an individual fine</span>	56	<span>Write off an individual charge</span>
57	[% ELSE %]	57	[% ELSE %]
58	[% IF ( selected_accts ) %]	58	[% IF ( selected_accts ) %]
59	[% IF type == 'WRITEOFF' %]	59	[% IF type == 'WRITEOFF' %]
60	<span>Write off an amount toward selected fines</span>	60	<span>Write off an amount toward selected charges</span>
61	[% ELSE %]	61	[% ELSE %]
62	<span>Pay an amount toward selected fines</span>	62	<span>Pay an amount toward selected charges</span>
63	[% END %]	63	[% END %]
64	[% ELSE %]	64	[% ELSE %]
65	<span>Pay an amount toward all fines</span>	65	<span>Pay an amount toward all charges</span>
66	[% END %]	66	[% END %]
67	[% END %]	67	[% END %]
68	</a>	68	</a>
Lines 78-95 Link Here
78		78
79	<h1>	79	<h1>
80	[% IF ( pay_individual ) %]	80	[% IF ( pay_individual ) %]
81	<span>Pay an individual fine</span>	81	<span>Pay an individual charge</span>
82	[% ELSIF ( writeoff_individual ) %]	82	[% ELSIF ( writeoff_individual ) %]
83	<span>Write off an individual fine</span>	83	<span>Write off an individual charge</span>
84	[% ELSE %]	84	[% ELSE %]
85	[% IF ( selected_accts ) %]	85	[% IF ( selected_accts ) %]
86	[% IF type == 'WRITEOFF' %]	86	[% IF type == 'WRITEOFF' %]
87	<span>Write off an amount toward selected fines</span>	87	<span>Write off an amount toward selected charges</span>
88	[% ELSE %]	88	[% ELSE %]
89	<span>Pay an amount toward selected fines</span>	89	<span>Pay an amount toward selected charges</span>
90	[% END %]	90	[% END %]
91	[% ELSE %]	91	[% ELSE %]
92	<span>Pay an amount toward all fines</span>	92	<span>Pay an amount toward all charges</span>
93	[% END %]	93	[% END %]
94	[% END %]	94	[% END %]
95	</h1>	95	</h1>
Lines 148-154 Link Here
148	<input type="hidden" name="change_given" id="change_given" />	148	<input type="hidden" name="change_given" id="change_given" />
149		149
150	<fieldset class="rows">	150	<fieldset class="rows">
151	<legend>Pay an individual fine</legend>	151	<legend>Pay an individual charge</legend>
152	<input type="hidden" name="payment_note" id="payment_note" value="[% payment_note \| html %]" />	152	<input type="hidden" name="payment_note" id="payment_note" value="[% payment_note \| html %]" />
153	<table>	153	<table>
154	<thead><tr>	154	<thead><tr>
Lines 234-240 Link Here
234	<form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >	234	<form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
235	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	235	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
236	<fieldset class="rows">	236	<fieldset class="rows">
237	<legend>Write off an individual fine</legend>	237	<legend>Write off an individual charge</legend>
238	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />	238	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />
239	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual \| html %]" />	239	<input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual \| html %]" />
240	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber \| html %]" />	240	<input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber \| html %]" />
Lines 309-320 Link Here
309	<fieldset class="rows">	309	<fieldset class="rows">
310	[% IF ( selected_accts ) %]	310	[% IF ( selected_accts ) %]
311	[% IF type == 'WRITEOFF' %]	311	[% IF type == 'WRITEOFF' %]
312	<legend>Write off an amount toward selected fines</legend>	312	<legend>Write off an amount toward selected charges</legend>
313	[% ELSE %]	313	[% ELSE %]
314	<legend>Pay an amount toward selected fines</legend>	314	<legend>Pay an amount toward selected charges</legend>
315	[% END %]	315	[% END %]
316	[% ELSE %]	316	[% ELSE %]
317	<legend>Pay an amount toward all fines</legend>	317	<legend>Pay an amount toward all charges</legend>
318	[% END %]	318	[% END %]
319		319
320	<ol>	320	<ol>
321	-