@@ -, +, @@
- 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 | 10 +++++
.../prog/en/modules/serials/subscription-add.tt | 34 ++++++++++++++++
.../prog/en/modules/serials/subscription-detail.tt | 25 +++++++++++-
serials/subscription-add.pl | 41 ++++++++++++++++++++
serials/subscription-detail.pl | 8 ++++
5 files changed, 117 insertions(+), 1 deletion(-)
--- a/C4/Serials.pm
+++ a/C4/Serials.pm
@@ -30,6 +30,7 @@ use C4::Log; # logaction
use C4::Debug;
use C4::Serials::Frequency;
use C4::Serials::Numberpattern;
+use Koha::AdditionalField;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -346,7 +347,16 @@ sub GetSubscription {
my $sth = $dbh->prepare($query);
$sth->execute($subscriptionid);
my $subscription = $sth->fetchrow_hashref;
+
$subscription->{cannotedit} = not can_edit_subscription( $subscription );
+
+ # 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,
+ });
+ $subscription->{additional_fields} = $additional_field_values->{$subscriptionid};
+
return $subscription;
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -835,6 +835,40 @@ $(document).ready(function() {
+
+ [% IF additional_fields_for_subscription %]
+