gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15774: Use the include file to display the subscription's additional fields 

We have it, why not to use it?

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-11-01 17:41:37 -03:00 committed by Nick Clemens
parent 8035151e41
commit ccd6a334b7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
View File

@ -131,23 +131,14 @@
</div>
</div>
[% IF additional_fields_for_subscription %]
[% IF available_additional_fields %]
<hr>
<div class="row">
<div class="col-sm-6">
<h3>Additional fields:</h3>
<div class="rows">
<ol>
[% FOR field IN additional_fields_for_subscription %]
<li>
<span class="label">[% field.name | html %]:</span>
[% IF field.authorised_value_category %]
[% AuthorisedValues.GetByCode( field.authorised_value_category, additional_fields.${field.name} ) | html %]
[% ELSE %]
[% additional_fields.${field.name} | html %]
[% END %]
</li>
[% END %]
[% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
</ol>
</div>
</div>

11
serials/subscription-detail.pl
View File

@ -30,6 +30,7 @@ use Koha::AdditionalFields;
use Koha::AuthorisedValues;
use Koha::DateUtils;
use Koha::Acquisition::Bookseller;
use Koha::Subscriptions;
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
use Carp;
@ -129,8 +130,14 @@ my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($su
my $default_bib_view = get_default_view();
my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } );
$template->param( additional_fields_for_subscription => $additional_fields );
my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
$template->param(
available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ],
additional_field_values => {
map { $_->field->name => $_->value }
$subscription_object->additional_field_values->as_list
},
);
# FIXME Do we want to hide canceled orders?
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );