From 220011b73735baa41d1eb0b5b4535a38ce270514 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Tue, 11 Jan 2005 15:24:13 +0000
Subject: [PATCH] modifs to handdle correctly more than 1 subscription of the
 same biblio. Enter subscription detail in subscription notes (like "for
 branch XX" or "for 2nd floor"). The subscription details are all shown in
 OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)
---
 koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl   |  6 +--
 .../opac-tmpl/css/en/opac-serial-issues.tmpl  | 15 ++++---
 opac/opac-detail.pl                           |  4 +-
 opac/opac-serial-issues.pl                    | 45 +++++++++----------
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index c672f045b0..e3368275a6 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -129,10 +129,10 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<!-- TMPL_IF name="subscriptionid" -->
+	<!-- TMPL_IF name="subscriptionsnumber" -->
 		<p>
-			This is a serial subscription. You can see which 
-				<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
+				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
 					Issues
 				</a> we have and don't have
 		</p>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
index 1c08c319ac..a1bc804cb7 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl
@@ -4,7 +4,8 @@
 <h1 class="catalogue">Issues for a subscription</h1>
 <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
 <form method="post" name="f">
-<div id="bloc25">
+<!-- TMPL_LOOP name="subscription_LOOP" -->
+<div id="bloc60">
 	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
 		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
 		<b>
@@ -74,12 +75,14 @@
 		since <b><!-- TMPl_VAR name="startdate" --></b>
 		</p>
 		<p><!-- TMPL_VAR name="notes" --></p>
-	<h2 class="catalogue">Issues summary</h2>
-	<p>
-		<!-- TMPL_VAR name="opacnote" -->
-	</p>
+	<!-- TMPL_IF name="opacnotes" -->
+		<h2 class="catalogue">Issues summary</h2>
+		<p>
+			<!-- TMPL_VAR name="opacnote" -->
+		</p>
+	<!-- /TMPL_IF -->
 </div>
-
+<!-- /TMPL_LOOP -->
 </div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 0456a2f5c0..5502bc877e 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -29,7 +29,7 @@ my $dat                                   = &bibdata($biblionumber);
 my ($authorcount, $addauthor)             = &addauthor($biblionumber);
 my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
 my ($websitecount, @websites)             = &getwebsites($biblionumber);
-my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
+my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
 
 $dat->{'count'}=@items;
 
@@ -70,7 +70,7 @@ $template->param(BIBLIO_RESULTS => $resultsarray,
 				ITEM_RESULTS => $itemsarray,
 				WEB_RESULTS => $webarray,
 				SITE_RESULTS => $sitearray,
-				subscriptionid => $subscriptionid,
+				subscriptionsnumber => $subscriptionsnumber,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index fbb0dfb7db..6e36889ac1 100755
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -17,10 +17,8 @@ my $dbh = C4::Context->dbh;
 my $sth;
 # my $id;
 my ($template, $loggedinuser, $cookie);
-my ($subscriptionid);
-
-$subscriptionid = $query->param('subscriptionid');
-my $subscription = &getsubscription($subscriptionid);
+my $biblionumber = $query->param('biblionumber');
+my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
 
 ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "opac-serial-issues.tmpl",
@@ -31,27 +29,28 @@ my $subscription = &getsubscription($subscriptionid);
 				});
 
 # replace CR by <br> in librarian note
-$subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
 
 $template->param(
-	startdate => format_date($subscription->{startdate}),
-	periodicity => $subscription->{periodicity},
-	dow => $subscription->{dow},
-	numberlength => $subscription->{numberlength},
-	weeklength => $subscription->{weeklength},
-	monthlength => $subscription->{monthlength},
-	opacnote => $subscription->{opacnote},
-	numberingmethod => $subscription->{numberingmethod},
-	arrivalplanified => $subscription->{arrivalplanified},
-	status => $subscription->{status},
-	biblionumber => $subscription->{biblionumber},
-	bibliotitle => $subscription->{bibliotitle},
-	notes => $subscription->{notes},
-	subscriptionid => $subscription->{subscriptionid}
+	subscription_LOOP => $subscriptions
+# 	startdate => format_date($subscription->{startdate}),
+# 	periodicity => $subscription->{periodicity},
+# 	dow => $subscription->{dow},
+# 	numberlength => $subscription->{numberlength},
+# 	weeklength => $subscription->{weeklength},
+# 	monthlength => $subscription->{monthlength},
+# 	opacnote => $subscription->{opacnote},
+# 	numberingmethod => $subscription->{numberingmethod},
+# 	arrivalplanified => $subscription->{arrivalplanified},
+# 	status => $subscription->{status},
+# 	biblionumber => $subscription->{biblionumber},
+# 	bibliotitle => $subscription->{bibliotitle},
+# 	notes => $subscription->{notes},
+# 	subscriptionid => $subscription->{subscriptionid}
 	);
-$template->param(
-			"periodicity$subscription->{periodicity}" => 1,
-			"arrival$subscription->{dow}" => 1,
-			);
+# $template->param(
+# 			"periodicity$subscription->{periodicity}" => 1,
+# 			"arrival$subscription->{dow}" => 1,
+# 			);
 
 output_html_with_http_headers $query, $cookie, $template->output;
-- 
2.39.5