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;
use C4::Context;
-use C4::Branch; # GetBranches
use C4::Serials;
use C4::Serials::Frequency;
use C4::Serials::Numberpattern;
use C4::Letters;
use Koha::AdditionalField;
+use Koha::Biblios;
+use Koha::DateUtils;
+use Koha::ItemTypes;
use Carp;
#use Smart::Comments;
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)
= get_template_and_user({template_name => "serials/subscription-add.tt",
}
-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",$subs->{'location'});
+my $locations_loop = GetAuthorisedValues("LOC");
-$template->param(branchloop => $branchloop,
+$template->param(
+ branchcode => $subs->{branchcode},
locations_loop=>$locations_loop,
);
}
$template->param( additional_fields_for_subscription => $additional_fields );
+my $typeloop = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
+
+# 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/) {
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);
}
}
sub get_letter_loop {
my ($selected_lettercode) = @_;
+ $selected_lettercode //= '';
my $letters = GetLetters({ module => 'serial' });
return [
map {
my $cost = $query->param('cost');
my $aqbudgetid = $query->param('aqbudgetid');
my $periodicity = $query->param('frequency');
- my @irregularity = $query->param('irregularity');
+ my @irregularity = $query->multi_param('irregularity');
my $numberpattern = $query->param('numbering_pattern');
my $locale = $query->param('locale');
my $graceperiod = $query->param('graceperiod') || 0;
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 $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 $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
- my @additional_field_values;
- for my $field ( @$additional_fields ) {
- my $af = Koha::AdditionalField->new({ id => $field->{id} });
- $af->{values} = {
- $subscriptionid => $query->param('additional_field_' . $field->{id})
- } if defined $query->param('additional_field_' . $field->{id});
- $af->insert_values;
- }
+ insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
return;
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');
my $subtype = $query->param('subtype');
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');
# Guess end date
$status, $biblionumber, $callnumber, $notes, $letter,
$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
$opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
- $skip_serialseq
+ $skip_serialseq, $itemtype, $previousitemtype
);
my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
- my @additional_field_values;
+ insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
+
+ print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+ return;
+}
+
+sub insert_additional_fields {
+ my ( $additional_fields, $biblionumber, $subscriptionid ) = @_;
+ my $record = GetMarcBiblio({
+ biblionumber => $biblionumber,
+ embed_items => 1 });
for my $field ( @$additional_fields ) {
my $af = Koha::AdditionalField->new({ id => $field->{id} })->fetch;
if ( $af->{marcfield} ) {
- my $record = GetMarcBiblio( $biblionumber, 1 );
my ( $field, $subfield ) = split /\$/, $af->{marcfield};
- next unless $field and $subfield;
- my $value = $record->subfield( $field, $subfield );
- $af->{values} = {
- $subscriptionid => $value
- };
+ $af->{values} = undef;
+ if ( $field and $subfield ) {
+ my $value = $record->subfield( $field, $subfield );
+ $af->{values} = {
+ $subscriptionid => $value
+ };
+ }
} else {
$af->{values} = {
- $subscriptionid => $query->param('additional_field_' . $field->{id})
- };
+ $subscriptionid => scalar $query->param('additional_field_' . $field->{id})
+ } if defined $query->param('additional_field_' . $field->{id});
}
$af->insert_values;
}
-
- print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
- return;
}
projects / srvgit / blobdiff