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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-11 / +2 lines)
Lines 131-153 Link Here
131
     </div>
131
     </div>
132
     </div>
132
     </div>
133
133
134
    [% IF additional_fields_for_subscription %]
134
    [% IF available_additional_fields %]
135
    <hr>
135
    <hr>
136
    <div class="row">
136
    <div class="row">
137
      <div class="col-sm-6">
137
      <div class="col-sm-6">
138
        <h3>Additional fields:</h3>
138
        <h3>Additional fields:</h3>
139
        <div class="rows">
139
        <div class="rows">
140
          <ol>
140
          <ol>
141
            [% FOR field IN additional_fields_for_subscription %]
141
            [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
142
              <li>
143
                <span class="label">[% field.name | html %]:</span>
144
                [% IF field.authorised_value_category %]
145
                  [% AuthorisedValues.GetByCode( field.authorised_value_category, additional_fields.${field.name} ) | html %]
146
                [% ELSE %]
147
                  [% additional_fields.${field.name} | html %]
148
                [% END %]
149
              </li>
150
            [% END %]
151
          </ol>
142
          </ol>
152
        </div>
143
        </div>
153
      </div>
144
      </div>
(-)a/serials/subscription-detail.pl (-3 / +9 lines)
Lines 30-35 use Koha::AdditionalFields; Link Here
30
use Koha::AuthorisedValues;
30
use Koha::AuthorisedValues;
31
use Koha::DateUtils;
31
use Koha::DateUtils;
32
use Koha::Acquisition::Bookseller;
32
use Koha::Acquisition::Bookseller;
33
use Koha::Subscriptions;
33
34
34
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
35
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
35
use Carp;
36
use Carp;
Lines 129-136 my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($su Link Here
129
130
130
my $default_bib_view = get_default_view();
131
my $default_bib_view = get_default_view();
131
132
132
my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } );
133
my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
133
$template->param( additional_fields_for_subscription => $additional_fields );
134
$template->param(
135
    available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ],
136
    additional_field_values => {
137
        map { $_->field->name => $_->value }
138
          $subscription_object->additional_field_values->as_list
139
    },
140
);
134
141
135
# FIXME Do we want to hide canceled orders?
142
# FIXME Do we want to hide canceled orders?
136
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
143
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
137
- 

Return to bug 15774