Lines 275-284
sub GetSubscription {
Link Here
|
275 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
275 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
276 |
|
276 |
|
277 |
# Add additional fields to the subscription into a new key "additional_fields" |
277 |
# Add additional fields to the subscription into a new key "additional_fields" |
278 |
my %additional_field_values = map { |
278 |
my $subscription_object = Koha::Subscriptions->find($subscriptionid); |
279 |
$_->field->name => $_->value |
279 |
$subscription->{additional_fields} = { map { $_->field->name => $_->value } |
280 |
} Koha::Subscriptions->find($subscriptionid)->additional_field_values; |
280 |
$subscription_object->additional_field_values->as_list }; |
281 |
$subscription->{additional_fields} = \%additional_field_values; |
|
|
282 |
|
281 |
|
283 |
if ( my $mana_id = $subscription->{mana_id} ) { |
282 |
if ( my $mana_id = $subscription->{mana_id} ) { |
284 |
my $mana_subscription = Koha::SharedContent::get_entity_by_id( |
283 |
my $mana_subscription = Koha::SharedContent::get_entity_by_id( |
Lines 631-640
sub SearchSubscriptions {
Link Here
|
631 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
630 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
632 |
$subscription->{cannotdisplay} = not can_show_subscription( $subscription ); |
631 |
$subscription->{cannotdisplay} = not can_show_subscription( $subscription ); |
633 |
|
632 |
|
634 |
my %additional_field_values = map { |
633 |
my $subscription_object = Koha::Subscriptions->find($subscription->{subscriptionid}); |
635 |
$_->field->name => $_->value |
634 |
$subscription->{additional_fields} = { map { $_->field->name => $_->value } |
636 |
} Koha::Subscriptions->find($subscription->{subscriptionid})->additional_field_values; |
635 |
$subscription_object->additional_field_values->as_list }; |
637 |
$subscription->{additional_fields} = \%additional_field_values; |
636 |
|
638 |
} |
637 |
} |
639 |
|
638 |
|
640 |
return @$results; |
639 |
return @$results; |
Lines 1832-1842
sub GetLateOrMissingIssues {
Link Here
|
1832 |
} |
1831 |
} |
1833 |
$line->{"status".$line->{status}} = 1; |
1832 |
$line->{"status".$line->{status}} = 1; |
1834 |
|
1833 |
|
1835 |
my $subscription = Koha::Subscriptions->find($line->{subscriptionid}); |
1834 |
my $subscription_object = Koha::Subscriptions->find($line->{subscriptionid}); |
1836 |
my %additional_field_values = map { |
1835 |
$line->{additional_fields} = { map { $_->field->name => $_->value } |
1837 |
$_->field->name => $_->value |
1836 |
$subscription_object->additional_field_values->as_list }; |
1838 |
} $subscription->additional_field_values; |
|
|
1839 |
%$line = ( %$line, additional_fields => \%additional_field_values ); |
1840 |
|
1837 |
|
1841 |
push @issuelist, $line; |
1838 |
push @issuelist, $line; |
1842 |
} |
1839 |
} |
1843 |
- |
|
|