489d480042
- add a message if the search returns no result - keep selected values if the search returns no result (for fund and order status) - remove plurals in order status - move the order status column in the search results table Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. New tests also pass: t/db_dependent/Acquisition/close_reopen_basket.t 1) Database update - I end up with too many partials. My test cases: - New orders, basket still open OK Expected: new, Result: partial - Ordered orders, basket and basketgroup closed OK Expected: ordered, Result: partial - Partially received orders OK Expected: partial/complete, Result: partial/complete - Received orders OK: Expected: complete, Result: complete - Cancelled orders * cancelled from open basket before order OK: Expected: cancelled, Result: cancelled * cancelled from closed basket before receive OK: Expected: cancelled, Result: cancelled All aqorders where updated with the correct status. I have saved my 'pre-updatedatabase' and can repeat the test anytime you have a follow up. 2) Testing search functionality a) Order search - result list Order search shows a new column, I think it would be a bit better if the status there was singular instead of plural - new order, partially received order etc. - maybe we could even leave out the 'order'? (minor) The column seems a bit lost in the middle, not sure where it would make more sense (just saying) b) Order search - advanced search form The advanced search form now shows a new filter: Order status All new status can be searched. - an "empty" search will find all but cancelled orders - searching for cancelled orders works correctly and shows results Search works correctly, no regressions found. If no result is found a message is shown. All search input is kept, so you can modify your search terms easily. 3) Testing setting of status after applying the patch a) Create a new order with 2 items - status is new. OK b) Close the basket - status is ordered. OK c) Receive both items - status is completed. OK d) Undo receipt - status is ordered. OK e) Receive only 1 item - order is split up into 2 orders: - status is partial OK - status is completed OK f) Undo receipt of received item - order is combined into 1 again - status is ordered OK! g) Receive only 1 item again - status ordered/partial. h) Delete order. - status is completed - status is cancelled OK! i) Undo receipt of 1 item again. Refresh page. This results in the following behaviour, that has been reported as bug 10984. After refreshing the page follow message is shown: Cannot cancel receipt. Possible reasons : - The order line you trying to cancel was created from a partial receipt of another order line which is already received. Try to cancel this one first and retry. - The order line you trying to cancel was created from a partial receipt of another order line which has been deleted. Cancellation is not possible. BUT: The receipt is undone, but you are left with a line with 2 items, a cancellation date and the status ordered. Because of the cancellation date the order is not visible in pending orders. The status is correct - so I feel this should not stop this patch. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
160 lines
5.1 KiB
Perl
Executable file
160 lines
5.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Copyright 2004 Biblibre
|
|
# Parts copyright 2011 Catalyst IT Ltd.
|
|
#
|
|
# 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
|
|
|
|
histsearch.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
this script offer a interface to search among order.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item title
|
|
if the script has to filter the results on title.
|
|
|
|
=item author
|
|
if the script has to filter the results on author.
|
|
|
|
=item name
|
|
if the script has to filter the results on supplier.
|
|
|
|
=item fromplacedon
|
|
to filter on started date.
|
|
|
|
=item toplacedon
|
|
to filter on ended date.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
use CGI;
|
|
use C4::Auth; # get_template_and_user
|
|
use C4::Output;
|
|
use C4::Acquisition;
|
|
use C4::Dates;
|
|
use C4::Debug;
|
|
use C4::Branch;
|
|
use C4::Koha;
|
|
|
|
my $input = new CGI;
|
|
my $title = $input->param( 'title');
|
|
my $author = $input->param('author');
|
|
my $isbn = $input->param('isbn');
|
|
my $name = $input->param( 'name' );
|
|
my $ean = $input->param('ean');
|
|
my $basket = $input->param( 'basket' );
|
|
my $basketgroupname = $input->param('basketgroupname');
|
|
my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
|
|
my $do_search = $input->param('do_search') || 0;
|
|
my $from_placed_on = C4::Dates->new($input->param('from'));
|
|
my $to_placed_on = C4::Dates->new($input->param('to'));
|
|
my $budget = $input->param( 'budget' );
|
|
my $orderstatus = $input->param( 'orderstatus' );
|
|
|
|
if ( not $input->param('from') ) {
|
|
# FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?
|
|
# We would use a function like Add_Delta_YM(-1, 0, 0);
|
|
$$from_placed_on{dmy_arrayref}[5] -= 1;
|
|
}
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "acqui/histsearch.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => '*' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my ( $from_iso, $to_iso, $d );
|
|
if ( $d = $input->param('from') ) {
|
|
$from_iso = C4::Dates->new($d)->output('iso');
|
|
}
|
|
if ( $d = $input->param('iso') ) {
|
|
$to_iso = C4::Dates->new($d)->output('iso');
|
|
}
|
|
|
|
my ( $order_loop, $total_qty, $total_price, $total_qtyreceived );
|
|
# If we're supplied any value then we do a search. Otherwise we don't.
|
|
if ($do_search) {
|
|
( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
|
|
title => $title,
|
|
author => $author,
|
|
isbn => $isbn,
|
|
ean => $ean,
|
|
name => $name,
|
|
from_placed_on => $from_iso,
|
|
to_placed_on => $to_iso,
|
|
basket => $basket,
|
|
booksellerinvoicenumber => $booksellerinvoicenumber,
|
|
basketgroupname => $basketgroupname,
|
|
budget => $budget,
|
|
orderstatus => $orderstatus,
|
|
);
|
|
}
|
|
|
|
my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
|
|
my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
|
|
|
|
my $budgetperiods = C4::Budgets::GetBudgetPeriods;
|
|
my $bp_loop = $budgetperiods;
|
|
for my $bp ( @{$budgetperiods} ) {
|
|
my $hierarchy = C4::Budgets::GetBudgetHierarchy( $$bp{budget_period_id} );
|
|
for my $budget ( @{$hierarchy} ) {
|
|
$$budget{budget_display_name} = sprintf("%s", ">" x $$budget{depth} . $$budget{budget_name});
|
|
}
|
|
$$bp{hierarchy} = $hierarchy;
|
|
}
|
|
|
|
$template->param(
|
|
order_loop => $order_loop,
|
|
total_qty => $total_qty,
|
|
total_qtyreceived => $total_qtyreceived,
|
|
total_price => sprintf( "%.2f", $total_price ),
|
|
numresults => $order_loop ? scalar(@$order_loop) : undef,
|
|
title => $title,
|
|
author => $author,
|
|
isbn => $isbn,
|
|
ean => $ean,
|
|
name => $name,
|
|
basket => $basket,
|
|
booksellerinvoicenumber => $booksellerinvoicenumber,
|
|
basketgroupname => $basketgroupname,
|
|
from_placed_on => $from_date,
|
|
to_placed_on => $to_date,
|
|
orderstatus => $orderstatus,
|
|
budget_id => $budget,
|
|
bp_loop => $bp_loop,
|
|
search_done => $do_search,
|
|
debug => $debug || $input->param('debug') || 0,
|
|
uc(C4::Context->preference("marcflavour")) => 1
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|