X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-detail.pl;h=0430aaf18e1375256fb39109eeeb8ba3eab8f7e2;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=8bfee43e81e392ded2efe2a62be08c4023b8b647;hpb=b9db6ae0f75b68b0788fd079589f30620fc0ff63;p=koha_fer

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 8bfee43e81..0430aaf18e 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -34,7 +34,6 @@ my $query = new CGI;
 my $op = $query->param('op') || q{};
 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" ) {
@@ -43,29 +42,13 @@ if ( $op and $op eq "close" ) {
     C4::Serials::ReopenSubscription( $subscriptionid );
 }
 
-my $subs = GetSubscription($subscriptionid);
-
-$subs->{enddate} = GetExpirationDate($subscriptionid);
-
-if ($op && $op eq 'del') {
-	if ($subs->{'cannotedit'}){
-		carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
-		print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-	}
-	DelSubscription($subscriptionid);
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
-	exit;
-}
-
-my ($totalissues,@serialslist) = GetSerials($subscriptionid);
-$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
 # Permission needed if it is a deletion (del) : delete_subscription
 # Permission needed otherwise : *
 my $permission = ($op eq "del") ? "delete_subscription" : "*";
 
-($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-detail.tmpl",
                 query => $query,
                 type => "intranet",
@@ -74,7 +57,12 @@ my $permission = ($op eq "del") ? "delete_subscription" : "*";
                 debug => 1,
                 });
 
-$$subs{enddate} ||= GetExpirationDate($subscriptionid);
+
+my $subs = GetSubscription($subscriptionid);
+$subs->{enddate} ||= GetExpirationDate($subscriptionid);
+
+my ($totalissues,@serialslist) = GetSerials($subscriptionid);
+$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
 
 if ($op eq 'del') {
 	if ($$subs{'cannotedit'}){
@@ -118,15 +106,9 @@ $template->param(%{ $subs });
 $template->param(biblionumber_for_new_subscription => $subs->{bibnum});
 my @irregular_issues = split /,/, $subs->{irregularity};
 
-if (! $subs->{numberpattern}) {
-    $subs->{numberpattern} = q{};
-}
-if (! $subs->{dow}) {
-    $subs->{dow} = q{};
-}
-if (! $subs->{periodicity}) {
-    $subs->{periodicity} = '0';
-}
+my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity});
+my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern});
+
 my $default_bib_view = get_default_view();
 
 my ( $order, $bookseller, $tmpl_infos );
@@ -161,15 +143,12 @@ $template->param(
     hasRouting  => $hasRouting,
     routing => C4::Context->preference("RoutingSerials"),
     totalissues => $totalissues,
-    hemisphere => $hemisphere,
-    cannotedit =>(C4::Context->preference('IndependantBranches') &&
-                C4::Context->userenv &&
-                C4::Context->userenv->{flags} % 2 !=1  &&
-                C4::Context->userenv->{branch} && $subs->{branchcode} &&
-                (C4::Context->userenv->{branch} ne $subs->{branchcode})),
-    'periodicity' . $subs->{periodicity} => 1,
-    'arrival' . $subs->{dow} => 1,
-    'numberpattern' . $subs->{numberpattern} => 1,
+    cannotedit => (not C4::Serials::can_edit_subscription( $subs )),
+    frequency => $frequency,
+    numberpattern => $numberpattern,
+    has_X           => ($numberpattern->{'numberingmethod'} =~ /{X}/) ? 1 : 0,
+    has_Y           => ($numberpattern->{'numberingmethod'} =~ /{Y}/) ? 1 : 0,
+    has_Z           => ($numberpattern->{'numberingmethod'} =~ /{Z}/) ? 1 : 0,
     intranetstylesheet => C4::Context->preference('intranetstylesheet'),
     intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
     irregular_issues => scalar @irregular_issues,