ed63c13957
DB changements: - Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid. - Removes 2 unused fields: aqorders.serialid and aqorders.subscription. Main test plan: 1) Create a subscription 2) Create a bookseller and a basket 3) Add a new order 'from a subscription' 4) Search your subscription and check if results are correct 5) Click on the "order" link 6) Check the biblio information are filled in the form 7) Select a budget and fill some price information. 8) retry steps 3 and 4. Verify you cannot order the same subscription. Message:Outstanding order (only one order per subscription is allowed). 9) click on your subscription (already added) and check you have a new table "Acquisition details" with your price information in the "Ordered amount" line. 10) receive this order 11) On your subscription detail page, the "Spent amount" line must be filled with your price information. 12) Re order the same subscription. Now you are allowed to. Prices information have to be filled with the previous information. 13) Retry some orders and click on a maximum of links in order to find a bug :) Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Comments on last patch. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
107 lines
3.4 KiB
Perl
Executable file
107 lines
3.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 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.
|
|
|
|
use Modern::Perl;
|
|
use CGI;
|
|
use C4::Acquisition;
|
|
use C4::Auth;
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Branch;
|
|
use C4::Context;
|
|
use C4::Output;
|
|
use C4::Serials;
|
|
|
|
my $query = new CGI;
|
|
my $title = $query->param('title_filter');
|
|
my $ISSN = $query->param('ISSN_filter');
|
|
my $EAN = $query->param('EAN_filter');
|
|
my $publisher = $query->param('publisher_filter');
|
|
my $supplier = $query->param('supplier_filter');
|
|
my $branch = $query->param('branch_filter');
|
|
my $routing = $query->param('routing') || C4::Context->preference("RoutingSerials");
|
|
my $searched = $query->param('searched');
|
|
my $biblionumber = $query->param('biblionumber');
|
|
|
|
my $basketno = $query->param('basketno');
|
|
my $booksellerid = $query->param('booksellerid');
|
|
|
|
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
|
|
{ template_name => "acqui/newordersubscription.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
}
|
|
);
|
|
|
|
my $basket = GetBasket($basketno);
|
|
$booksellerid = $basket->{booksellerid} unless $booksellerid;
|
|
my ($bookseller) = GetBookSellerFromId($booksellerid);
|
|
|
|
my @subscriptions;
|
|
if ($searched) {
|
|
@subscriptions = SearchSubscriptions({
|
|
title => $title,
|
|
issn => $ISSN,
|
|
ean => $EAN,
|
|
publisher => $publisher,
|
|
bookseller => $supplier,
|
|
branch => $branch
|
|
});
|
|
}
|
|
|
|
foreach my $sub (@subscriptions) {
|
|
$sub->{alreadyOnOrder} = subscriptionCurrentlyOnOrder $sub->{subscriptionid};
|
|
|
|
# to toggle between create or edit routing list options
|
|
if ($routing) {
|
|
$sub->{routingedit} = check_routing( $sub->{subscriptionid} );
|
|
}
|
|
}
|
|
|
|
my $branches = GetBranches();
|
|
my @branches_loop;
|
|
foreach (sort keys %$branches){
|
|
my $selected = 0;
|
|
$selected = 1 if defined $branch && $branch eq $_;
|
|
push @branches_loop, {
|
|
branchcode => $_,
|
|
branchname => $branches->{$_}->{branchname},
|
|
selected => $selected,
|
|
};
|
|
}
|
|
|
|
$template->param(
|
|
subs_loop => \@subscriptions,
|
|
title_filter => $title,
|
|
ISSN_filter => $ISSN,
|
|
EAN_filter => $EAN,
|
|
publisher_filter => $publisher,
|
|
supplier_filter => $supplier,
|
|
branch_filter => $branch,
|
|
branches_loop => \@branches_loop,
|
|
done_searched => $searched,
|
|
routing => $routing,
|
|
booksellerid => $booksellerid,
|
|
basketno => $basket->{basketno},
|
|
basketname => $basket->{basketname},
|
|
booksellername => $bookseller->{name},
|
|
dateformat => C4::Context->preference("dateformat"),
|
|
);
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|