Koha/acqui/lateorders.pl
Kyle M Hall b900f5f056 Bug 9014 - Add time due to slips
This patch modifies Koha::DateUtils::output_pref to support the new system preference TimeFormat, which defines the visual format for a time as either the 24 hour format ( default ), or the 12 hour format (HH:MM AM/PM).

The patch also modifies C4::Members::IssueSlip to use output_pref rather than format_date.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Issue an item to a patron, verify the times are in 24 hour format.
4) Switch TimeFormat to the 12 hour format.
5) Revisit the patron record you issued an item to, times should now be in a 12 hour format.
6) Print a slip for this patron, you should now see the time as well as the date.

Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests after fixing the test count in t/DateUtils.t.
Fixed conflicts in syspref.sql and updatedatabase.pl.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
As we have another sign-off on this now I gave it a quick
run through and it works as expected.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-21 11:07:42 -04:00

177 lines
5.2 KiB
Perl
Executable file

#!/usr/bin/perl
# Copyright 2005 Biblibre
# 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 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.
=head1 NAME
lateorders.pl
=head1 DESCRIPTION
this script shows late orders for a specific supplier, branch and delay
given on input arg.
=head1 CGI PARAMETERS
=over 4
=item booksellerid
To know on which supplier this script have to display late order.
=item delay
To know the time boundary. Default value is 30 days.
=item branch
To know on which branch this script have to display late order.
=back
=cut
use Modern::Perl;
use CGI;
use C4::Bookseller qw( GetBooksellersWithLateOrders );
use C4::Auth;
use C4::Koha;
use C4::Output;
use C4::Context;
use C4::Acquisition;
use C4::Letters;
use C4::Branch; # GetBranches
use Koha::DateUtils;
my $input = new CGI;
my ($template, $loggedinuser, $cookie) = get_template_and_user({
template_name => "acqui/lateorders.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
flagsrequired => {acquisition => 'order_receive'},
debug => 1,
});
my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
my $delay = $input->param('delay');
# Get the "date from" param if !defined is today
my $estimateddeliverydatefrom = $input->param('estimateddeliverydatefrom');
my $estimateddeliverydateto = $input->param('estimateddeliverydateto');
my $estimateddeliverydatefrom_dt =
$estimateddeliverydatefrom
? dt_from_string($estimateddeliverydatefrom)
: undef;
# Get the "date to" param. If it is not defined and $delay is not defined too, it is the today's date.
my $estimateddeliverydateto_dt = $estimateddeliverydateto
? dt_from_string($estimateddeliverydateto)
: ( not defined $delay and not defined $estimateddeliverydatefrom)
? dt_from_string()
: undef;
# Format the output of "date from" and "date to"
if ($estimateddeliverydatefrom_dt) {
$estimateddeliverydatefrom = output_pref($estimateddeliverydatefrom_dt, undef, undef, 1);
}
if ($estimateddeliverydateto_dt) {
$estimateddeliverydateto = output_pref($estimateddeliverydateto_dt, undef, undef, 1);
}
my $branch = $input->param('branch');
my $op = $input->param('op');
my @errors = ();
if ( $delay and not $delay =~ /^\d{1,3}$/ ) {
push @errors, {delay_digits => 1, bad_delay => $delay};
}
if ($op and $op eq "send_alert"){
my @ordernums = $input->param("claim_for");# FIXME: Fallback values?
my $err;
eval {
$err = SendAlerts( 'claimacquisition', \@ordernums, $input->param("letter_code") ); # FIXME: Fallback value?
if ( not ref $err or not exists $err->{error} ) {
AddClaim ( $_ ) for @ordernums;
}
};
if ( $@ ) {
$template->param(error_claim => $@);
} elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
$template->{VARS}->{'error_claim'} = "no_email";
} else {
$template->{VARS}->{'info_claim'} = 1;
}
}
my @parameters = ( $delay, $branch );
push @parameters, $estimateddeliverydatefrom_dt
? $estimateddeliverydatefrom_dt->ymd()
: undef;
push @parameters, $estimateddeliverydateto_dt
? $estimateddeliverydateto_dt->ymd()
: undef;
my %supplierlist = GetBooksellersWithLateOrders(@parameters);
my (@sloopy); # supplier loop
foreach (keys %supplierlist){
push @sloopy, (($booksellerid and $booksellerid eq $_ ) ?
{id=>$_, name=>$supplierlist{$_}, selected=>1} :
{id=>$_, name=>$supplierlist{$_}} ) ;
}
$template->param(SUPPLIER_LOOP => \@sloopy);
$template->param(Supplier=>$supplierlist{$booksellerid}) if ($booksellerid);
$template->param(booksellerid=>$booksellerid) if ($booksellerid);
@parameters =
( $delay, $booksellerid, $branch );
if ($estimateddeliverydatefrom_dt) {
push @parameters, $estimateddeliverydatefrom_dt->ymd();
}
else {
push @parameters, undef;
}
if ($estimateddeliverydateto_dt) {
push @parameters, $estimateddeliverydateto_dt->ymd();
}
my @lateorders = GetLateOrders( @parameters );
my $total;
foreach (@lateorders){
$total += $_->{subtotal};
}
my @letters;
my $letters=GetLetters("claimacquisition");
foreach (keys %$letters){
push @letters, {code=>$_,name=>$letters->{$_}};
}
$template->param(letters=>\@letters) if (@letters);
$template->param(ERROR_LOOP => \@errors) if (@errors);
$template->param(
lateorders => \@lateorders,
delay => $delay,
estimateddeliverydatefrom => $estimateddeliverydatefrom,
estimateddeliverydateto => $estimateddeliverydateto,
total => $total,
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
);
output_html_with_http_headers $input, $cookie, $template->output;