@@ -, +, @@
- add/edit a subscription.
- verify all additional fields appears into the "Additional fields"
block.
- fill a value for af1 and af3.
- fill others values if you are adding a new subscription.
- save.
- verify values appears on the detail of the subscription page.
- verify the af2 field is automatically filled with the specified
marc field of the notice.
---
C4/Serials.pm | 12 +++++-
.../prog/en/modules/serials/subscription-add.tt | 33 +++++++++++++++
.../prog/en/modules/serials/subscription-detail.tt | 25 ++++++++++-
serials/subscription-add.pl | 44 ++++++++++++++++++++
serials/subscription-detail.pl | 8 ++++
5 files changed, 120 insertions(+), 2 deletions(-)
--- a/C4/Serials.pm
+++ a/C4/Serials.pm
@@ -26,6 +26,7 @@ use POSIX qw(strftime);
use C4::Biblio;
use C4::Log; # logaction
use C4::Debug;
+use Koha::AdditionalField;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -345,7 +346,16 @@ sub GetSubscription {
$debug and warn "query : $query\nsubsid :$subscriptionid";
my $sth = $dbh->prepare($query);
$sth->execute($subscriptionid);
- return $sth->fetchrow_hashref;
+ my $subscription = $sth->fetchrow_hashref;
+
+ # Add additional fields to the subscription into a new key "additional_fields"
+ my $additional_field_values = Koha::AdditionalField->fetch_all_values({
+ tablename => 'subscription',
+ record_id => $subscriptionid,
+ });
+ my %sub = ( %$subscription, additional_fields => $additional_field_values->{$subscriptionid} );
+
+ return \%sub
}
=head2 GetFullSubscription
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1130,6 +1130,39 @@ $(document).ready(function() {
+[% IF additional_fields_for_subscription %]
+
+
+
+[% END %]
+
-
+
+
+ [% IF additional_fields_for_subscription %]
+
+
+
+
+
+ [% FOR field IN additional_fields_for_subscription %]
+