59c0a0e02b
In basketgroup.pl, some code is supposed to be executed if $op = "validate". But this value is no longer assigned to the $op variable since 2009. This patch suppressed dead code, along with parseinputbaskets and parseinputbasketgroups subs, which are obsolete. No functional changes expected Regression test : * Check basketgroup are shown as before the patch, and can be closed and reopened. * Check you can add or remove a basket from a basketgroup, and change information about it (like delivery place) * Check you can create a basketgroup when you close a basket. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> The following commands return nothing: - grep validate acqui/basketgroup.tt - grep -R basketgroup.pl -C 2 | grep validate - git grep parseinputbaskets - git grep parseinputbasketgroups - git grep basketgroup.pl | grep validate Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>
427 lines
18 KiB
Perl
Executable file
427 lines
18 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to group (closed) baskets into basket groups for easier order management
|
|
#written by john.soros@biblibre.com 01/10/2008
|
|
|
|
# Copyright 2008 - 2009 BibLibre SARL
|
|
# Parts Copyright Catalyst 2010
|
|
#
|
|
# 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
|
|
|
|
basketgroup.pl
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
This script lets the user group (closed) baskets into basket groups for easier order management. Note that the grouped baskets have to be from the same bookseller and
|
|
have to be closed to be printed or exported.
|
|
|
|
=head1 CGI PARAMETERS
|
|
|
|
=over 4
|
|
|
|
=item $booksellerid
|
|
|
|
The bookseller who we want to display the baskets (and basketgroups) of.
|
|
|
|
=back
|
|
|
|
=cut
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
|
|
use C4::Input;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use CGI;
|
|
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Budgets qw/ConvertCurrency/;
|
|
use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV/;
|
|
use C4::Bookseller qw/GetBookSellerFromId/;
|
|
use C4::Branch qw/GetBranches/;
|
|
use C4::Members qw/GetMember/;
|
|
|
|
our $input=new CGI;
|
|
|
|
our ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "acqui/basketgroup.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {acquisition => 'group_manage'},
|
|
debug => 1,
|
|
});
|
|
|
|
sub BasketTotal {
|
|
my $basketno = shift;
|
|
my $bookseller = shift;
|
|
my $total = 0;
|
|
my @orders = GetOrders($basketno);
|
|
for my $order (@orders){
|
|
$total = $total + ( $order->{ecost} * $order->{quantity} );
|
|
if ($bookseller->{invoiceincgst} && ! $bookseller->{listincgst} && ( $bookseller->{gstrate} // C4::Context->preference("gist") )) {
|
|
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist");
|
|
$total = $total * ( $gst / 100 +1);
|
|
}
|
|
}
|
|
$total .= " " . ($bookseller->{invoiceprice} // 0);
|
|
return $total;
|
|
}
|
|
|
|
#displays all basketgroups and all closed baskets (in their respective groups)
|
|
sub displaybasketgroups {
|
|
my $basketgroups = shift;
|
|
my $bookseller = shift;
|
|
my $baskets = shift;
|
|
if (scalar @$basketgroups != 0) {
|
|
foreach my $basketgroup (@$basketgroups){
|
|
my $i = 0;
|
|
my $basketsqty = 0;
|
|
while($i < scalar(@$baskets)){
|
|
my $basket = @$baskets[$i];
|
|
if($basket->{'basketgroupid'} && $basket->{'basketgroupid'} == $basketgroup->{'id'}){
|
|
$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
|
|
push(@{$basketgroup->{'baskets'}}, $basket);
|
|
splice(@$baskets, $i, 1);
|
|
++$basketsqty;
|
|
--$i;
|
|
}
|
|
++$i;
|
|
}
|
|
$basketgroup -> {'basketsqty'} = $basketsqty;
|
|
}
|
|
$template->param(basketgroups => $basketgroups);
|
|
}
|
|
for(my $i=0; $i < scalar @$baskets; ++$i) {
|
|
if( ! @$baskets[$i]->{'closedate'} ) {
|
|
splice(@$baskets, $i, 1);
|
|
--$i;
|
|
}else{
|
|
@$baskets[$i]->{total} = BasketTotal(@$baskets[$i]->{basketno}, $bookseller);
|
|
}
|
|
}
|
|
$template->param(baskets => $baskets);
|
|
$template->param( booksellername => $bookseller ->{'name'});
|
|
}
|
|
|
|
sub printbasketgrouppdf{
|
|
my ($basketgroupid) = @_;
|
|
|
|
my $pdfformat = C4::Context->preference("OrderPdfFormat");
|
|
if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages' || $pdfformat eq 'pdfformat::layout3pagesfr'){
|
|
eval {
|
|
eval "require $pdfformat";
|
|
import $pdfformat;
|
|
};
|
|
if ($@){
|
|
}
|
|
}
|
|
else {
|
|
print $input->header;
|
|
print $input->start_html; # FIXME Should do a nicer page
|
|
print "<h1>Invalid PDF Format set</h1>";
|
|
print "Please go to the systempreferences and set a valid pdfformat";
|
|
exit;
|
|
}
|
|
|
|
my $basketgroup = GetBasketgroup($basketgroupid);
|
|
my $bookseller = GetBookSellerFromId($basketgroup->{'booksellerid'});
|
|
my $baskets = GetBasketsByBasketgroup($basketgroupid);
|
|
|
|
my %orders;
|
|
for my $basket (@$baskets) {
|
|
my @ba_orders;
|
|
my @ords = &GetOrders($basket->{basketno});
|
|
for my $ord (@ords) {
|
|
|
|
next unless ( $ord->{biblionumber} or $ord->{quantity}> 0 );
|
|
eval {
|
|
require C4::Biblio;
|
|
import C4::Biblio;
|
|
};
|
|
if ($@){
|
|
croak $@;
|
|
}
|
|
eval {
|
|
require C4::Koha;
|
|
import C4::Koha;
|
|
};
|
|
if ($@){
|
|
croak $@;
|
|
}
|
|
|
|
$ord->{rrp} = ConvertCurrency( $ord->{'currency'}, $ord->{rrp} );
|
|
if ( $bookseller->{'listincgst'} ) {
|
|
$ord->{rrpgsti} = sprintf( "%.2f", $ord->{rrp} );
|
|
$ord->{gstgsti} = sprintf( "%.2f", $ord->{gstrate} * 100 );
|
|
$ord->{rrpgste} = sprintf( "%.2f", $ord->{rrp} / ( 1 + ( $ord->{gstgsti} / 100 ) ) );
|
|
$ord->{gstgste} = sprintf( "%.2f", $ord->{gstgsti} / ( 1 + ( $ord->{gstgsti} / 100 ) ) );
|
|
$ord->{ecostgsti} = sprintf( "%.2f", $ord->{ecost} );
|
|
$ord->{ecostgste} = sprintf( "%.2f", $ord->{ecost} / ( 1 + ( $ord->{gstgsti} / 100 ) ) );
|
|
$ord->{gstvalue} = sprintf( "%.2f", ( $ord->{ecostgsti} - $ord->{ecostgste} ) * $ord->{quantity});
|
|
$ord->{totalgste} = sprintf( "%.2f", $ord->{quantity} * $ord->{ecostgste} );
|
|
$ord->{totalgsti} = sprintf( "%.2f", $ord->{quantity} * $ord->{ecostgsti} );
|
|
} else {
|
|
$ord->{rrpgsti} = sprintf( "%.2f", $ord->{rrp} * ( 1 + ( $ord->{gstrate} ) ) );
|
|
$ord->{rrpgste} = sprintf( "%.2f", $ord->{rrp} );
|
|
$ord->{gstgsti} = sprintf( "%.2f", $ord->{gstrate} * 100 );
|
|
$ord->{gstgste} = sprintf( "%.2f", $ord->{gstrate} * 100 );
|
|
$ord->{ecostgsti} = sprintf( "%.2f", $ord->{ecost} * ( 1 + ( $ord->{gstrate} ) ) );
|
|
$ord->{ecostgste} = sprintf( "%.2f", $ord->{ecost} );
|
|
$ord->{gstvalue} = sprintf( "%.2f", ( $ord->{ecostgsti} - $ord->{ecostgste} ) * $ord->{quantity});
|
|
$ord->{totalgste} = sprintf( "%.2f", $ord->{quantity} * $ord->{ecostgste} );
|
|
$ord->{totalgsti} = sprintf( "%.2f", $ord->{quantity} * $ord->{ecostgsti} );
|
|
}
|
|
my $bib = GetBiblioData($ord->{biblionumber});
|
|
my $itemtypes = GetItemTypes();
|
|
|
|
#FIXME DELETE ME
|
|
# 0 1 2 3 4 5 6 7 8 9
|
|
#isbn, itemtype, author, title, publishercode, quantity, listprice ecost discount gstrate
|
|
|
|
# Editor Number
|
|
my $en;
|
|
my $marcrecord=eval{MARC::Record::new_from_xml( $ord->{marcxml},'UTF-8' )};
|
|
if ($marcrecord){
|
|
if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
|
|
$en = $marcrecord->subfield( '345', "b" );
|
|
} elsif ( C4::Context->preference("marcflavour") eq 'MARC21' ) {
|
|
$en = $marcrecord->subfield( '037', "a" );
|
|
}
|
|
}
|
|
|
|
my $ba_order = {
|
|
isbn => ($ord->{isbn} ? $ord->{isbn} : undef),
|
|
itemtype => ( $ord->{itemtype} and $bib->{itemtype} ? $itemtypes->{$bib->{itemtype}}->{description} : undef ),
|
|
en => ( $en ? $en : undef ),
|
|
};
|
|
for my $key ( qw/ gstrate author title itemtype publishercode discount quantity rrpgsti rrpgste gstgsti gstgste ecostgsti ecostgste gstvalue totalgste totalgsti / ) {
|
|
$ba_order->{$key} = $ord->{$key};
|
|
}
|
|
|
|
push(@ba_orders, $ba_order);
|
|
}
|
|
$orders{$basket->{basketno}} = \@ba_orders;
|
|
}
|
|
print $input->header(
|
|
-type => 'application/pdf',
|
|
-attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf'
|
|
);
|
|
my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed";
|
|
print $pdf;
|
|
|
|
}
|
|
|
|
my $op = $input->param('op') || 'display';
|
|
# possible values of $op :
|
|
# - add : adds a new basketgroup, or edit an open basketgroup, or display a closed basketgroup
|
|
# - mod_basket : modify an individual basket of the basketgroup
|
|
# - closeandprint : close and print an closed basketgroup in pdf. called by clicking on "Close and print" button in closed basketgroups list
|
|
# - print : print a closed basketgroup. called by clicking on "Print" button in closed basketgroups list
|
|
# - export : export in CSV a closed basketgroup. called by clicking on "Export" button in closed basketgroups list
|
|
# - delete : delete an open basketgroup. called by clicking on "Delete" button in open basketgroups list
|
|
# - reopen : reopen a closed basketgroup. called by clicking on "Reopen" button in closed basketgroup list
|
|
# - attachbasket : save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page
|
|
# - display : display the list of all basketgroups for a vendor
|
|
my $booksellerid = $input->param('booksellerid');
|
|
$template->param(booksellerid => $booksellerid);
|
|
|
|
if ( $op eq "add" ) {
|
|
#
|
|
# if no param('basketgroupid') is not defined, adds a new basketgroup
|
|
# else, edit (if it is open) or display (if it is close) the basketgroup basketgroupid
|
|
# the template will know if basketgroup must be displayed or edited, depending on the value of closed key
|
|
#
|
|
if(! $booksellerid){
|
|
# Unknown bookseller
|
|
# FIXME : ungroupedlist does not seem to be used in this file nor in template
|
|
$template->param( ungroupedlist => 1);
|
|
my @booksellers = GetBookSeller('');
|
|
for (my $i=0; $i < scalar @booksellers; $i++) {
|
|
my $baskets = &GetBasketsByBookseller($booksellers[$i]->{id});
|
|
for (my $j=0; $j < scalar @$baskets; $j++) {
|
|
if(! @$baskets[$i]->{closedate} || @$baskets[$i]->{basketgroupid}) {
|
|
splice(@$baskets, $j, 1);
|
|
$j--;
|
|
}
|
|
}
|
|
if (scalar @$baskets == 0){
|
|
splice(@booksellers, $i, 1);
|
|
$i--;
|
|
}
|
|
}
|
|
} else {
|
|
# Known bookseller
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
my $billingplace;
|
|
my $deliveryplace;
|
|
my $freedeliveryplace;
|
|
if ( $basketgroupid ) {
|
|
# Get the selected baskets in the basketgroup to display them
|
|
my $selecteds = GetBasketsByBasketgroup($basketgroupid);
|
|
foreach (@{$selecteds}){
|
|
$_->{total} = BasketTotal($_->{basketno}, $_);
|
|
}
|
|
$template->param(basketgroupid => $basketgroupid,
|
|
selectedbaskets => $selecteds);
|
|
|
|
# Get general informations about the basket group to prefill the form
|
|
my $basketgroup = GetBasketgroup($basketgroupid);
|
|
$template->param(
|
|
name => $basketgroup->{name},
|
|
deliverycomment => $basketgroup->{deliverycomment},
|
|
freedeliveryplace => $basketgroup->{freedeliveryplace},
|
|
);
|
|
$billingplace = $basketgroup->{billingplace};
|
|
$deliveryplace = $basketgroup->{deliveryplace};
|
|
$freedeliveryplace = $basketgroup->{freedeliveryplace};
|
|
$template->param( closedbg => ($basketgroup ->{'closed'}) ? 1 : 0);
|
|
} else {
|
|
$template->param( closedbg => 0);
|
|
}
|
|
# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
|
|
my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
|
|
$billingplace = $billingplace || $borrower->{'branchcode'};
|
|
$deliveryplace = $deliveryplace || $borrower->{'branchcode'};
|
|
|
|
my $branches = C4::Branch::GetBranchesLoop( $billingplace );
|
|
$template->param( billingplaceloop => $branches );
|
|
$branches = C4::Branch::GetBranchesLoop( $deliveryplace );
|
|
$template->param( deliveryplaceloop => $branches );
|
|
$template->param( booksellerid => $booksellerid );
|
|
}
|
|
# the template will display a unique basketgroup
|
|
$template->param(grouping => 1);
|
|
my $basketgroups = &GetBasketgroups($booksellerid);
|
|
my $bookseller = &GetBookSellerFromId($booksellerid);
|
|
my $baskets = &GetBasketsByBookseller($booksellerid);
|
|
displaybasketgroups($basketgroups, $bookseller, $baskets);
|
|
} elsif ($op eq 'mod_basket') {
|
|
#
|
|
# edit an individual basket contained in this basketgroup
|
|
#
|
|
my $basketno=$input->param('basketno');
|
|
my $basketgroupid=$input->param('basketgroupid');
|
|
ModBasket( { basketno => $basketno,
|
|
basketgroupid => $basketgroupid } );
|
|
print $input->redirect("basket.pl?basketno=" . $basketno);
|
|
} elsif ( $op eq 'closeandprint') {
|
|
#
|
|
# close an open basketgroup and generates a pdf
|
|
#
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
CloseBasketgroup($basketgroupid);
|
|
printbasketgrouppdf($basketgroupid);
|
|
exit;
|
|
}elsif ($op eq 'print'){
|
|
#
|
|
# print a closed basketgroup
|
|
#
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
printbasketgrouppdf($basketgroupid);
|
|
exit;
|
|
}elsif ( $op eq "export" ) {
|
|
#
|
|
# export a closed basketgroup in csv
|
|
#
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
print $input->header(
|
|
-type => 'text/csv',
|
|
-attachment => 'basketgroup' . $basketgroupid . '.csv',
|
|
);
|
|
print GetBasketGroupAsCSV( $basketgroupid, $input );
|
|
exit;
|
|
}elsif( $op eq "delete"){
|
|
#
|
|
# delete an closed basketgroup
|
|
#
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
DelBasketgroup($basketgroupid);
|
|
print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid.'&listclosed=1');
|
|
}elsif ( $op eq 'reopen'){
|
|
#
|
|
# reopen a closed basketgroup
|
|
#
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
my $booksellerid = $input->param('booksellerid');
|
|
ReOpenBasketgroup($basketgroupid);
|
|
my $redirectpath = ((defined $input->param('mode'))&& ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' .$booksellerid.'&listclosed=1';
|
|
print $input->redirect($redirectpath);
|
|
} elsif ( $op eq 'attachbasket') {
|
|
#
|
|
# save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page
|
|
#
|
|
# Getting parameters
|
|
my $basketgroup = {};
|
|
my @baskets = $input->param('basket');
|
|
my $basketgroupid = $input->param('basketgroupid');
|
|
my $basketgroupname = $input->param('basketgroupname');
|
|
my $booksellerid = $input->param('booksellerid');
|
|
my $billingplace = $input->param('billingplace');
|
|
my $deliveryplace = $input->param('deliveryplace');
|
|
my $freedeliveryplace = $input->param('freedeliveryplace');
|
|
my $deliverycomment = $input->param('deliverycomment');
|
|
my $closedbg = $input->param('closedbg') ? 1 : 0;
|
|
if ($basketgroupid) {
|
|
# If we have a basketgroupid we edit the basketgroup
|
|
$basketgroup = {
|
|
name => $basketgroupname,
|
|
id => $basketgroupid,
|
|
basketlist => \@baskets,
|
|
billingplace => $billingplace,
|
|
deliveryplace => $deliveryplace,
|
|
freedeliveryplace => $freedeliveryplace,
|
|
deliverycomment => $deliverycomment,
|
|
closed => $closedbg,
|
|
};
|
|
ModBasketgroup($basketgroup);
|
|
if($closedbg){
|
|
# FIXME
|
|
}
|
|
}else{
|
|
# we create a new basketgroup (whith a closed basket)
|
|
$basketgroup = {
|
|
name => $basketgroupname,
|
|
booksellerid => $booksellerid,
|
|
basketlist => \@baskets,
|
|
billingplace => $billingplace,
|
|
deliveryplace => $deliveryplace,
|
|
freedeliveryplace => $freedeliveryplace,
|
|
deliverycomment => $deliverycomment,
|
|
closed => $closedbg,
|
|
};
|
|
$basketgroupid = NewBasketgroup($basketgroup);
|
|
}
|
|
my $redirectpath = ((defined $input->param('mode')) && ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid;
|
|
$redirectpath .= "&listclosed=1" if $closedbg ;
|
|
print $input->redirect($redirectpath );
|
|
|
|
}else{
|
|
# no param : display the list of all basketgroups for a given vendor
|
|
my $basketgroups = &GetBasketgroups($booksellerid);
|
|
my $bookseller = &GetBookSellerFromId($booksellerid);
|
|
my $baskets = &GetBasketsByBookseller($booksellerid);
|
|
|
|
displaybasketgroups($basketgroups, $bookseller, $baskets);
|
|
}
|
|
$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );
|
|
#prolly won't use all these, maybe just use print, the rest can be done inside validate
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|