Please Confirm Subscription deletion
@@ -374,27 +378,19 @@ $(document).ready(function() {
[% serialslis.publisheddate %]
- [% IF ( serialslis.status1 ) %]
- Expected
- [% END %]
- [% IF ( serialslis.status2 ) %]
- Arrived
- [% END %]
- [% IF ( serialslis.status3 ) %]
- Late
- [% END %]
- [% IF ( serialslis.status4 ) %]
- Missing
- [% END %]
- [% IF ( serialslis.status5 ) %]
- Not available
- [% END %]
- [% IF ( serialslis.status7 ) %]
- Claimed
- [% IF ( serialslis.claimdate ) %]
- [% serialslis.claimdate %]
- [% END %]
- [% END %]
+ [% IF ( serialslis.status1 ) %]Expected[% END %]
+ [% IF ( serialslis.status2 ) %]Arrived[% END %]
+ [% IF ( serialslis.status3 ) %]Late[% END %]
+ [% IF ( serialslis.status4 ) %]Missing[% END %]
+ [% IF ( serialslis.status5 ) %]Not issued[% END %]
+ [% IF ( serialslis.status6 ) %]Delete[% END %]
+ [% IF ( serialslis.status7 ) %]
+ Claimed
+ [% IF ( serialslis.claimdate ) %]
+ [% serialslis.claimdate %]
+ [% END %]
+ [% END %]
+ [% IF ( serialslis.status8 ) %]Stopped[% END %]
|
[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 17658b9f3b..1753cce512 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -988,6 +988,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
[% FOREACH subscription IN subscriptions %]
[% IF ( subscription.branchname ) %]
At library: [% subscription.branchname %]
[% ELSE %]
[% IF ( subscription.branchcode ) %]
At library: [% subscription.branchcode %]
[% END %][% END %]
+ [% IF ( subscription.closed ) %]
This subscription is closed.
[% END %]
+
[% IF ( subscription.callnumber ) %]Callnumber: [% subscription.callnumber %]
[% END %]
[% IF ( subscription.subscriptionnotes ) %]
[% subscription.subscriptionnotes FILTER html_line_break %]
[% END %]
Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]
[% IF ( subscription.missinglist ) %]
Missing issues: [% subscription.missinglist %]
[% END %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
index 6b47afa749..c37a6ef49a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt
@@ -200,12 +200,15 @@ function showlayer(numlayer){
[% serial.serialseq %]
|
-
[% IF ( serial.status1 ) %]Waiting[% END %]
- [% IF ( serial.status2 ) %]Arrived[% END %]
- [% IF ( serial.status3 ) %]Late[% END %]
- [% IF ( serial.status4 ) %]Missing[% END %]
- [% IF ( serial.status5 ) %]Not available[% END %]
- [% IF ( serial.status7 ) %]Claimed[% END %]
+ |
+ [% IF ( serial.status1 ) %]Expected[% END %]
+ [% IF ( serial.status2 ) %]Arrived[% END %]
+ [% IF ( serial.status3 ) %]Late[% END %]
+ [% IF ( serial.status4 ) %]Missing[% END %]
+ [% IF ( serial.status5 ) %]Not available[% END %]
+ [% IF ( serial.status6 ) %]Delete[% END %]
+ [% IF ( serial.status7 ) %]Claimed[% END %]
+ [% IF ( serial.status8 ) %]Stopped[% END %]
|
[% serial.subscriptionid %]
|
diff --git a/misc/cronjobs/serialsUpdate.pl b/misc/cronjobs/serialsUpdate.pl
index 1de5a48436..a5a376fb7c 100755
--- a/misc/cronjobs/serialsUpdate.pl
+++ b/misc/cronjobs/serialsUpdate.pl
@@ -60,6 +60,7 @@ my $sth = $dbh->prepare("
WHERE serial.status = 1
AND periodicity <> 32
AND DATE_ADD(planneddate, INTERVAL CAST(graceperiod AS SIGNED) DAY) < NOW()
+ AND subscription.closed = 0
");
$sth->execute();
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index d9ecdfad0e..5e432e1756 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -471,6 +471,8 @@ foreach my $subscription (@subscriptions) {
$cell{branchcode} = $subscription->{branchcode};
$cell{branchname} = GetBranchName($subscription->{branchcode});
$cell{hasalert} = $subscription->{hasalert};
+ $cell{callnumber} = $subscription->{callnumber};
+ $cell{closed} = $subscription->{closed};
#get the three latest serials.
$serials_to_display = $subscription->{opacdisplaycount};
$serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display;
diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl
index 9aff54b722..36f7cc5d5d 100755
--- a/reports/serials_stats.pl
+++ b/reports/serials_stats.pl
@@ -96,9 +96,19 @@ if($do_it){
while(my $row = $sth->fetchrow_hashref){
$row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
$row->{'startdate'} = format_date($row->{'startdate'});
- push @datas, $row if ($expired || (not $expired && not HasSubscriptionExpired($row->{subscriptionid})) );
+ $row->{expired} = HasSubscriptionExpired($row->{subscriptionid});
+ push @datas, $row if (
+ $expired
+ or (
+ not $expired
+ and (
+ not $row->{expired}
+ and not $row->{closed}
+ )
+ )
+ );
}
-
+
if($output eq 'screen'){
$template->param(datas => \@datas,
do_it => 1);
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index bf4b6e933b..e8318540b0 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -79,6 +79,7 @@ if ($date) {
$subscription->{expirationdate} = $expirationdate;
next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
+ next if $subscription->{closed};
if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
$subscription->{expirationdate}=format_date($subscription->{expirationdate});
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index 470e10d346..ad57e0755b 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -101,8 +101,10 @@ my $subscriptioncount;
my ($location, $callnumber);
if (@subscriptionid){
my @subscriptioninformation=();
+ my $closed = 0;
foreach my $subscriptionid (@subscriptionid){
my $subs= GetSubscription($subscriptionid);
+ $closed = 1 if $subs->{closed};
$subs->{opacnote} =~ s/\n/\
/g;
$subs->{missinglist} =~ s/\n/\/g;
$subs->{recievedlist} =~ s/\n/\/g;
@@ -127,6 +129,7 @@ if (@subscriptionid){
my $tmpsubscription= GetFullSubscription($subscriptionid);
@subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
}
+ $template->param(closed => $closed);
$subscriptions=PrepareSerialsData(\@subscriptioninformation);
$subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
} else {
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index bb87c5f922..66d3a4eedd 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -151,6 +151,7 @@ foreach my $serialid (@serialids) {
)
|| $serinfo->{'cannotedit'}
);
+ $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
push @serialdatalist, $serinfo;
$processedserialid{$serialid} = 1;
}
diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index ac5d0d37c2..aaf64e6d57 100755
--- a/serials/serials-search.pl
+++ b/serials/serials-search.pl
@@ -46,6 +46,8 @@ my $biblionumber = $query->param('biblionumber') || '';
my $branch = $query->param('branch_filter') || '';
my $routing = $query->param('routing') || C4::Context->preference("RoutingSerials");
my $searched = $query->param('searched') || 0;
+my @subscriptionids = $query ->param('subscriptionid');
+my $op = $query->param('op');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -58,6 +60,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
+if ( $op and $op eq "close" ) {
+ for my $subscriptionid ( @subscriptionids ) {
+ C4::Serials::CloseSubscription( $subscriptionid );
+ }
+} elsif ( $op and $op eq "reopen" ) {
+ for my $subscriptionid ( @subscriptionids ) {
+ C4::Serials::ReopenSubscription( $subscriptionid );
+ }
+}
+
my @subscriptions;
if ($searched){
@subscriptions = SearchSubscriptions(
@@ -81,6 +93,15 @@ if ($routing) {
}
}
+my (@openedsubscriptions, @closedsubscriptions);
+for my $sub ( @subscriptions ) {
+ unless ( $sub->{closed} ) {
+ push @openedsubscriptions, $sub;
+ } else {
+ push @closedsubscriptions, $sub;
+ }
+}
+
my $branches = GetBranches();
my @branches_loop;
foreach (sort keys %$branches){
@@ -94,7 +115,9 @@ foreach (sort keys %$branches){
}
$template->param(
- subscriptions => \@subscriptions,
+ openedsubscriptions => \@openedsubscriptions,
+ closedsubscriptions => \@closedsubscriptions,
+ total => @openedsubscriptions + @closedsubscriptions,
title_filter => $title,
ISSN_filter => $ISSN,
EAN_filter => $EAN,
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index f3a50ac1ef..009360b77c 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -34,6 +34,13 @@ my $issueconfirmed = $query->param('issueconfirmed');
my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie, $hemisphere);
my $subscriptionid = $query->param('subscriptionid');
+
+if ( $op and $op eq "close" ) {
+ C4::Serials::CloseSubscription( $subscriptionid );
+} elsif ( $op and $op eq "reopen" ) {
+ C4::Serials::ReopenSubscription( $subscriptionid );
+}
+
my $subs = GetSubscription($subscriptionid);
$subs->{enddate} = GetExpirationDate($subscriptionid);