}
$template->param(letterloop => \@letterloop);
-my $onlymine=C4::Context->preference('IndependantBranches') &&
- C4::Context->userenv &&
- C4::Context->userenv->{flags}!=1 &&
- 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 = 1 if $thisbranch eq C4::Context->userenv->{'branch'};
- my %row =(value => $thisbranch,
- selected => $selected,
- branchname => $branches->{$thisbranch}->{'branchname'},
- );
- push @branchloop, \%row;
-}
-$template->param(branchloop => \@branchloop,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-);
my $subscriptionid;
my $subs;
my $firstissuedate;
} else {
$subs->{$_} = format_date($subs->{$_});
}
- }
+ }
$subs->{'letter'}='' unless($subs->{'letter'});
$irregularity = $subs->{'irregularity'};
$numberpattern = $subs->{'numberpattern'};
$nextexpected = GetNextExpected($subscriptionid);
- $nextexpected->{ isfirstissue => ($nextexpected->{planneddate}->output('iso') eq $firstissuedate)};
- # firstacquidate is taken to be the upcoming issue's planned date if we're modifying the sub
+ $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ;
$subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'mod');
-
- unless($op eq 'modsubscription') {
- if($subs->{numberlength} > 0){
- $sublength = $subs->{numberlength};
- $sub_on = $subscription_types[0];
- } elsif ($subs->{weeklength}>0){
- $sublength = $subs->{weeklength};
- $sub_on = $subscription_types[1];
- } else {
- $sublength = $subs->{monthlength};
- $sub_on = $subscription_types[2];
- }
- while (@subscription_types) {
- my $sub_type = shift @subscription_types;
- my %row = ( 'name' => $sub_type );
- if ( $sub_on eq $sub_type ) {
- $row{'selected'} = ' selected';
+ unless($op eq 'modsubscription') {
+ if($subs->{numberlength} > 0){
+ $sublength = $subs->{numberlength};
+ $sub_on = $subscription_types[0];
+ } elsif ($subs->{weeklength}>0){
+ $sublength = $subs->{weeklength};
+ $sub_on = $subscription_types[1];
} else {
- $row{'selected'} = '';
+ $sublength = $subs->{monthlength};
+ $sub_on = $subscription_types[2];
}
- push( @sub_type_data, \%row );
+ while (@subscription_types) {
+ my $sub_type = shift @subscription_types;
+ my %row = ( 'name' => $sub_type );
+ if ( $sub_on eq $sub_type ) {
+ $row{'selected'} = ' selected';
+ } else {
+ $row{'selected'} = '';
+ }
+ push( @sub_type_data, \%row );
+ }
+
+ $template->param($subs);
+ $template->param(
+ $op => 1,
+ subtype => \@sub_type_data,
+ sublength =>$sublength,
+ history => ($op eq 'mod' && $subs->{manualhistory} == 1 ),
+ "periodicity".$subs->{'periodicity'} => 1,
+ "dow".$subs->{'dow'} => 1,
+ "numberpattern".$subs->{'numberpattern'} => 1,
+ firstacquiyear => substr($firstissuedate,0,4),
+ );
}
-
- $template->param($subs);
- $template->param(
- $op => 1,
- subtype => \@sub_type_data,
- sublength =>$sublength,
- history => ($op eq 'mod' && ($subs->{recievedlist}||$subs->{missinglist}||$subs->{opacnote}||$subs->{librariannote})),
- "periodicity".$subs->{'periodicity'} => 1,
- "dow".$subs->{'dow'} => 1,
- "numberpattern".$subs->{'numberpattern'} => 1,
- firstacquiyear => substr($firstissuedate,0,4),
- );
- }
}
+my $onlymine=C4::Context->preference('IndependantBranches') &&
+ C4::Context->userenv &&
+ C4::Context->userenv->{flags}!=1 &&
+ 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 = 1 if ($thisbranch eq C4::Context->userenv->{'branch'});
+ my $selected = 1 if (defined($subs) && $thisbranch eq $subs->{'branchcode'});
+ my %row =(value => $thisbranch,
+ selected => $selected,
+ branchname => $branches->{$thisbranch}->{'branchname'},
+ );
+ push @branchloop, \%row;
+}
+$template->param(branchloop => \@branchloop,
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+);
my $count = 0;
# prepare template variables common to all $op conditions:
$template->param( 'dateformat_' . C4::Context->preference('dateformat') => 1 ,
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
} elsif ($op eq 'modsubscription') {
my $subscriptionid = $query->param('subscriptionid');
- my @irregularity = $query->param('irregularity_select');
+ my @irregularity = $query->param('irregularity_select');
my $auser = $query->param('user');
my $librarian => $query->param('librarian'),
my $branchcode = $query->param('branchcode');
my $biblionumber = $query->param('biblionumber');
my $aqbudgetid = $query->param('aqbudgetid');
my $startdate = format_date_in_iso($query->param('startdate'));
- my $nextacquidate = format_date_in_iso($query->param('nextacquidate'));
+ my $nextacquidate = $query->param('nextacquidate') ?
+ format_date_in_iso($query->param('nextacquidate')):
+ format_date_in_iso($query->param('startdate'));
my $periodicity = $query->param('periodicity');
my $dow = $query->param('dow');
my $sublength = $query->param('sublength');
my $librariannote = $query->param('librariannote');
my $history_only = $query->param('history_only');
# If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
- # Here firstacquidate is interpreted as nextacquidate.
-
if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
- $firstissuedate = $nextexpected->{planneddate}->output('iso') if($nextexpected->{isfirstissue});
+ # if we have not received any issues yet, then we also must change the firstacquidate for the subs.
+ $firstissuedate = $nextacquidate if($nextexpected->{isfirstissue});
}
if ($history_only) {
}
$template->param(subtype => \@sub_type_data,
);
+
+ my $new_biblionumber = $query->param('biblionumber_for_new_subscription');
+ if (defined $new_biblionumber) {
+ my $bib = GetBiblioData($new_biblionumber);
+ if (defined $bib) {
+ $template->param(bibnum => $new_biblionumber);
+ $template->param(bibliotitle => $bib->{title});
+ }
+ }
output_html_with_http_headers $query, $cookie, $template->output;
}
projects / koha.git / blobdiff