Ukranian and Russian sql updates courtesy of Сергій Дубик

[koha.git] / serials / subscription-detail.pl

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 83e720f..f04f3b1 100755 (executable)
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -16,6 +16,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Koha;
@@ -24,24 +25,23 @@ use C4::Serials;
 use C4::Output;
 use C4::Context;
 use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
-#use Date::Manip;
+use Carp;
 
 my $query = new CGI;
 my $op = $query->param('op');
 my $dbh = C4::Context->dbh;
-my $sth;
-# my $id;
 my ($template, $loggedinuser, $cookie, $hemisphere);
 my $subscriptionid = $query->param('subscriptionid');
-my $subs = &GetSubscription($subscriptionid);
+my $subs = GetSubscription($subscriptionid);
+
 $subs->{enddate} = GetExpirationDate($subscriptionid);
 
-if ($op eq 'del') {
+if ($op && $op eq 'del') {
        if ($subs->{'cannotedit'}){
-               warn "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+               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);
+       }
+       DelSubscription($subscriptionid);
        print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
        exit;
 }
@@ -50,12 +50,16 @@ 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)
 = get_template_and_user({template_name => "serials/subscription-detail.tmpl",
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {serials => 1},
+                flagsrequired => {serials => $permission},
                 debug => 1,
                 });
 
@@ -63,30 +67,13 @@ my ($user, $sessionID, $flags);
 ($user, $cookie, $sessionID, $flags)
     = checkauth($query, 0, {catalogue => 1}, "intranet");
 
-my $weekarrayjs='';
-my $count = 0;
-my ($year, $month, $day) = Today;
-my $firstday = Day_of_Year($year,$month,$day);
-my ($wkno,$yr) = Week_of_Year($year,$month,$day); # week starting monday
-my $weekno = $wkno;
-for(my $i=$firstday;$i<($firstday+365);$i=$i+7){
-            $count = $i;
-            if($wkno > 52){$year++; $wkno=1;}
-            if($count>365){$count=$i-365;}
-            my ($y,$m,$d) =  Add_Delta_Days($year,1,1, $count - 1);#Date_NthDayOfYear($year,$count);
-            # padding Add_Delta_Days;
-            my $output  = sprintf("%04d-%02d-%02d",$y , $m, $d );
-            $weekarrayjs .= "'Wk $wkno: ".format_date($output)."',";
-            $wkno++;
-    }
-chop($weekarrayjs);
-
 # COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
 
 $subs->{startdate}      = format_date($subs->{startdate});
 $subs->{firstacquidate} = format_date($subs->{firstacquidate});
 $subs->{histstartdate}  = format_date($subs->{histstartdate});
 $subs->{enddate}        = format_date($subs->{enddate});
+$subs->{histenddate}    = format_date($subs->{histenddate});
 $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
 # Done in Serials.pm
 # $subs->{'donotedit'}=(C4::Context->preference('IndependantBranches') && 
@@ -96,20 +83,35 @@ $subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
 #         (C4::Context->userenv->{branch} ne $subs->{branchcode}));
 
 $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';
+}
 $template->param(
        subscriptionid => $subscriptionid,
     routing => $routing,
     serialslist => \@serialslist,
     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,
+    intranetstylesheet => C4::Context->preference('intranetstylesheet'),
+    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
+    irregular_issues => scalar @irregular_issues,
     );
-$template->param(
-            "periodicity".($subs->{periodicity}?$subs->{periodicity}:'0') => 1,
-            "arrival".$subs->{dow} => 1,
-            "numberpattern".$subs->{numberpattern} => 1,
-            intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-            intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), 
-            );
 
 output_html_with_http_headers $query, $cookie, $template->output;