X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fsubscription-add.pl;h=b61012ee02f904a4da9c0088b975c80266cb5664;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=e31b8f27da588c0237ca32f2cff24fe1aade9818;hpb=507944e41bec4987c9ef8c75c436332bdb727df2;p=srvgit

diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index e31b8f27da..b61012ee02 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -2,37 +2,41 @@
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-use warnings;
-
-use CGI;
-use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days Add_Delta_YM);
-use C4::Koha;
-use C4::Biblio;
-use C4::Auth;
-use C4::Dates qw/format_date format_date_in_iso/;
-use C4::Acquisition;
-use C4::Output;
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
+use Date::Calc qw( Add_Delta_Days Add_Delta_YM );
+use C4::Koha qw( GetAuthorisedValues );
+use C4::Biblio qw( GetMarcBiblio );
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
 use C4::Context;
-use C4::Branch; # GetBranches
-use C4::Serials;
+use C4::Serials qw( GetSubscription GetNextExpected GetSerials GetSubscriptionLength NewSubscription ModNextExpected ModSubscription );
 use C4::Serials::Frequency;
 use C4::Serials::Numberpattern;
-use C4::Letters;
-use Carp;
+use C4::Letters qw( GetLetters );
+use Koha::AdditionalFields;
+use Koha::Biblios;
+use Koha::DateUtils qw( output_pref );
+use Koha::ItemTypes;
+use Carp qw( carp );
+
+use Koha::Subscription::Numberpattern;
+use Koha::Subscription::Frequency;
+use Koha::SharedContent;
 
 #use Smart::Comments;
 
@@ -41,54 +45,46 @@ my $op = $query->param('op') || '';
 my $dbh = C4::Context->dbh;
 my $sub_length;
 
-my @budgets;
 
 # Permission needed if it is a modification : edit_subscription
 # Permission needed otherwise (nothing or dup) : create_subscription
-my $permission = ($op eq "modify") ? "edit_subscription" : "create_subscription";
+my $permission =
+  ( $op eq 'modify' || $op eq 'modsubscription' ) ? "edit_subscription" : "create_subscription";
 
-my ($template, $loggedinuser, $cookie)
+our ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tt",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {serials => $permission},
-				debug => 1,
 				});
 
 
 
 my $sub_on;
-my @subscription_types = (qw(issues weeks months));
-my @sub_type_data;
 
 my $subs;
 our $firstissuedate;
 
+my $mana_url = C4::Context->config('mana_config');
+$template->param( 'mana_url' => $mana_url );
+my $subscriptionid = $query->param('subscriptionid');
+
 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') {
 
-    my $subscriptionid = $query->param('subscriptionid');
     $subs = GetSubscription($subscriptionid);
 
+    output_and_exit( $query, $cookie, $template, 'unknown_subscription')
+        unless $subs;
+
     ## FIXME : Check rights to edit if mod. Could/Should display an error message.
     if ($subs->{'cannotedit'} && $op eq 'modify'){
       carp "Attempt to modify subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
       print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
     }
     $firstissuedate = $subs->{firstacquidate} || '';  # in iso format.
-    for (qw(startdate firstacquidate histstartdate enddate histenddate)) {
-        next unless defined $subs->{$_};
-	# TODO : Handle date formats properly.
-         if ($subs->{$_} eq '0000-00-00') {
-            $subs->{$_} = ''
-    	} else {
-            $subs->{$_} = $subs->{$_};
-        }
-	  }
-      if (!defined $subs->{letter}) {
-          $subs->{letter}= q{};
-      }
-    letter_loop($subs->{'letter'}, $template);
+    if (!defined $subs->{letter}) {
+        $subs->{letter}= q{};
+    }
     my $nextexpected = GetNextExpected($subscriptionid);
     $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate} eq $firstissuedate ;
     $subs->{nextacquidate} = $nextexpected->{planneddate}  if($op eq 'modify');
@@ -123,36 +119,53 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') {
         my @fields_id = map { fieldid => $_ }, split '\|', $dont_copy_fields;
         $template->param( dont_export_field_loop => \@fields_id );
     }
+
+    my $letters = get_letter_loop( $subs->{letter} );
+    $template->param( letterloop => $letters );
+
 }
 
-my $onlymine =
-     C4::Context->preference('IndependentBranches')
-  && C4::Context->userenv
-  && !C4::Context->IsSuperLibrarian
-  && (
-    not C4::Auth::haspermission( C4::Context->userenv->{id}, { serials => 'superserials' } )
-  )
-  && C4::Context->userenv->{branch};
-my $branches = GetBranches($onlymine);
-my $branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %{$branches}) {
-    my $selected = 0;
-    $selected = 1 if (defined($subs) && $thisbranch eq $subs->{'branchcode'});
-    push @{$branchloop}, {
-        value => $thisbranch,
-        selected => $selected,
-        branchname => $branches->{$thisbranch}->{'branchname'},
-    };
+my $locations_loop = GetAuthorisedValues("LOC");
+
+$template->param(
+    branchcode => $subs->{branchcode},
+    locations_loop=>$locations_loop,
+);
+
+my @additional_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+my %additional_field_values;
+if ($subscriptionid) {
+    my $subscription = Koha::Subscriptions->find($subscriptionid);
+    foreach my $value ($subscription->additional_field_values->as_list) {
+        $additional_field_values{$value->field_id} = $value->value;
+    }
 }
 
-my $locations_loop = GetAuthorisedValues("LOC",$subs->{'location'});
+$template->param(
+    additional_fields => \@additional_fields,
+    additional_field_values => \%additional_field_values,
+);
+
+my $typeloop = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
 
-$template->param(branchloop => $branchloop,
+# FIXME We should use the translated_description for item types
+my @typearg =
+    map { { code => $_, value => $typeloop->{$_}{'description'}, selected => ( ( $subs->{itemtype} and $_ eq $subs->{itemtype} ) ? "selected=\"selected\"" : "" ), } } sort keys %{$typeloop};
+my @previoustypearg =
+    map { { code => $_, value => $typeloop->{$_}{'description'}, selected => ( ( $subs->{previousitemtype} and $_ eq $subs->{previousitemtype} ) ? "selected=\"selected\"" : "" ), } } sort keys %{$typeloop};
+
+$template->param(
+    typeloop                 => \@typearg,
+    previoustypeloop         => \@previoustypearg,
     locations_loop=>$locations_loop,
 );
+
 # prepare template variables common to all $op conditions:
+$template->param('makePreviousSerialAvailable' => 1) if (C4::Context->preference('makePreviousSerialAvailable'));
+
 if ($op!~/^mod/) {
-    letter_loop(q{}, $template);
+    my $letters = get_letter_loop();
+    $template->param( letterloop => $letters );
 }
 
 if ($op eq 'addsubscription') {
@@ -160,26 +173,23 @@ if ($op eq 'addsubscription') {
 } elsif ($op eq 'modsubscription') {
     redirect_mod_subscription();
 } else {
-        while (@subscription_types) {
-           my $sub_type = shift @subscription_types;
-           my %row = ( 'name' => $sub_type );
-           if ( defined $sub_on and $sub_on eq $sub_type ) {
-	     $row{'selected'} = ' selected';
-           } else {
-	     $row{'selected'} = '';
-           }
-           push( @sub_type_data, \%row );
-        }
-    $template->param(subtype => \@sub_type_data);
 
-    letter_loop( '', $template ) if ($op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify');
+    $template->param(
+        subtypes => [ qw( numberlength weeklength monthlength ) ],
+        subtype => $sub_on,
+    );
+
+    if ( $op ne 'modsubscription' && $op ne 'dup' && $op ne 'modify' ) {
+        my $letters = get_letter_loop();
+        $template->param( letterloop => $letters );
+    }
 
     my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
     if (defined $new_biblionumber) {
-        my $bib = GetBiblioData($new_biblionumber);
-        if (defined $bib) {
+        my $biblio = Koha::Biblios->find( $new_biblionumber );
+        if (defined $biblio) {
             $template->param(bibnum      => $new_biblionumber);
-            $template->param(bibliotitle => $bib->{title});
+            $template->param(bibliotitle => $biblio->title);
         }
     }
 
@@ -222,32 +232,25 @@ if ($op eq 'addsubscription') {
 
     $template->param( locales => $languages );
 
-    output_html_with_http_headers $query, $cookie, $template->output;
-}
+    my @bookseller_ids = Koha::Acquisition::Booksellers->search->get_column('id');
+    $template->param( bookseller_ids => \@bookseller_ids );
 
-sub letter_loop {
-    my ($selected_letter, $templte) = @_;
-    my $letters = GetLetters('serial');
-    my $letterloop;
-    foreach my $thisletter (keys %{$letters}) {
-        push @{$letterloop}, {
-            value => $thisletter,
-            selected => $thisletter eq $selected_letter,
-            lettername => $letters->{$thisletter},
-        };
-    }
-    $templte->param(letterloop => $letterloop);
-    return;
+    output_html_with_http_headers $query, $cookie, $template->output;
 }
 
-sub _get_sub_length {
-    my ($type, $length) = @_;
-    return
-        (
-            $type eq 'issues' ? $length : 0,
-            $type eq 'weeks'   ? $length : 0,
-            $type eq 'months'  ? $length : 0,
-        );
+sub get_letter_loop {
+    my ($selected_lettercode) = @_;
+    $selected_lettercode //= '';
+    my $letters = GetLetters({ module => 'serial' });
+    return [
+        map {
+            {
+                value      => $_->{code},
+                lettername => $_->{name},
+                ( $_->{code} eq $selected_lettercode ? ( selected => 1 ) : () ),
+            }
+          } @$letters
+    ];
 }
 
 sub _guess_enddate {
@@ -279,21 +282,33 @@ sub _guess_enddate {
 }
 
 sub redirect_add_subscription {
+    my $periodicity = $query->param('frequency');
+    if ($periodicity eq 'mana') {
+        my $subscription_freq = Koha::Subscription::Frequency->new()->set(
+            {
+                description   => $query->param('sfdescription'),
+                unit          => $query->param('unit'),
+                unitsperissue => $query->param('unitsperissue'),
+                issuesperunit => $query->param('issuesperunit'),
+            }
+        )->store();
+        $periodicity = $subscription_freq->id;
+    }
+    my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing({ $query->Vars });
+
     my $auser          = $query->param('user');
     my $branchcode     = $query->param('branchcode');
     my $aqbooksellerid = $query->param('aqbooksellerid');
     my $cost           = $query->param('cost');
     my $aqbudgetid     = $query->param('aqbudgetid');
-    my $periodicity    = $query->param('frequency');
-    my @irregularity   = $query->param('irregularity');
-    my $numberpattern  = $query->param('numbering_pattern');
+    my @irregularity   = $query->multi_param('irregularity');
     my $locale         = $query->param('locale');
     my $graceperiod    = $query->param('graceperiod') || 0;
 
     my $subtype = $query->param('subtype');
     my $sublength = $query->param('sublength');
     my ( $numberlength, $weeklength, $monthlength )
-        = _get_sub_length( $subtype, $sublength );
+        = GetSubscriptionLength( $subtype, $sublength );
     my $add1              = $query->param('add1');
     my $lastvalue1        = $query->param('lastvalue1');
     my $innerloop1        = $query->param('innerloop1');
@@ -312,18 +327,27 @@ sub redirect_add_subscription {
     my $staffdisplaycount = $query->param('staffdisplaycount');
     my $opacdisplaycount  = $query->param('opacdisplaycount');
     my $location          = $query->param('location');
+    my $itemtype          = $query->param('itemtype');
+    my $previousitemtype  = $query->param('previousitemtype');
     my $skip_serialseq    = $query->param('skip_serialseq');
-    my $startdate = format_date_in_iso( $query->param('startdate') );
-    my $enddate = format_date_in_iso( $query->param('enddate') );
-    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));
+
+    my $mana_id;
+    if ( $query->param('mana_id') ne "" ) {
+        $mana_id = $query->param('mana_id');
+        Koha::SharedContent::increment_entity_value("subscription",$mana_id, "nbofusers");
+    }
+
+    my $startdate      = output_pref( { str => scalar $query->param('startdate'),      dateonly => 1, dateformat => 'iso' } );
+    my $enddate        = output_pref( { str => scalar $query->param('enddate'),        dateonly => 1, dateformat => 'iso' } );
+    my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );
+
     if(!defined $enddate || $enddate eq '') {
         if($subtype eq "issues") {
-            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength);
+            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength)
         } else {
-            $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength);
+            $enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)
         }
     }
-
     my $subscriptionid = NewSubscription(
         $auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
         $startdate, $periodicity, $numberlength, $weeklength,
@@ -332,8 +356,30 @@ sub redirect_add_subscription {
         join(";",@irregularity), $numberpattern, $locale, $callnumber,
         $manualhistory, $internalnotes, $serialsadditems,
         $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
-        $skip_serialseq
+        $skip_serialseq, $itemtype, $previousitemtype, $mana_id
     );
+    if ( (C4::Context->preference('Mana') == 1) and ( grep { $_ eq "subscription" } split(/,/, C4::Context->preference('AutoShareWithMana'))) ){
+        my $result = Koha::SharedContent::send_entity( $query->param('mana_language') || '', $loggedinuser, $subscriptionid, 'subscription');
+        $template->param( mana_msg => $result->{msg} );
+    }
+
+    my @additional_fields;
+    my $record = GetMarcBiblio({ biblionumber => $biblionumber, embed_items => 1 });
+    my $subscription_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+    while ( my $field = $subscription_fields->next ) {
+        my $value = $query->param('additional_field_' . $field->id);
+        if ($field->marcfield) {
+            my ($field, $subfield) = split /\$/, $field->marcfield;
+            if ( $record and $field and $subfield ) {
+                $value = $record->subfield( $field, $subfield );
+            }
+        }
+        push @additional_fields, {
+            id => $field->id,
+            value => $value,
+        };
+    }
+    Koha::Subscriptions->find($subscriptionid)->set_additional_fields(\@additional_fields);
 
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
     return;
@@ -341,27 +387,41 @@ sub redirect_add_subscription {
 
 sub redirect_mod_subscription {
     my $subscriptionid = $query->param('subscriptionid');
-    my @irregularity = $query->param('irregularity');
+    my @irregularity = $query->multi_param('irregularity');
     my $auser = $query->param('user');
-    my $librarian => $query->param('librarian'),
+    my $librarian => scalar $query->param('librarian'),
     my $branchcode = $query->param('branchcode');
     my $cost = $query->param('cost');
     my $aqbooksellerid = $query->param('aqbooksellerid');
     my $biblionumber = $query->param('biblionumber');
     my $aqbudgetid = $query->param('aqbudgetid');
-    my $startdate = format_date_in_iso($query->param('startdate'));
-    my $firstacquidate = format_date_in_iso( $query->param('firstacquidate') );
-    my $nextacquidate = $query->param('nextacquidate') ?
-                            format_date_in_iso($query->param('nextacquidate')):
-                            $firstacquidate;
-    my $enddate = format_date_in_iso($query->param('enddate'));
+
+    my $startdate      = output_pref( { str => scalar $query->param('startdate'),      dateonly => 1, dateformat => 'iso' } );
+    my $enddate        = output_pref( { str => scalar $query->param('enddate'),        dateonly => 1, dateformat => 'iso' } );
+    my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );
+
+    my $nextacquidate  = $query->param('nextacquidate');
+    $nextacquidate = $nextacquidate
+        ? output_pref( { str => $nextacquidate, dateonly => 1, dateformat => 'iso' } )
+        : $firstacquidate;
+
     my $periodicity = $query->param('frequency');
+    if ($periodicity eq 'mana') {
+        my $subscription_freq = Koha::Subscription::Frequency->new()->set(
+            {
+                description   => $query->param('sfdescription'),
+                unit          => $query->param('unit'),
+                unitsperissue => $query->param('unitsperissue'),
+                issuesperunit => $query->param('issuesperunit'),
+            }
+        )->store();
+        $periodicity = $subscription_freq->id;
+    }
+    my $numberpattern = Koha::Subscription::Numberpatterns->new_or_existing({ $query->Vars });
 
     my $subtype = $query->param('subtype');
     my $sublength = $query->param('sublength');
-    my ($numberlength, $weeklength, $monthlength)
-        = _get_sub_length( $subtype, $sublength );
-    my $numberpattern = $query->param('numbering_pattern');
+    my ($numberlength, $weeklength, $monthlength) = GetSubscriptionLength( $subtype, $sublength );
     my $locale = $query->param('locale');
     my $lastvalue1 = $query->param('lastvalue1');
     my $innerloop1 = $query->param('innerloop1');
@@ -380,8 +440,19 @@ sub redirect_mod_subscription {
 	my $opacdisplaycount = $query->param('opacdisplaycount');
     my $graceperiod     = $query->param('graceperiod') || 0;
     my $location = $query->param('location');
+    my $itemtype          = $query->param('itemtype');
+    my $previousitemtype  = $query->param('previousitemtype');
     my $skip_serialseq    = $query->param('skip_serialseq');
 
+    my $mana_id;
+    if ( $query->param('mana_id') ne "" ) {
+        $mana_id = $query->param('mana_id');
+        Koha::SharedContent::increment_entity_value("subscription",$mana_id, "nbofusers");
+    }
+    else {
+        $mana_id = undef;
+    }
+
     # Guess end date
     if(!defined $enddate || $enddate eq '') {
         if($subtype eq "issues") {
@@ -407,9 +478,27 @@ sub redirect_mod_subscription {
         $status, $biblionumber, $callnumber, $notes, $letter,
         $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
         $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
-        $skip_serialseq
+        $skip_serialseq, $itemtype, $previousitemtype, $mana_id
     );
 
+    my @additional_fields;
+    my $record = GetMarcBiblio({ biblionumber => $biblionumber, embed_items => 1 });
+    my $subscription_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+    while ( my $field = $subscription_fields->next ) {
+        my $value = $query->param('additional_field_' . $field->id);
+        if ($field->marcfield) {
+            my ($field, $subfield) = split /\$/, $field->marcfield;
+            if ( $record and $field and $subfield ) {
+                $value = $record->subfield( $field, $subfield );
+            }
+        }
+        push @additional_fields, {
+            id => $field->id,
+            value => $value,
+        };
+    }
+    Koha::Subscriptions->find($subscriptionid)->set_additional_fields(\@additional_fields);
+
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
     return;
 }