X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fbasketheader.pl;h=1e6fde50ada42316ef4b12961e9cb6ef053f09ac;hb=7b66b90fe707e8ac650a1c85d87560fc2f4a223d;hp=8f75f4097f7a87e46ae4b1f2241d51bb1978a0e9;hpb=7886297f05ece48185b2f046ae025a57643ee65c;p=koha-ffzg.git diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl index 8f75f4097f..1e6fde50ad 100755 --- a/acqui/basketheader.pl +++ b/acqui/basketheader.pl @@ -7,18 +7,18 @@ # # 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 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 3 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. +# 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. +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . =head1 NAME @@ -45,21 +45,22 @@ If it exists, C<$basketno> is the basket we edit =cut -use strict; -use warnings; -use CGI; +use Modern::Perl; +use CGI qw ( -utf8 ); use C4::Context; use C4::Auth; -use C4::Branch; use C4::Output; -use C4::Acquisition qw/GetBasket NewBasket GetContracts ModBasketHeader/; -use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/; +use C4::Acquisition qw/GetBasket NewBasket ModBasketHeader/; +use C4::Contract qw/GetContracts/; +use Koha::Acquisition::Booksellers; +use Koha::Acquisition::Baskets; +use Koha::AdditionalFields; my $input = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "acqui/basketheader.tmpl", + template_name => "acqui/basketheader.tt", query => $input, type => "intranet", authnotrequired => 0, @@ -71,10 +72,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( #parameters: my $booksellerid = $input->param('booksellerid'); my $basketno = $input->param('basketno'); -my $branches = GetBranches; my $basket; -my $op = $input ->param('op'); -my $is_an_edit= $input ->param('is_an_edit'); +my $op = $input->param('op'); +my $is_an_edit = $input->param('is_an_edit'); + +$template->param( available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'aqbasket' } ) ] ); if ( $op eq 'add_form' ) { my @contractloop; @@ -84,47 +86,59 @@ if ( $op eq 'add_form' ) { if (! $booksellerid) { $booksellerid=$basket->{'booksellerid'}; } - @contractloop = &GetContracts($booksellerid, 1); + my $contracts = GetContracts({ + booksellerid => $booksellerid, + activeonly => 1, + }); + + @contractloop = @$contracts; for (@contractloop) { if ( $basket->{'contractnumber'} eq $_->{'contractnumber'} ) { $_->{'selected'} = 1; } } $template->param( is_an_edit => 1); + $template->param( + additional_field_values => { map { + $_->field->id => $_->value + } Koha::Acquisition::Baskets->find($basketno)->additional_field_values->as_list }, + ); } else { #new basket my $basket; - push(@contractloop, &GetContracts($booksellerid, 1)); + my $contracts = GetContracts({ + booksellerid => $booksellerid, + activeonly => 1, + }); + push(@contractloop, @$contracts); } - my $bookseller = GetBookSellerFromId($booksellerid); + my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); my $count = scalar @contractloop; if ( $count > 0) { $template->param(contractloop => \@contractloop, basketcontractnumber => $basket->{'contractnumber'}); } - my @booksellers = C4::Bookseller::GetBookSeller(); + my @booksellers = Koha::Acquisition::Booksellers->search( + undef, + { order_by => { -asc => 'name' } } ); + $template->param( add_form => 1, basketname => $basket->{'basketname'}, basketnote => $basket->{'note'}, basketbooksellernote => $basket->{'booksellernote'}, - booksellername => $bookseller->{'name'}, + booksellername => $bookseller->name, booksellerid => $booksellerid, basketno => $basketno, booksellers => \@booksellers, - deliveryplace => $basket->{deliveryplace}, - billingplace => $basket->{billingplace}, + is_standing => $basket->{is_standing}, + create_items => $basket->{create_items}, ); my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"}; my $deliveryplace = $basket->{'deliveryplace'} || C4::Context->userenv->{"branch"}; - # Build the combobox to select the billing place - my @billingplaceloop; - - my $branches = C4::Branch::GetBranchesLoop( $billingplace ); - $template->param( billingplaceloop => $branches ); - $branches = C4::Branch::GetBranchesLoop( $deliveryplace ); - $template->param( deliveryplaceloop => $branches ); + $template->param( billingplace => $billingplace ); + $template->param( deliveryplace => $deliveryplace ); #End Edit } elsif ( $op eq 'add_validate' ) { @@ -132,27 +146,42 @@ if ( $op eq 'add_form' ) { if ( $is_an_edit ) { ModBasketHeader( $basketno, - $input->param('basketname'), - $input->param('basketnote'), - $input->param('basketbooksellernote'), - $input->param('basketcontractnumber') || undef, - $input->param('basketbooksellerid'), - $input->param('deliveryplace'), - $input->param('billingplace'), + scalar $input->param('basketname'), + scalar $input->param('basketnote'), + scalar $input->param('basketbooksellernote'), + scalar $input->param('basketcontractnumber') || undef, + scalar $input->param('basketbooksellerid'), + scalar $input->param('deliveryplace'), + scalar $input->param('billingplace'), + scalar $input->param('is_standing') ? 1 : undef, + scalar $input->param('create_items') ); } else { #New basket $basketno = NewBasket( - $booksellerid, + scalar $input->param('basketbooksellerid'), $loggedinuser, - $input->param('basketname'), - $input->param('basketnote'), - $input->param('basketbooksellernote'), - $input->param('basketcontractnumber') || undef, - undef, - $input->param('deliveryplace'), - $input->param('billingplace'), + scalar $input->param('basketname'), + scalar $input->param('basketnote'), + scalar $input->param('basketbooksellernote'), + scalar $input->param('basketcontractnumber') || undef, + scalar $input->param('deliveryplace'), + scalar $input->param('billingplace'), + scalar $input->param('is_standing') ? 1 : undef, + scalar $input->param('create_items') ); } + + my @additional_fields; + 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, + value => $value, + }; + } + Koha::Acquisition::Baskets->find($basketno)->set_additional_fields(\@additional_fields); + print $input->redirect('basket.pl?basketno='.$basketno); exit 0; }