Owen Leonard
81c90ba3bf
This patch adds a new menu for vendor-related pages in which vendor related "views" can be linked to: baskets, basket groups, contracts, invoices, uncertain prices. The acquisitions toolbar is pared down to vendor-related actions: New basket, contract, or vendor; edit vendor, delete vendor, receive shipment. Other small improvements have been made to other pages: corrections to breadcrumbs and title tags, adding useful links betweeen pages. Vendor menu and toolbar are added to booksellers.pl when there is only one "search result" (i.e. a vendor id is passed). - Menu appears when booksellerid variable is present - Redundant heading removed - Additional variables added to enable proper display of the toolbar - Revision corrects broken links pointed out by QA. - Revision adds check of existing baskets and subscriptions as a condition on display of the vendor delete button. TODO: Add coverage of Basket groups page. To test, navigate Acquisitions pages and test as many links and buttons as you can, confirming that nothing is broken on vendor pages, invoice pages, contract pages, uncertain price pages, etc. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> All tests pass - I like this very much! Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> All tests and QA script pass. Tests done: 1) New toolbar - vendor search - no results = button to create new vendor shows - 1 result = additional new options show - more than one result = button to create new vendor shows 2) Vendor views - acq toolbar consistent with 1 result in vendor search - new tabs on the left - checked all links have the needed parameters and work correctly 3) New toolbar - different pages - Toolbar is formatted consistently - Delete vendor shows only up when it should - no baskets or subscriptions - Links work correctly Works nicely, great groundwork for further improvements. TODO Add new toolbar to (new) invoices page. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
134 lines
5.6 KiB
Perl
Executable file
134 lines
5.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to show a list of orders with uncertain prices for a bookseller
|
|
#the script also allows to edit the prices and uncheck the uncertainprice property of them
|
|
#written by john.soros@biblibre.com 01/10/2008
|
|
|
|
# Copyright 2008-2009 BibLibre SARL
|
|
#
|
|
# 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
|
|
|
|
uncertainprice.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
This script displays all the orders with uncertain prices for a given bookseller, it also lets the user modify the unitprice and uncertainprice properties of the order
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item $booksellerid
|
|
|
|
The bookseller who we want to display the orders of.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use C4::Input;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use CGI;
|
|
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Acquisition qw/GetPendingOrders GetOrder ModOrder/;
|
|
use C4::Biblio qw/GetBiblioData/;
|
|
|
|
my $input=new CGI;
|
|
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "acqui/uncertainprice.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { acquisition => 'order_manage' },
|
|
debug => 1,
|
|
});
|
|
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $basketno = $input->param('basketno');
|
|
my $op = $input->param('op');
|
|
my $owner = $input->param('owner') || 0 ; # flag to see only "my" orders, or everyone orders
|
|
my $bookseller = &GetBookSellerFromId($booksellerid);
|
|
|
|
#show all orders that have uncertain price for the bookseller
|
|
my $pendingorders = &GetPendingOrders($booksellerid,0,$owner,$basketno);
|
|
my @orders;
|
|
|
|
foreach my $order (@{$pendingorders}) {
|
|
if ( $order->{'uncertainprice'} ) {
|
|
my $bibdata = &GetBiblioData($order->{'biblionumber'});
|
|
$order->{'bibisbn'} = $bibdata->{'isbn'};
|
|
$order->{'bibpublishercode'} = $bibdata->{'publishercode'};
|
|
$order->{'bibpublicationyear'} = $bibdata->{'publicationyear'};
|
|
$order->{'bibtitle'} = $bibdata->{'title'};
|
|
$order->{'bibauthor'} = $bibdata->{'author'};
|
|
$order->{'surname'} = $order->{'surname'};
|
|
$order->{'firstname'} = $order->{'firstname'};
|
|
my $order_as_from_db=GetOrder($order->{ordernumber});
|
|
$order->{'quantity'} = $order_as_from_db->{'quantity'};
|
|
$order->{'listprice'} = $order_as_from_db->{'listprice'};
|
|
push(@orders, $order);
|
|
}
|
|
}
|
|
if ( $op eq 'validate' ) {
|
|
$template->param( validate => 1);
|
|
my $count = scalar(@orders);
|
|
for (my $i=0; $i < $count; $i++) {
|
|
my $order = pop(@orders);
|
|
my $ordernumber = $order->{ordernumber};
|
|
my $order_as_from_db=GetOrder($order->{ordernumber});
|
|
$order->{'listprice'} = $input->param('price'.$ordernumber);
|
|
$order->{'ecost'}= $input->param('price'.$ordernumber) - (($input->param('price'.$ordernumber) /100) * $bookseller->{'discount'});
|
|
$order->{'rrp'} = $input->param('price'.$ordernumber);
|
|
$order->{'quantity'}=$input->param('qty'.$ordernumber);
|
|
$order->{'uncertainprice'}=$input->param('uncertainprice'.$ordernumber);
|
|
ModOrder($order);
|
|
}
|
|
}
|
|
|
|
$template->param( uncertainpriceorders => \@orders,
|
|
booksellername => "".$bookseller->{'name'},
|
|
booksellerid => $bookseller->{'id'},
|
|
booksellerpostal =>$bookseller->{'postal'},
|
|
bookselleraddress1 => $bookseller->{'address1'},
|
|
bookselleraddress2 => $bookseller->{'address2'},
|
|
bookselleraddress3 => $bookseller->{'address3'},
|
|
bookselleraddress4 => $bookseller->{'address4'},
|
|
booksellerphone =>$bookseller->{'phone'},
|
|
booksellerfax => $bookseller->{'fax'},
|
|
booksellerurl => $bookseller->{'url'},
|
|
booksellercontact => $bookseller->{'contact'},
|
|
booksellercontpos => $bookseller->{'contpos'},
|
|
booksellercontphone => $bookseller->{'contphone'},
|
|
booksellercontaltphone => $bookseller->{'contaltphone'},
|
|
booksellercontfax => $bookseller->{'contfax'},
|
|
booksellercontemail => $bookseller->{'contemail'},
|
|
booksellercontnotes => $bookseller->{'contnotes'},
|
|
booksellernotes => $bookseller->{'notes'},
|
|
basketcount => $bookseller->{'basketcount'},
|
|
subscriptioncount => $bookseller->{'subscriptioncount'},
|
|
owner => $owner,
|
|
scriptname => "/cgi-bin/koha/acqui/uncertainprice.pl");
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|