#written by john.soros@biblibre.com 01/10/2008
# Copyright 2008 - 2009 BibLibre SARL
+# Parts Copyright Catalyst 2010
#
# This file is part of Koha.
#
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 $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed";
print $pdf;
- exit;
}
my $op = $input->param('op');
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);
$template->param(
name => $basketgroup->{name},
deliverycomment => $basketgroup->{deliverycomment},
+ freedeliveryplace => $basketgroup->{freedeliveryplace},
);
$billingplace = $basketgroup->{billingplace};
$deliveryplace = $basketgroup->{deliveryplace};
+ $freedeliveryplace = $basketgroup->{freedeliveryplace};
}
# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
CloseBasketgroup($basketgroupid);
printbasketgrouppdf($basketgroupid);
+ exit;
}elsif ($op eq 'print'){
my $basketgroupid = $input->param('basketgroupid');
printbasketgrouppdf($basketgroupid);
+ exit;
}elsif( $op eq "delete"){
my $basketgroupid = $input->param('basketgroupid');
DelBasketgroup($basketgroupid);
} elsif ( $op eq 'attachbasket') {
# 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 $deliverycomment = $input->param('deliverycomment');
- my $close = $input->param('close') ? 1 : 0;
+ 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 $close = $input->param('close') ? 1 : 0;
# If we got a basketgroupname, we create a basketgroup
if ($basketgroupid) {
$basketgroup = {
- name => $basketgroupname,
- id => $basketgroupid,
- basketlist => \@baskets,
- billingplace => $billingplace,
- deliveryplace => $deliveryplace,
- deliverycomment => $deliverycomment,
- closed => $close,
+ name => $basketgroupname,
+ id => $basketgroupid,
+ basketlist => \@baskets,
+ billingplace => $billingplace,
+ deliveryplace => $deliveryplace,
+ freedeliveryplace => $freedeliveryplace,
+ deliverycomment => $deliverycomment,
+ closed => $close,
};
ModBasketgroup($basketgroup);
if($close){
}
}else{
$basketgroup = {
- name => $basketgroupname,
- booksellerid => $booksellerid,
- basketlist => \@baskets,
- deliveryplace => $deliveryplace,
- deliverycomment => $deliverycomment,
- closed => $close,
+ name => $basketgroupname,
+ booksellerid => $booksellerid,
+ basketlist => \@baskets,
+ deliveryplace => $deliveryplace,
+ freedeliveryplace => $freedeliveryplace,
+ deliverycomment => $deliverycomment,
+ closed => $close,
};
$basketgroupid = NewBasketgroup($basketgroup);
}