Skip to content

Commit 10b9888

Browse files
ammoptkfischer
ammopt
authored and
kfischer
committed
Bug 35044: Update: Manual invoices, manual credits and accountlines
Test plan, k-t-d: Preparation: Create additional fields for table 'accountlines:credit', visit: /cgi-bin/koha/admin/additional-fields.pl?tablename=accountlines%3Acredit 2 text fields, one repeatable, one not-repeatable 2 AV fields, one repeatable, one not-repeatable 1) Add a new manual credit for admin borrower: /cgi-bin/koha/members/mancredit.pl?borrowernumber=51 2) Set the mandatory "Amount" input (e.g. '5'). Click the 'Next' and press 'Ok' on the alert box. 3) Fill in all additional fields, click the '+New' and 'Clear' links, hit 'Save' 4) On the table, click "Details" for the for account line we just created. 5) Notice the additional fields are there, repeated fields are comma separated. 6) Repeat the above test plan, but for accountlines:debit instead, visit: /cgi-bin/koha/admin/additional-fields.pl?tablename=accountlines%3Adebit 7) To add a manual invoice, visit: /cgi-bin/koha/members/maninvoice.pl?borrowernumber=51 Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
1 parent 2fec74f commit 10b9888

File tree

8 files changed

+25
-29
lines changed

8 files changed

+25
-29
lines changed

‎koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt

+3-13
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
[% IF accountline %]
6969

7070
<div class="page-section">
71-
[% af_values = accountline.additional_field_values %]
7271
[% IF accountline.credit_type_code %]
7372
<h2>Details of credit</h2>
7473
[% ELSIF accountline.debit_type_code %]
@@ -84,8 +83,8 @@
8483
<th>Due date</th>
8584
<th>Return date</th>
8685
<th>Note</th>
87-
[% FOREACH value IN af_values %]
88-
<th>[% value.field.name | html %]</th>
86+
[% FOREACH field IN available_additional_fields %]
87+
<th>[% field.name | html %]</th>
8988
[% END %]
9089
<th>Amount</th>
9190
<th>Outstanding</th>
@@ -135,16 +134,7 @@
135134
<td>
136135
[% accountline.note | html_line_break %]
137136
</td>
138-
139-
[% FOREACH value IN af_values %]
140-
<td>
141-
[% IF value.field.authorised_value_category %]
142-
[% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %]
143-
[% ELSE %]
144-
[% value.value | html %]
145-
[% END %]
146-
</td>
147-
[% END %]
137+
[% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values value_only=1 is_table_cell=1 %]
148138

149139
<td>
150140
[% accountline.amount | $Price %]

‎koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
[% MACRO jsinclude BLOCK %]
137137
[% INCLUDE 'str/members-menu.inc' %]
138138
[% Asset.js("js/members-menu.js") | $raw %]
139+
[% Asset.js("js/additional-fields-entry.js") | $raw %]
139140
<script>
140141
$(document).ready(function(){
141142
$('#mancredit').preventDoubleFormSubmit();

‎koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
[% MACRO jsinclude BLOCK %]
131131
[% INCLUDE 'str/members-menu.inc' %]
132132
[% Asset.js("js/members-menu.js") | $raw %]
133+
[% Asset.js("js/additional-fields-entry.js") | $raw %]
133134
<script>
134135
var type_fees = {};
135136
[% FOREACH debit_type IN debit_types %]

‎koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt

+1
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@
434434
[% MACRO jsinclude BLOCK %]
435435
[% INCLUDE 'str/members-menu.inc' %]
436436
[% Asset.js("js/members-menu.js") | $raw %]
437+
[% Asset.js("js/additional-fields-entry.js") | $raw %]
437438
<script>
438439
$(document).ready(function() {
439440
[% IF payment_id && Koha.Preference('FinePaymentAutoPopup') %]

‎members/accountline-details.pl

+3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
$template->param(
6161
accountline => $accountline,
6262
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' } ),
6366
);
6467

6568
my $patron = Koha::Patrons->find( $accountline->borrowernumber );

‎members/mancredit.pl

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@
102102
my @additional_fields;
103103
my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
104104
while ( my $field = $accountline_fields->next ) {
105-
my $value = $input->param('additional_field_' . $field->id);
106-
if (defined $value) {
105+
my @field_values = $input->param( 'additional_field_' . $field->id );
106+
foreach my $value (@field_values) {
107107
push @additional_fields, {
108-
id => $field->id,
108+
id => $field->id,
109109
value => $value,
110-
};
110+
} if $value;
111111
}
112112
}
113113
if (@additional_fields) {

‎members/maninvoice.pl

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@
164164
my @additional_fields;
165165
my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:debit' });
166166
while ( my $field = $accountline_fields->next ) {
167-
my $value = $input->param('additional_field_' . $field->id);
168-
if (defined $value) {
167+
my @field_values = $input->param( 'additional_field_' . $field->id );
168+
foreach my $value (@field_values) {
169169
push @additional_fields, {
170-
id => $field->id,
170+
id => $field->id,
171171
value => $value,
172-
};
172+
} if $value;
173173
}
174174
}
175175
if (@additional_fields) {

‎members/paycollect.pl

+8-8
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@
173173
my @additional_fields;
174174
my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
175175
while ( my $field = $accountline_fields->next ) {
176-
my $value = $input->param('additional_field_' . $field->id);
177-
if (defined $value) {
176+
my @field_values = $input->param( 'additional_field_' . $field->id );
177+
foreach my $value (@field_values) {
178178
push @additional_fields, {
179-
id => $field->id,
179+
id => $field->id,
180180
value => $value,
181-
};
181+
} if $value;
182182
}
183183
}
184184
if (@additional_fields) {
@@ -251,12 +251,12 @@
251251
my @additional_fields;
252252
my $accountline_fields = Koha::AdditionalFields->search({ tablename => 'accountlines:credit' });
253253
while ( my $field = $accountline_fields->next ) {
254-
my $value = $input->param('additional_field_' . $field->id);
255-
if (defined $value) {
254+
my @field_values = $input->param( 'additional_field_' . $field->id );
255+
foreach my $value (@field_values) {
256256
push @additional_fields, {
257-
id => $field->id,
257+
id => $field->id,
258258
value => $value,
259-
};
259+
} if $value;
260260
}
261261
}
262262
if (@additional_fields) {

0 commit comments

Comments
 (0)