use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Acquisition qw/GetBasket NewBasket ModBasketHeader/;
-use C4::Contract qw/GetContracts/;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Acquisition qw( GetBasket ModBasket ModBasketHeader NewBasket );
+use C4::Contract qw( GetContracts GetContract );
use Koha::Acquisition::Booksellers;
use Koha::Acquisition::Baskets;
use Koha::AdditionalFields;
-my $input = new CGI;
+my $input = CGI->new;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "acqui/basketheader.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { acquisition => 'order_manage' },
- debug => 1,
}
);
my $op = $input->param('op');
my $is_an_edit = $input->param('is_an_edit');
-$template->param( available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'aqbasket' } ) ] );
+$template->param( available_additional_fields => Koha::AdditionalFields->search( { tablename => 'aqbasket' } ) );
if ( $op eq 'add_form' ) {
my @contractloop;
$template->param( is_an_edit => 1);
$template->param(
additional_field_values => { map {
- $_->field->name => $_->value
- } Koha::Acquisition::Baskets->find($basketno)->additional_field_values },
+ $_->field->id => $_->value
+ } Koha::Acquisition::Baskets->find($basketno)->additional_field_values->as_list },
);
} else {
#new basket
$template->param(contractloop => \@contractloop,
basketcontractnumber => $basket->{'contractnumber'});
}
- my @booksellers = Koha::Acquisition::Booksellers->search(
+ my $booksellers = Koha::Acquisition::Booksellers->search(
undef,
{ order_by => { -asc => 'name' } } );
booksellername => $bookseller->name,
booksellerid => $booksellerid,
basketno => $basketno,
- booksellers => \@booksellers,
+ booksellers => $booksellers,
is_standing => $basket->{is_standing},
+ create_items => $basket->{create_items},
);
my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};
);
} else { #New basket
$basketno = NewBasket(
- $booksellerid,
+ scalar $input->param('basketbooksellerid'),
$loggedinuser,
scalar $input->param('basketname'),
scalar $input->param('basketnote'),
}
my @additional_fields;
- for my $field (Koha::AdditionalFields->search({ tablename => 'aqbasket' })) {
+ my $basket_fields = Koha::AdditionalFields->search({ tablename => 'aqbasket' });
+ while ( my $field = $basket_fields->next ) {
my $value = $input->param('additional_field_' . $field->id);
push @additional_fields, {
id => $field->id,