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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt (-13 / +3 lines)
Lines 67-73 Link Here
67
            [% IF accountline %]
67
            [% IF accountline %]
68
68
69
                <div class="page-section">
69
                <div class="page-section">
70
                    [% af_values = accountline.additional_field_values %]
71
                    [% IF accountline.credit_type_code %]
70
                    [% IF accountline.credit_type_code %]
72
                        <h2>Details of credit</h2>
71
                        <h2>Details of credit</h2>
73
                    [% ELSIF accountline.debit_type_code %]
72
                    [% ELSIF accountline.debit_type_code %]
Lines 83-90 Link Here
83
                                <th>Due date</th>
82
                                <th>Due date</th>
84
                                <th>Return date</th>
83
                                <th>Return date</th>
85
                                <th>Note</th>
84
                                <th>Note</th>
86
                                [% FOREACH value IN af_values %]
85
                                [% FOREACH field IN available_additional_fields %]
87
                                    <th>[% value.field.name | html %]</th>
86
                                    <th>[% field.name | html %]</th>
88
                                [% END %]
87
                                [% END %]
89
                                <th>Amount</th>
88
                                <th>Amount</th>
90
                                <th>Outstanding</th>
89
                                <th>Outstanding</th>
Lines 134-149 Link Here
134
                                <td>
133
                                <td>
135
                                    [% accountline.note | html_line_break %]
134
                                    [% accountline.note | html_line_break %]
136
                                </td>
135
                                </td>
137
136
                                [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values value_only=1 is_table_cell=1 %]
138
                                [% FOREACH value IN af_values %]
139
                                    <td>
140
                                        [% IF value.field.authorised_value_category %]
141
                                            [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %]
142
                                        [% ELSE %]
143
                                            [% value.value | html %]
144
                                        [% END %]
145
                                    </td>
146
                                [% END %]
147
137
148
                                <td>
138
                                <td>
149
                                    [% accountline.amount | $Price %]
139
                                    [% accountline.amount | $Price %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (+1 lines)
Lines 134-139 Link Here
134
[% MACRO jsinclude BLOCK %]
134
[% MACRO jsinclude BLOCK %]
135
    [% INCLUDE 'str/members-menu.inc' %]
135
    [% INCLUDE 'str/members-menu.inc' %]
136
    [% Asset.js("js/members-menu.js") | $raw %]
136
    [% Asset.js("js/members-menu.js") | $raw %]
137
    [% Asset.js("js/additional-fields-entry.js") | $raw %]
137
    <script>
138
    <script>
138
        $(document).ready(function(){
139
        $(document).ready(function(){
139
            $('#mancredit').preventDoubleFormSubmit();
140
            $('#mancredit').preventDoubleFormSubmit();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (+1 lines)
Lines 128-133 Link Here
128
[% MACRO jsinclude BLOCK %]
128
[% MACRO jsinclude BLOCK %]
129
    [% INCLUDE 'str/members-menu.inc' %]
129
    [% INCLUDE 'str/members-menu.inc' %]
130
    [% Asset.js("js/members-menu.js") | $raw %]
130
    [% Asset.js("js/members-menu.js") | $raw %]
131
    [% Asset.js("js/additional-fields-entry.js") | $raw %]
131
    <script>
132
    <script>
132
        var type_fees = {};
133
        var type_fees = {};
133
        [% FOREACH debit_type IN debit_types %]
134
        [% FOREACH debit_type IN debit_types %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (+1 lines)
Lines 407-412 Link Here
407
[% MACRO jsinclude BLOCK %]
407
[% MACRO jsinclude BLOCK %]
408
    [% INCLUDE 'str/members-menu.inc' %]
408
    [% INCLUDE 'str/members-menu.inc' %]
409
    [% Asset.js("js/members-menu.js") | $raw %]
409
    [% Asset.js("js/members-menu.js") | $raw %]
410
    [% Asset.js("js/additional-fields-entry.js") | $raw %]
410
    <script>
411
    <script>
411
        $(document).ready(function() {
412
        $(document).ready(function() {
412
            [% IF payment_id && Koha.Preference('FinePaymentAutoPopup') %]
413
            [% IF payment_id && Koha.Preference('FinePaymentAutoPopup') %]
(-)a/members/accountline-details.pl (+3 lines)
Lines 60-65 if ($accountline) { Link Here
60
    $template->param(
60
    $template->param(
61
        accountline     => $accountline,
61
        accountline     => $accountline,
62
        account_offsets => $account_offsets,
62
        account_offsets => $account_offsets,
63
        additional_field_values => $accountline->get_additional_field_values_for_template,
64
        available_additional_fields => Koha::AdditionalFields->search(
65
            { tablename => $accountline->credit_type_code ? 'accountlines:credit' : 'accountlines:debit' } ),
63
    );
66
    );
64
67
65
    my $patron = Koha::Patrons->find( $accountline->borrowernumber );
68
    my $patron = Koha::Patrons->find( $accountline->borrowernumber );
(-)a/members/mancredit.pl (-4 / +4 lines)
Lines 111-122 if ($add) { Link Here
111
    my @additional_fields;
111
    my @additional_fields;
112
    my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
112
    my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
113
    while ( my $field = $accountline_fields->next ) {
113
    while ( my $field = $accountline_fields->next ) {
114
        my $value = $input->param('additional_field_' . $field->id);
114
        my @field_values = $input->param( 'additional_field_' . $field->id );
115
        if (defined $value) {
115
        foreach my $value (@field_values) {
116
            push @additional_fields, {
116
            push @additional_fields, {
117
                id => $field->id,
117
                id    => $field->id,
118
                value => $value,
118
                value => $value,
119
            };
119
            } if $value;
120
        }
120
        }
121
    }
121
    }
122
    if (@additional_fields) {
122
    if (@additional_fields) {
(-)a/members/maninvoice.pl (-4 / +4 lines)
Lines 169-180 if ($add) { Link Here
169
            my @additional_fields;
169
            my @additional_fields;
170
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:debit' });
170
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:debit' });
171
            while ( my $field = $accountline_fields->next ) {
171
            while ( my $field = $accountline_fields->next ) {
172
                my $value = $input->param('additional_field_' . $field->id);
172
                my @field_values = $input->param( 'additional_field_' . $field->id );
173
                if (defined $value) {
173
                foreach my $value (@field_values) {
174
                    push @additional_fields, {
174
                    push @additional_fields, {
175
                        id => $field->id,
175
                        id    => $field->id,
176
                        value => $value,
176
                        value => $value,
177
                    };
177
                    } if $value;
178
                }
178
                }
179
            }
179
            }
180
            if (@additional_fields) {
180
            if (@additional_fields) {
(-)a/members/paycollect.pl (-9 / +8 lines)
Lines 175-186 if ( $total_paid and $total_paid ne '0.00' ) { Link Here
175
            my @additional_fields;
175
            my @additional_fields;
176
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
176
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
177
            while ( my $field = $accountline_fields->next ) {
177
            while ( my $field = $accountline_fields->next ) {
178
                my $value = $input->param('additional_field_' . $field->id);
178
                my @field_values = $input->param( 'additional_field_' . $field->id );
179
                if (defined $value) {
179
                foreach my $value (@field_values) {
180
                    push @additional_fields, {
180
                    push @additional_fields, {
181
                        id => $field->id,
181
                        id    => $field->id,
182
                        value => $value,
182
                        value => $value,
183
                    };
183
                    } if $value;
184
                }
184
                }
185
            }
185
            }
186
            if (@additional_fields) {
186
            if (@additional_fields) {
Lines 235-246 if ( $total_paid and $total_paid ne '0.00' ) { Link Here
235
            my @additional_fields;
235
            my @additional_fields;
236
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
236
            my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
237
            while ( my $field = $accountline_fields->next ) {
237
            while ( my $field = $accountline_fields->next ) {
238
                my $value = $input->param('additional_field_' . $field->id);
238
                my @field_values = $input->param( 'additional_field_' . $field->id );
239
                if (defined $value) {
239
                foreach my $value (@field_values) {
240
                    push @additional_fields, {
240
                    push @additional_fields, {
241
                        id => $field->id,
241
                        id    => $field->id,
242
                        value => $value,
242
                        value => $value,
243
                    };
243
                    } if $value;
244
                }
244
                }
245
            }
245
            }
246
            if (@additional_fields) {
246
            if (@additional_fields) {
247
- 

Return to bug 35044