Also add a couple FIXMEs
Marcel: Signed and updated for current master
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
use C4::Items;
use C4::Koha qw/GetItemTypes/;
use C4::Budgets qw/GetBudgets/;
use C4::Items;
use C4::Koha qw/GetItemTypes/;
use C4::Budgets qw/GetBudgets/;
-use C4::Acquisition qw/NewOrderItem/;
+use C4::Acquisition qw/NewOrderItem GetBasket/;
use C4::Bookseller qw/GetBookSellerFromId/;
my $input = new CGI;
use C4::Bookseller qw/GetBookSellerFromId/;
my $input = new CGI;
if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
$orderinfo{'listprice'} = $1;
$orderinfo{'listprice'} =~ s/,/\./;
if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
$orderinfo{'listprice'} = $1;
$orderinfo{'listprice'} =~ s/,/\./;
- eval "use C4::Acquisition qw/GetBasket/;";
- eval "use C4::Bookseller qw/GetBookSellerFromId/;";
my $basket = GetBasket($orderinfo{basketno});
my $bookseller = GetBookSellerFromId($basket->{booksellerid});
# '//' is like '||' but tests for defined, rather than true
my $basket = GetBasket($orderinfo{basketno});
my $bookseller = GetBookSellerFromId($basket->{booksellerid});
# '//' is like '||' but tests for defined, rather than true
if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
$orderinfo{'listprice'} = $1;
$orderinfo{'listprice'} =~ s/,/\./;
if ($orderinfo{'listprice'} =~ /^([\d\.,]*)/) {
$orderinfo{'listprice'} = $1;
$orderinfo{'listprice'} =~ s/,/\./;
- eval "use C4::Acquisition qw/GetBasket/;";
- eval "use C4::Bookseller qw/GetBookSellerFromId/;";
my $basket = GetBasket($orderinfo{basketno});
my $bookseller = GetBookSellerFromId($basket->{booksellerid});
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
my $basket = GetBasket($orderinfo{basketno});
my $bookseller = GetBookSellerFromId($basket->{booksellerid});
my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
my ($basketgroupid) = @_;
my $pdfformat = C4::Context->preference("OrderPdfFormat");
my ($basketgroupid) = @_;
my $pdfformat = C4::Context->preference("OrderPdfFormat");
- eval "use $pdfformat" ;
- eval "use C4::Branch";
+ eval "use $pdfformat";
+ # FIXME consider what would happen if $pdfformat does not
+ # contain the name of a valid Perl module.
my $basketgroup = GetBasketgroup($basketgroupid);
my $bookseller = GetBookSellerFromId($basketgroup->{'booksellerid'});
my $basketgroup = GetBasketgroup($basketgroupid);
my $bookseller = GetBookSellerFromId($basketgroup->{'booksellerid'});
);
my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed";
print $pdf;
);
my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed";
print $pdf;
+ exit; # FIXME bad form to exit out of a subroutine like this
}
my $op = $input->param('op');
}
my $op = $input->param('op');