# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
-use C4::Auth;
-use C4::Koha;
-use C4::Output;
+use Modern::Perl;
+use C4::Auth qw( get_template_and_user haspermission );
+use C4::Output qw( output_html_with_http_headers output_and_exit );
use CGI qw ( -utf8 );
-use C4::Acquisition;
-use C4::Budgets;
-use C4::Branch;
-use C4::Contract;
-use C4::Debug;
-use C4::Biblio;
-use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket
-use C4::Items;
-use C4::Suggestions;
-use Date::Calc qw/Add_Delta_Days/;
+use C4::Acquisition qw( GetBasket CanUserManageBasket GetBasketAsCSV NewBasket NewBasketgroup ModBasket ReopenBasket ModBasketUsers GetBasketgroup GetBasketgroups GetBasketUsers GetOrders GetOrder get_rounded_price );
+use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget );
+use C4::Contract qw( GetContract );
+use C4::Suggestions qw( GetSuggestion GetSuggestionInfoFromBiblionumber GetSuggestionInfo );
+use Koha::Biblios;
+use Koha::Acquisition::Baskets;
+use Koha::Acquisition::Booksellers;
+use Koha::Acquisition::Orders;
+use Koha::Libraries;
+use C4::Letters qw( SendAlerts );
+use Date::Calc qw( Add_Delta_Days );
+use Koha::Database;
+use Koha::EDI qw( create_edi_order );
+use Koha::CsvProfiles;
+use Koha::Patrons;
+
+use Koha::AdditionalFields;
=head1 NAME
=cut
-my $query = new CGI;
+our $query = CGI->new;
our $basketno = $query->param('basketno');
-my $booksellerid = $query->param('booksellerid');
+our $ean = $query->param('ean');
+our $booksellerid = $query->param('booksellerid');
my $duplinbatch = $query->param('duplinbatch');
-my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
+our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
{
template_name => "acqui/basket.tt",
query => $query,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { acquisition => 'order_manage' },
- debug => 1,
}
);
-my $basket = GetBasket($basketno);
+my $logged_in_patron = Koha::Patrons->find( $loggedinuser );
+
+our $basket = GetBasket($basketno);
$booksellerid = $basket->{booksellerid} unless $booksellerid;
-my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+my $schema = Koha::Database->new()->schema();
+my $rs = $schema->resultset('VendorEdiAccount')->search(
+ { vendor_id => $booksellerid, } );
+$template->param( ediaccount => ($rs->count > 0));
unless (CanUserManageBasket($loggedinuser, $basket, $userflags)) {
$template->param(
basketno => $basketno,
basketname => $basket->{basketname},
booksellerid => $booksellerid,
- name => $bookseller->{name}
+ booksellername => $bookseller->name,
);
output_html_with_http_headers $query, $cookie, $template->output;
exit;
# FIXME : the query->param('booksellerid') below is probably useless. The bookseller is always known from the basket
# if no booksellerid in parameter, get it from basket
# warn "=>".$basket->{booksellerid};
-my $op = $query->param('op');
-if (!defined $op) {
- $op = q{};
-}
+my $op = $query->param('op') // 'list';
-my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
+our $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
$template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2';
+my @messages;
+
if ( $op eq 'delete_confirm' ) {
- my $basketno = $query->param('basketno');
- my $delbiblio = $query->param('delbiblio');
- my @orders = GetOrders($basketno);
-#Delete all orders included in that basket, and all items received.
- foreach my $myorder (@orders){
- DelOrder($myorder->{biblionumber},$myorder->{ordernumber});
- }
-# if $delbiblio = 1, delete the records if possible
- if ((defined $delbiblio)and ($delbiblio ==1)){
- my @cannotdelbiblios ;
- foreach my $myorder (@orders){
- my $biblionumber = $myorder->{'biblionumber'};
- my $countbiblio = CountBiblioInOrders($biblionumber);
- my $ordernumber = $myorder->{'ordernumber'};
- my $subscriptions = scalar GetSubscriptionsId ($biblionumber);
- my $itemcount = GetItemsCount($biblionumber);
- my $error;
- if ($countbiblio == 0 && $itemcount == 0 && $subscriptions == 0) {
- $error = DelBiblio($myorder->{biblionumber}) }
- else {
- push @cannotdelbiblios, {biblionumber=> ($myorder->{biblionumber}),
- title=> $myorder->{'title'},
- author=> $myorder->{'author'},
- countbiblio=> $countbiblio,
- itemcount=>$itemcount,
- subscriptions=>$subscriptions};
- }
- if ($error) {
- push @cannotdelbiblios, {biblionumber=> ($myorder->{biblionumber}),
- title=> $myorder->{'title'},
- author=> $myorder->{'author'},
- othererror=> $error};
- }
+
+ output_and_exit( $query, $cookie, $template, 'insufficient_permission' )
+ unless $logged_in_patron->has_permission( { acquisition => 'delete_baskets' } );
+
+ my $basketno = $query->param('basketno');
+ my $delbiblio = $query->param('delbiblio');
+ my $basket_obj = Koha::Acquisition::Baskets->find($basketno);
+
+ my $orders = $basket_obj->orders;
+
+ my @cannotdelbiblios;
+
+ while ( my $order = $orders->next ) {
+ # cancel the order
+ $order->cancel({ delete_biblio => $delbiblio });
+ my @messages = @{ $order->messages };
+
+ if ( scalar @messages > 0 ) {
+
+ my $biblio = $order->biblio;
+
+ push @cannotdelbiblios, {
+ biblionumber => $biblio->id,
+ title => $biblio->title // '',
+ author => $biblio->author // '',
+ countbiblio => $biblio->active_orders->count,
+ itemcount => $biblio->items->count,
+ subscriptions => $biblio->subscriptions->count,
+ };
}
- $template->param( cannotdelbiblios => \@cannotdelbiblios );
}
- # delete the basket
- DelBasket($basketno,);
- $template->param( delete_confirmed => 1 );
+
+ $template->param( cannotdelbiblios => \@cannotdelbiblios );
+
+ # delete the basket
+ $basket_obj->delete;
+ $template->param(
+ delete_confirmed => 1,
+ booksellername => $bookseller->name,
+ booksellerid => $booksellerid,
+ );
} elsif ( !$bookseller ) {
$template->param( NO_BOOKSELLER => 1 );
} elsif ($op eq 'export') {
-type => 'text/csv',
-attachment => 'basket' . $basket->{'basketno'} . '.csv',
);
- print GetBasketAsCSV($query->param('basketno'), $query);
+ my $csv_profile_id = $query->param('csv_profile');
+ print GetBasketAsCSV( scalar $query->param('basketno'), $query, $csv_profile_id ); # if no csv_profile_id passed, using default rows
exit;
+} elsif ($op eq 'email') {
+ my $err = eval {
+ SendAlerts( 'orderacquisition', $query->param('basketno'), 'ACQORDER' );
+ };
+ if ( $@ ) {
+ push @messages, { type => 'error', code => $@ };
+ } elsif ( ref $err and exists $err->{error} ) {
+ push @messages, { type => 'error', code => $err->{error} };
+ } else {
+ push @messages, { type => 'message', code => 'email_sent' };
+ }
+
+ $op = 'list';
} elsif ($op eq 'close') {
my $confirm = $query->param('confirm') || $confirm_pref eq '2';
if ($confirm) {
- my $basketno = $query->param('basketno');
- my $booksellerid = $query->param('booksellerid');
- $basketno =~ /^\d+$/ and CloseBasket($basketno);
+
+ # close the basket
+ # FIXME: we should fetch the object at the beginning of this script
+ # and get rid of the hash that is passed around
+ Koha::Acquisition::Baskets->find($basketno)->close;
+
# if requested, create basket group, close it and attach the basket
if ($query->param('createbasketgroup')) {
my $branchcode;
- if(C4::Context->userenv and C4::Context->userenv->{'branch'}
- and C4::Context->userenv->{'branch'} ne "NO_LIBRARY_SET") {
+ if(C4::Context->userenv and C4::Context->userenv->{'branch'}) {
$branchcode = C4::Context->userenv->{'branch'};
}
my $basketgroupid = NewBasketgroup( { name => $basket->{basketname},
$template->param(
confirm_close => "1",
booksellerid => $booksellerid,
+ booksellername => $bookseller->name,
basketno => $basket->{'basketno'},
basketname => $basket->{'basketname'},
basketgroupname => $basket->{'basketname'},
);
}
} elsif ($op eq 'reopen') {
- ReopenBasket($query->param('basketno'));
+ ReopenBasket(scalar $query->param('basketno'));
print $query->redirect('/cgi-bin/koha/acqui/basket.pl?basketno='.$basket->{'basketno'})
+}
+elsif ( $op eq 'ediorder' ) {
+ edi_close_and_order()
} elsif ( $op eq 'mod_users' ) {
my $basketusers_ids = $query->param('users_ids');
my @basketusers = split( /:/, $basketusers_ids );
});
print $query->redirect("/cgi-bin/koha/acqui/basket.pl?basketno=$basketno");
exit;
-} else {
+}
+
+if ( $op eq 'list' ) {
my @branches_loop;
# get librarian branch...
if ( C4::Context->preference("IndependentBranches") ) {
|| ( $basket->{branch} eq '' );
unless ($validtest) {
print $query->redirect("../mainpage.pl");
- exit 1;
+ exit 0;
}
}
+
if (!defined $basket->{branch} or $basket->{branch} eq $userenv->{branch}) {
push @branches_loop, {
branchcode => $userenv->{branch},
}
} else {
# get branches
- my $branches = C4::Branch::GetBranches;
- my @branchcodes = sort {
- $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
- } keys %$branches;
- foreach my $branch (@branchcodes) {
+ my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } )->unblessed;
+ foreach my $branch (@$branches) {
my $selected = 0;
if (defined $basket->{branch}) {
- $selected = 1 if $branch eq $basket->{branch};
+ $selected = 1 if $branch->{branchcode} eq $basket->{branch};
} else {
- $selected = 1 if $branch eq C4::Context->userenv->{branch};
+ $selected = 1 if $branch->{branchcode} eq C4::Context->userenv->{branch};
}
push @branches_loop, {
- branchcode => $branch,
- branchname => $branches->{$branch}->{branchname},
+ branchcode => $branch->{branchcode},
+ branchname => $branch->{branchname},
selected => $selected
};
}
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
my ($basketgroup, $basketgroups);
- my $staffuser = GetMember(borrowernumber => $loggedinuser);
- if ($basket->{closedate} && haspermission($staffuser->{userid}, { acquisition => 'group_manage'} )) {
+ my $patron = Koha::Patrons->find($loggedinuser);
+ if ($basket->{closedate} && haspermission($patron->userid, { acquisition => 'group_manage'} )) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
for my $bg ( @{$basketgroups} ) {
if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
my $estimateddeliverydate;
if( $basket->{closedate} ) {
my ($year, $month, $day) = ($basket->{closedate} =~ /(\d+)-(\d+)-(\d+)/);
- ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $bookseller->{deliverytime});
+ ($year, $month, $day) = Add_Delta_Days($year, $month, $day, $bookseller->deliverytime);
$estimateddeliverydate = sprintf( "%04d-%02d-%02d", $year, $month, $day );
}
# if new basket, pre-fill infos
$basket->{creationdate} = "" unless ( $basket->{creationdate} );
$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
- $debug
- and warn sprintf
- "loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
- $basket->{creationdate}, $basket->{authorisedby};
my @basketusers_ids = GetBasketUsers($basketno);
my @basketusers;
foreach my $basketuser_id (@basketusers_ids) {
- my $basketuser = GetMember(borrowernumber => $basketuser_id);
- push @basketusers, $basketuser if $basketuser;
+ # FIXME Could be improved with a search -in
+ my $basket_patron = Koha::Patrons->find( $basketuser_id );
+ push @basketusers, $basket_patron if $basket_patron;
}
- #to get active currency
- my $cur = GetCurrency();
-
+ my $active_currency = Koha::Acquisition::Currencies->get_active;
my @orders = GetOrders( $basketno );
my @books_loop;
my @book_foot_loop;
my %foot;
my $total_quantity = 0;
- my $total_gste = 0;
- my $total_gsti = 0;
- my $total_gstvalue = 0;
+ my $total_tax_excluded = 0;
+ my $total_tax_included = 0;
+ my $total_tax_value = 0;
for my $order (@orders) {
- $order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $booksellerid, ordering => 1 });
my $line = get_order_infos( $order, $bookseller);
if ( $line->{uncertainprice} ) {
$template->param( uncertainprices => 1 );
}
+ $line->{tax_rate} = $line->{tax_rate_on_ordering} // 0;
+ $line->{tax_value} = $line->{tax_value_on_ordering} // 0;
+
push @books_loop, $line;
- $foot{$$line{gstrate}}{gstrate} = $$line{gstrate};
- $foot{$$line{gstrate}}{gstvalue} += $$line{gstvalue};
- $total_gstvalue += $$line{gstvalue};
- $foot{$$line{gstrate}}{quantity} += $$line{quantity};
+ $foot{$$line{tax_rate}}{tax_rate} = $$line{tax_rate};
+ $foot{$$line{tax_rate}}{tax_value} += get_rounded_price($$line{tax_value});
+ $total_tax_value += $$line{tax_value};
+ $foot{$$line{tax_rate}}{quantity} += get_rounded_price($$line{quantity});
$total_quantity += $$line{quantity};
- $foot{$$line{gstrate}}{totalgste} += $$line{totalgste};
- $total_gste += $$line{totalgste};
- $foot{$$line{gstrate}}{totalgsti} += $$line{totalgsti};
- $total_gsti += $$line{totalgsti};
+ $foot{$$line{tax_rate}}{total_tax_excluded} += $$line{total_tax_excluded};
+ $total_tax_excluded += $$line{total_tax_excluded};
+ $foot{$$line{tax_rate}}{total_tax_included} += $$line{total_tax_included};
+ $total_tax_included += $$line{total_tax_included};
}
push @book_foot_loop, map {$_} values %foot;
my @cancelledorders = GetOrders($basketno, { cancelled => 1 });
my @cancelledorders_loop;
for my $order (@cancelledorders) {
- $order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $booksellerid, ordering => 1 });
my $line = get_order_infos( $order, $bookseller);
push @cancelledorders_loop, $line;
}
if ($basket->{basketgroupid}){
$basketgroup = GetBasketgroup($basket->{basketgroupid});
- $basketgroup->{deliveryplacename} = C4::Branch::GetBranchName( $basketgroup->{deliveryplace} );
- $basketgroup->{billingplacename} = C4::Branch::GetBranchName( $basketgroup->{billingplace} );
}
- my $borrower= GetMember('borrowernumber' => $loggedinuser);
my $budgets = GetBudgetHierarchy;
my $has_budgets = 0;
foreach my $r (@{$budgets}) {
- if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
- next;
- }
next unless (CanUserUseBudget($loggedinuser, $r, $userflags));
$has_budgets = 1;
$template->param(
basketno => $basketno,
+ basket => $basket,
basketname => $basket->{'basketname'},
- basketbranchname => C4::Branch::GetBranchName($basket->{branch}),
+ basketbranchcode => $basket->{branch},
basketnote => $basket->{note},
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
users => \@basketusers,
closedate => $basket->{closedate},
estimateddeliverydate=> $estimateddeliverydate,
- deliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
- billingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
- active => $bookseller->{'active'},
- booksellerid => $bookseller->{'id'},
- name => $bookseller->{'name'},
+ is_standing => $basket->{is_standing},
+ deliveryplace => $basket->{deliveryplace},
+ billingplace => $basket->{billingplace},
+ active => $bookseller->active,
+ booksellerid => $bookseller->id,
+ booksellername => $bookseller->name,
books_loop => \@books_loop,
book_foot_loop => \@book_foot_loop,
cancelledorders_loop => \@cancelledorders_loop,
total_quantity => $total_quantity,
- total_gste => sprintf( "%.2f", $total_gste ),
- total_gsti => sprintf( "%.2f", $total_gsti ),
- total_gstvalue => sprintf( "%.2f", $total_gstvalue ),
- currency => $cur->{'currency'},
- listincgst => $bookseller->{listincgst},
+ total_tax_excluded => $total_tax_excluded,
+ total_tax_included => $total_tax_included,
+ total_tax_value => $total_tax_value,
+ currency => $active_currency->currency,
+ listincgst => $bookseller->listincgst,
basketgroups => $basketgroups,
basketgroup => $basketgroup,
grouped => $basket->{basketgroupid},
- unclosable => @orders ? 0 : 1,
+ # The double negatives and booleans here mean:
+ # "A basket cannot be closed if there are no orders in it or it's a standing order basket."
+ #
+ # (The template has another implicit restriction that the order cannot be closed if there
+ # are any orders with uncertain prices.)
+ unclosable => @orders || @cancelledorders ? $basket->{is_standing} : 1,
has_budgets => $has_budgets,
duplinbatch => $duplinbatch,
+ csv_profiles => [ Koha::CsvProfiles->search({ type => 'sql', used_for => 'export_basket' }) ],
+ available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'aqbasket' } ) ],
+ additional_field_values => { map {
+ $_->field->name => $_->value
+ } Koha::Acquisition::Baskets->find($basketno)->additional_field_values->as_list },
);
}
+$template->param( messages => \@messages );
+output_html_with_http_headers $query, $cookie, $template->output;
+
sub get_order_infos {
my $order = shift;
my $bookseller = shift;
if ( !defined $order->{quantityreceived} ) {
$order->{quantityreceived} = 0;
}
- my $budget = GetBudget( $order->{'budget_id'} );
+ my $budget = GetBudget($order->{budget_id});
+ my $basket = GetBasket($order->{basketno});
my %line = %{ $order };
- $line{order_received} = ( $qty == $order->{'quantityreceived'} );
+ # Don't show unreceived standing orders as received
+ $line{order_received} = ( $qty == $order->{'quantityreceived'} && ( $basket->{is_standing} ? $qty : 1 ) );
$line{basketno} = $basketno;
$line{budget_name} = $budget->{budget_name};
- if ( $line{uncertainprice} ) {
- $line{rrpgste} .= ' (Uncertain)';
- }
+ # If we have an actual cost that should be the total, otherwise use the ecost
+ $line{unitprice_tax_included} += 0;
+ $line{unitprice_tax_excluded} += 0;
+ my $cost_tax_included = $line{unitprice_tax_included} || $line{ecost_tax_included};
+ my $cost_tax_excluded = $line{unitprice_tax_excluded} || $line{ecost_tax_excluded};
+ $line{total_tax_included} = get_rounded_price($cost_tax_included) * $line{quantity};
+ $line{total_tax_excluded} = get_rounded_price($cost_tax_excluded) * $line{quantity};
+ $line{tax_value} = $line{tax_value_on_ordering};
+ $line{tax_rate} = $line{tax_rate_on_ordering};
+
if ( $line{'title'} ) {
my $volume = $order->{'volume'};
my $seriestitle = $order->{'seriestitle'};
$line{'title'} .= " / $seriestitle" if $seriestitle;
$line{'title'} .= " / $volume" if $volume;
- } else {
- $line{'title'} = "Deleted bibliographic notice, can't find title.";
}
my $biblionumber = $order->{'biblionumber'};
- my $countbiblio = CountBiblioInOrders($biblionumber);
- my $ordernumber = $order->{'ordernumber'};
- my @subscriptions = GetSubscriptionsId ($biblionumber);
- my $itemcount = GetItemsCount($biblionumber);
- my $holds = GetHolds ($biblionumber);
- my @items = GetItemnumbersFromOrder( $ordernumber );
- my $itemholds;
- foreach my $item (@items){
- my $nb = GetItemHolds($biblionumber, $item);
- if ($nb){
- $itemholds += $nb;
- }
+ if ( $biblionumber ) { # The biblio still exists
+ my $biblio = Koha::Biblios->find( $biblionumber );
+ my $countbiblio = $biblio->active_orders->count;
+
+ my $ordernumber = $order->{'ordernumber'};
+ my $cnt_subscriptions = $biblio->subscriptions->count;
+ my $itemcount = $biblio->items->count;
+ my $holds_count = $biblio->holds->count;
+ my $order = Koha::Acquisition::Orders->find($ordernumber); # FIXME We should certainly do that at the beginning of this sub
+ my $items = $order->items;
+ my $itemholds = $biblio->holds->search({ itemnumber => { -in => [ $items->get_column('itemnumber') ] } })->count;
+
+ # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
+ $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == $items->count && !($cnt_subscriptions) && !($holds_count);
+ $line{items} = $itemcount - $items->count;
+ $line{left_item} = 1 if $line{items} >= 1;
+ $line{left_biblio} = 1 if $countbiblio > 1;
+ $line{biblios} = $countbiblio - 1;
+ $line{left_subscription} = 1 if $cnt_subscriptions;
+ $line{subscriptions} = $cnt_subscriptions;
+ ($holds_count >= 1) ? $line{left_holds} = 1 : $line{left_holds} = 0;
+ $line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
+ $line{holds} = $holds_count;
+ $line{holds_on_order} = $itemholds?$itemholds:$holds_count if $line{left_holds_on_order};
+ $line{order_object} = $order;
}
- # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680
- $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds);
- $line{items} = ($itemcount) - (scalar @items);
- $line{left_item} = 1 if $line{items} >= 1;
- $line{left_biblio} = 1 if $countbiblio > 1;
- $line{biblios} = $countbiblio - 1;
- $line{left_subscription} = 1 if scalar @subscriptions >= 1;
- $line{subscriptions} = scalar @subscriptions;
- ($holds >= 1) ? $line{left_holds} = 1 : $line{left_holds} = 0;
- $line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds );
- $line{holds} = $holds;
- $line{holds_on_order} = $itemholds?$itemholds:$holds if $line{left_holds_on_order};
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
if ($line{$key}) {
my $order = GetOrder($line{$key});
my $basket = GetBasket($order->{basketno});
- my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $basket->{booksellerid} });
+ my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} );
$line{$key} = {
order => $order,
basket => $basket,
return \%line;
}
-output_html_with_http_headers $query, $cookie, $template->output;
+sub edi_close_and_order {
+ my $confirm = $query->param('confirm') || $confirm_pref eq '2';
+ if ($confirm) {
+ my $edi_params = {
+ basketno => $basketno,
+ ean => $ean,
+ };
+ if ( $basket->{branch} ) {
+ $edi_params->{branchcode} = $basket->{branch};
+ }
+ if ( create_edi_order($edi_params) ) {
+ #$template->param( edifile => 1 );
+ }
+ Koha::Acquisition::Baskets->find($basketno)->close;
+
+ # if requested, create basket group, close it and attach the basket
+ if ( $query->param('createbasketgroup') ) {
+ my $branchcode;
+ if ( C4::Context->userenv
+ and C4::Context->userenv->{'branch'} )
+ {
+ $branchcode = C4::Context->userenv->{'branch'};
+ }
+ my $basketgroupid = NewBasketgroup(
+ {
+ name => $basket->{basketname},
+ booksellerid => $booksellerid,
+ deliveryplace => $branchcode,
+ billingplace => $branchcode,
+ closed => 1,
+ }
+ );
+ ModBasket(
+ {
+ basketno => $basketno,
+ basketgroupid => $basketgroupid
+ }
+ );
+ print $query->redirect(
+"/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1"
+ );
+ }
+ else {
+ print $query->redirect(
+ "/cgi-bin/koha/acqui/booksellers.pl?booksellerid=$booksellerid"
+ );
+ }
+ exit;
+ }
+ else {
+ $template->param(
+ edi_confirm => 1,
+ booksellerid => $booksellerid,
+ basketno => $basket->{basketno},
+ basketname => $basket->{basketname},
+ basketgroupname => $basket->{basketname},
+ );
+ if ($ean) {
+ $template->param( ean => $ean );
+ }
+
+ }
+ return;
+}
projects / srvgit / blobdiff