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 125-147 Link Here
125
     </div>
125
     </div>
126
     </div>
126
     </div>
127
127
128
    [% IF additional_fields_for_subscription %]
128
    [% IF available_additional_fields %]
129
    <hr>
129
    <hr>
130
    <div class="row">
130
    <div class="row">
131
      <div class="col-sm-6">
131
      <div class="col-sm-6">
132
        <h3>Additional fields:</h3>
132
        <h3>Additional fields:</h3>
133
        <div class="rows">
133
        <div class="rows">
134
          <ol>
134
          <ol>
135
            [% FOR field IN additional_fields_for_subscription %]
135
            [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
136
              <li>
137
                <span class="label">[% field.name | html %]:</span>
138
                [% IF field.authorised_value_category %]
139
                  [% AuthorisedValues.GetByCode( field.authorised_value_category, additional_fields.${field.name} ) | html %]
140
                [% ELSE %]
141
                  [% additional_fields.${field.name} | html %]
142
                [% END %]
143
              </li>
144
            [% END %]
145
          </ol>
136
          </ol>
146
        </div>
137
        </div>
147
      </div>
138
      </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 121-128 my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($su Link Here
121
122
122
my $default_bib_view = get_default_view();
123
my $default_bib_view = get_default_view();
123
124
124
my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } );
125
my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
125
$template->param( additional_fields_for_subscription => $additional_fields );
126
$template->param(
127
    available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ],
128
    additional_field_values => {
129
        map { $_->field->name => $_->value }
130
          $subscription_object->additional_field_values->as_list
131
    },
132
);
126
133
127
# FIXME Do we want to hide canceled orders?
134
# FIXME Do we want to hide canceled orders?
128
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
135
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
129
- 

Return to bug 15774