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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-8 / +19 lines)
Lines 113-123 Link Here
113
113
114
    <li>
114
    <li>
115
        <label for="paid">Amount being paid: </label>
115
        <label for="paid">Amount being paid: </label>
116
        <input name="paid" id="paid" value="[% amountoutstanding | $Price on_editing => 1 %]"/>
116
        <input name="paid" id="paid" type="text" step="0.01" value="[% amountoutstanding | $Price on_editing => 1 %]"/>
117
    </li>
117
    </li>
118
    <li>
118
    <li>
119
        <label for="collected">Collected from patron: </label>
119
        <label for="collected">Collected from patron: </label>
120
        <input id="collected" value="[% amountoutstanding | $Price on_editing => 1 %]"/>
120
        <input name="collected" id="collected" type="text" step="0.01" value="[% amountoutstanding | $Price on_editing => 1 %]"/>
121
    </li>
121
    </li>
122
    <li>
122
    <li>
123
        <label>Change to give: </label>
123
        <label>Change to give: </label>
Lines 228-244 Link Here
228
        </li>
228
        </li>
229
    <li>
229
    <li>
230
        [% IF type == 'WRITEOFF' %]
230
        [% IF type == 'WRITEOFF' %]
231
            <label for="paid">Writeoff amount:</label>
231
            <label for="paid">Writeoff amount: </label>
232
        [% ELSE %]
232
        [% ELSE %]
233
            <label for="paid">Amount paid: </label>
233
            <label for="paid">Amount being paid: </label>
234
        [% END %]
234
        [% END %]
235
        <input name="paid" id="paid" value="[% total | $Price on_editing => 1 %]"/>
235
        <input name="paid" id="paid" type="text" step="0.01" value="[% total | $Price on_editing => 1 %]"/>
236
    </li>
236
    </li>
237
238
    [% IF type != 'WRITEOFF' %]
237
    [% IF type != 'WRITEOFF' %]
239
        <li>
238
        <li>
240
            <label for="collected">Collected from patron: </label>
239
            <label for="collected">Collected from patron: </label>
241
            <input id="collected" value="[% total | $Price on_editing => 1 %]"/>
240
            <input name="collected" id="collected" type="text" step="0.01" value="[% total | $Price on_editing => 1 %]"/>
242
        </li>
241
        </li>
243
        <li>
242
        <li>
244
            <label>Change to give: </label>
243
            <label>Change to give: </label>
Lines 347-352 Link Here
347
            $('#modal_submit').click(function() {
346
            $('#modal_submit').click(function() {
348
                forms[0].submit();
347
                forms[0].submit();
349
            });
348
            });
349
350
            $( "#payindivfine, #payfine" ).validate({
351
                rules: {
352
                    paid: { required: true },
353
                    collected: {
354
                        required: true
355
                    }
356
                }
357
            });
350
        });
358
        });
351
359
352
        prevent_default = 1;
360
        prevent_default = 1;
Lines 420-425 Link Here
420
            var change = $('#change')[0];
428
            var change = $('#change')[0];
421
            change.innerHTML = Math.round(($('#collected')[0].value - $('#paid')[0].value) * 100) / 100;
429
            change.innerHTML = Math.round(($('#collected')[0].value - $('#paid')[0].value) * 100) / 100;
422
            if (change.innerHTML <= 0) {
430
            if (change.innerHTML <= 0) {
431
                var paid = $('#paid')[0];
432
                moneyFormat(paid);
433
                $('#collected').rules( "add", { min: Number(paid.value) });
434
                $( "#payindivfine, #payfine" ).valid();
423
                change.innerHTML = "0.00";
435
                change.innerHTML = "0.00";
424
                $('input[name="change_given"]').val('0.00');
436
                $('input[name="change_given"]').val('0.00');
425
            } else {
437
            } else {
426
- 

Return to bug 22359