|
Lines 274-283
sub GetSubscription {
Link Here
|
| 274 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
274 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
| 275 |
|
275 |
|
| 276 |
# Add additional fields to the subscription into a new key "additional_fields" |
276 |
# Add additional fields to the subscription into a new key "additional_fields" |
| 277 |
my %additional_field_values = map { |
277 |
my $subscription_object = Koha::Subscriptions->find($subscriptionid); |
| 278 |
$_->field->name => $_->value |
278 |
$subscription->{additional_fields} = { map { $_->field->name => $_->value } |
| 279 |
} Koha::Subscriptions->find($subscriptionid)->additional_field_values; |
279 |
$subscription_object->additional_field_values->as_list }; |
| 280 |
$subscription->{additional_fields} = \%additional_field_values; |
|
|
| 281 |
|
280 |
|
| 282 |
return $subscription; |
281 |
return $subscription; |
| 283 |
} |
282 |
} |
|
Lines 624-633
sub SearchSubscriptions {
Link Here
|
| 624 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
623 |
$subscription->{cannotedit} = not can_edit_subscription( $subscription ); |
| 625 |
$subscription->{cannotdisplay} = not can_show_subscription( $subscription ); |
624 |
$subscription->{cannotdisplay} = not can_show_subscription( $subscription ); |
| 626 |
|
625 |
|
| 627 |
my %additional_field_values = map { |
626 |
my $subscription_object = Koha::Subscriptions->find($subscription->{subscriptionid}); |
| 628 |
$_->field->name => $_->value |
627 |
$subscription->{additional_fields} = { map { $_->field->name => $_->value } |
| 629 |
} Koha::Subscriptions->find($subscription->{subscriptionid})->additional_field_values; |
628 |
$subscription_object->additional_field_values->as_list }; |
| 630 |
$subscription->{additional_fields} = \%additional_field_values; |
629 |
|
| 631 |
} |
630 |
} |
| 632 |
|
631 |
|
| 633 |
return @$results; |
632 |
return @$results; |
|
Lines 1823-1833
sub GetLateOrMissingIssues {
Link Here
|
| 1823 |
} |
1822 |
} |
| 1824 |
$line->{"status".$line->{status}} = 1; |
1823 |
$line->{"status".$line->{status}} = 1; |
| 1825 |
|
1824 |
|
| 1826 |
my $subscription = Koha::Subscriptions->find($line->{subscriptionid}); |
1825 |
my $subscription_object = Koha::Subscriptions->find($line->{subscriptionid}); |
| 1827 |
my %additional_field_values = map { |
1826 |
$line->{additional_fields} = { map { $_->field->name => $_->value } |
| 1828 |
$_->field->name => $_->value |
1827 |
$subscription_object->additional_field_values->as_list }; |
| 1829 |
} $subscription->additional_field_values; |
|
|
| 1830 |
%$line = ( %$line, additional_fields => \%additional_field_values ); |
| 1831 |
|
1828 |
|
| 1832 |
push @issuelist, $line; |
1829 |
push @issuelist, $line; |
| 1833 |
} |
1830 |
} |
| 1834 |
- |
|
|