Attachment #153186 for bug #34199

View | Details | Raw Unified | Return to bug 34199
Collapse All | Expand All

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +6 lines)
7	[% USE Price %]	7	[% USE Price %]
8	[% USE TablesSettings %]	8	[% USE TablesSettings %]
9	[% SET footerjs = 1 %]	9	[% SET footerjs = 1 %]
		10	[%- PROCESS 'html_helpers.inc' -%]
10	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
11	<title>Details for subscription #[% subscriptionid \| html %] &rsaquo; Serials &rsaquo; Koha</title>	12	<title>Details for subscription #[% subscriptionid \| html %] &rsaquo; Serials &rsaquo; Koha</title>
12	[% INCLUDE 'doc-head-close.inc' %]	13	[% INCLUDE 'doc-head-close.inc' %]
Lines 42-48 Link Here
42	[% INCLUDE 'serials-toolbar.inc' %]	43	[% INCLUDE 'serials-toolbar.inc' %]
43	[% INCLUDE 'mana/mana-comment-status.inc' %]	44	[% INCLUDE 'mana/mana-comment-status.inc' %]
44		45
45	<h1>Subscription for [% bibliotitle \| html %] [% bibliosubtitle \| html %] [% IF closed %](closed)[% END %]</h1>	46	<h1>Subscription for [% INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 0 %] [% IF closed %](closed)[% END %]</h1>
46		47
47	[% IF ( abouttoexpire ) %]	48	[% IF ( abouttoexpire ) %]
48	[% UNLESS closed %]	49	[% UNLESS closed %]
Lines 102-108 Link Here
102	<li><span class="label">Subscription ID: </span>[% subscriptionid \| html %]</li>	103	<li><span class="label">Subscription ID: </span>[% subscriptionid \| html %]</li>
103	<li><span class="label">Librarian identity:</span> [% librarian \| html %]</li>	104	<li><span class="label">Librarian identity:</span> [% librarian \| html %]</li>
104	<li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid \| uri %]">[% aqbooksellername \| html %]</a></li>	105	<li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid \| uri %]">[% aqbooksellername \| html %]</a></li>
105	<li><span class="label">Biblio:</span> <a href="[% PROCESS biblio_a_href biblionumber => bibnum %]">[% bibliotitle \| html %] [% bibliosubtitle \| html %]</a> <em>([% bibnum \| html %])</em></li>	106	<li>
		107	<span class="label">Bibliographic record:</span>
		108	[%- INCLUDE 'biblio-title.inc' biblio=subscription.biblio link = 1 -%] <em>([% subscription.biblionumber \| html %])</em>
		109	</li>
106	[% IF ( OPACBaseURL ) %]	110	[% IF ( OPACBaseURL ) %]
107	<li>	111	<li>
108	<span class="label">OPAC view:</span>	112	<span class="label">OPAC view:</span>




my $issueconfirmed = $query->param('issueconfirmed');
my $dbh = C4::Context->dbh;
my $subscriptionid = $query->param('subscriptionid');
my $subscription = Koha::Subscriptions->find( $subscriptionid );

if ( $op and $op eq "close" ) {
    C4::Serials::CloseSubscription( $subscriptionid );

my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});

my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
$template->param(
    available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ),
    additional_field_values => {
        map { $_->field->name => $_->value }
          $subscription->additional_field_values->as_list
    },
);


}

$template->param(
    subscription => $subscription,
    subscriptionid => $subscriptionid,
    serialslist => \@serialslist,
    hasRouting  => $hasRouting,
- 

Return to bug 34199

Lines 38-43 my $op = $query->param('op') \|\| q{}; Link Here

(-)a/serials/subscription-detail.pl (-3 / +3 lines)
38	my $issueconfirmed = $query->param('issueconfirmed');	38	my $issueconfirmed = $query->param('issueconfirmed');
39	my $dbh = C4::Context->dbh;	39	my $dbh = C4::Context->dbh;
40	my $subscriptionid = $query->param('subscriptionid');	40	my $subscriptionid = $query->param('subscriptionid');
		41	my $subscription = Koha::Subscriptions->find( $subscriptionid );
41		42
42	if ( $op and $op eq "close" ) {	43	if ( $op and $op eq "close" ) {
43	C4::Serials::CloseSubscription( $subscriptionid );	44	C4::Serials::CloseSubscription( $subscriptionid );
Lines 124-135 my @irregular_issues = split /;/, $subs->{irregularity}; Link Here
124	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});	125	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
125	my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});	126	my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
126		127
127	my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
128	$template->param(	128	$template->param(
129	available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ),	129	available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ),
130	additional_field_values => {	130	additional_field_values => {
131	map { $_->field->name => $_->value }	131	map { $_->field->name => $_->value }
132	$subscription_object->additional_field_values->as_list	132	$subscription->additional_field_values->as_list
133	},	133	},
134	);	134	);
135		135
Lines 151-156 while ( my $o = $orders->next ) { Link Here
151	}	151	}
152		152
153	$template->param(	153	$template->param(
		154	subscription => $subscription,
154	subscriptionid => $subscriptionid,	155	subscriptionid => $subscriptionid,
155	serialslist => \@serialslist,	156	serialslist => \@serialslist,
156	hasRouting => $hasRouting,	157	hasRouting => $hasRouting,
157	-