# 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.
+# 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;
+use CGI qw ( -utf8 );
use C4::Acquisition;
use C4::Auth;
-use C4::Bookseller qw/GetBookSellerFromId/;
use C4::Budgets;
use C4::Koha;
-use C4::Dates qw/format_date/;
use C4::Serials;
use C4::Output;
use C4::Context;
use C4::Search qw/enabled_staff_search_views/;
+
+use Koha::AuthorisedValues;
+use Koha::DateUtils;
+use Koha::Acquisition::Bookseller;
+
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
use Carp;
C4::Serials::ReopenSubscription( $subscriptionid );
}
-# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
+# the subscription must be deletable if there is NO issues for a reason or another (should not happened, but...)
# Permission needed if it is a deletion (del) : delete_subscription
# Permission needed otherwise : *
my $permission = ($op eq "del") ? "delete_subscription" : "*";
my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
+= get_template_and_user({template_name => "serials/subscription-detail.tt",
query => $query,
type => "intranet",
authnotrequired => 0,
my $subs = GetSubscription($subscriptionid);
+
+output_and_exit( $query, $cookie, $template, 'unknown_subscription')
+ unless $subs;
+
$subs->{enddate} ||= GetExpirationDate($subscriptionid);
my ($totalissues,@serialslist) = GetSerials($subscriptionid);
# If it's ok to delete the subscription, we do so
if ($issueconfirmed eq "1") {
&DelSubscription($subscriptionid);
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=serials-home.pl\"></html>";
- exit;
+ print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
+ exit;
}
}
my $hasRouting = check_routing($subscriptionid);
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
for my $date ( qw(startdate enddate firstacquidate histstartdate histenddate) ) {
- $$subs{$date} = format_date($$subs{$date}) if $date && $$subs{$date};
+ $subs->{$date} = output_pref( { str => $subs->{$date}, dateonly => 1 } )
+ if $subs->{$date};
}
-$subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
+my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $subs->{location} });
+$subs->{location} = $av->count ? $av->next->lib : '';
$subs->{abouttoexpire} = abouttoexpire($subs->{subscriptionid});
$template->param(%{ $subs });
$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
-my @irregular_issues = split /,/, $subs->{irregularity};
+my @irregular_issues = split /;/, $subs->{irregularity};
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 );
-if ( defined $subscriptionid ) {
- my $lastOrderNotReceived = GetLastOrderNotReceivedFromSubscriptionid $subscriptionid;
- my $lastOrderReceived = GetLastOrderReceivedFromSubscriptionid $subscriptionid;
- if ( defined $lastOrderNotReceived ) {
- my $basket = GetBasket $lastOrderNotReceived->{basketno};
- my $bookseller = GetBookSellerFromId $basket->{booksellerid};
- ( $tmpl_infos->{valuegsti_ordered}, $tmpl_infos->{valuegste_ordered} ) = get_value_with_gst_params ( $lastOrderNotReceived->{ecost}, $lastOrderNotReceived->{gstrate}, $bookseller );
- $tmpl_infos->{valuegsti_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegsti_ordered} );
- $tmpl_infos->{valuegste_ordered} = sprintf( "%.2f", $tmpl_infos->{valuegste_ordered} );
- $tmpl_infos->{budget_name_ordered} = GetBudgetName $lastOrderNotReceived->{budget_id};
- $tmpl_infos->{basketno} = $lastOrderNotReceived->{basketno};
- $tmpl_infos->{ordered_exists} = 1;
- }
- if ( defined $lastOrderReceived ) {
- my $basket = GetBasket $lastOrderReceived->{basketno};
- my $bookseller = GetBookSellerFromId $basket->{booksellerid};
- ( $tmpl_infos->{valuegsti_spent}, $tmpl_infos->{valuegste_spent} ) = get_value_with_gst_params ( $lastOrderReceived->{unitprice}, $lastOrderReceived->{gstrate}, $bookseller );
- $tmpl_infos->{valuegsti_spent} = sprintf( "%.2f", $tmpl_infos->{valuegsti_spent} );
- $tmpl_infos->{valuegste_spent} = sprintf( "%.2f", $tmpl_infos->{valuegste_spent} );
- $tmpl_infos->{budget_name_spent} = GetBudgetName $lastOrderReceived->{budget_id};
- $tmpl_infos->{invoiceid} = $lastOrderReceived->{invoiceid};
- $tmpl_infos->{spent_exists} = 1;
+my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
+for my $field ( @$additional_fields ) {
+ if ( $field->{authorised_value_category} ) {
+ $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
}
}
+$template->param( additional_fields_for_subscription => $additional_fields );
+
+# FIXME Do we want to hide canceled orders?
+my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => { -desc => 'parent_ordernumber' } } );
$template->param(
subscriptionid => $subscriptionid,
intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
irregular_issues => scalar @irregular_issues,
default_bib_view => $default_bib_view,
+ orders => $orders,
(uc(C4::Context->preference("marcflavour"))) => 1,
- show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
- basketno => $order->{basketno},
- %$tmpl_infos,
);
output_html_with_http_headers $query, $cookie, $template->output;
}
return 'detail';
}
-
-sub get_value_with_gst_params {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- if ( $bookseller->{listincgst} ) {
- return ( $value, $value / ( 1 + $gstrate ) );
- } else {
- return ( $value * ( 1 + $gstrate ), $value );
- }
-}
-
-sub get_gste {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- if ( $bookseller->{invoiceincgst} ) {
- return $value / ( 1 + $gstrate );
- } else {
- return $value;
- }
-}
-
-sub get_gst {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- if ( $bookseller->{invoiceincgst} ) {
- return $value / ( 1 + $gstrate ) * $gstrate;
- } else {
- return $value * ( 1 + $gstrate ) - $value;
- }
-}
projects / koha.git / blobdiff