my $query = new CGI;
my $basketno = $query->param('basketno');
my $booksellerid = $query->param('supplierid');
-my $sort = $query->param('order') || "aqorders.ordernumber";
-
-my @sort_loop;
-if (defined $sort) {
- foreach (split /\,/, $sort) {
- my %sorthash = (
- string => $_,
- );
- # other possibly valid tables for later: aqbookfund biblio biblioitems
- if (
- (/^\s*(biblioitems)\.(\w+)\s*$/ and $2 eq 'publishercode') or
- (/^\s*(aqorders)\.(\w+)\s*$/ and $2 eq 'ordernumber' )
- ) {
- $sorthash{table} = $1;
- $sorthash{field} = $2;
- } else {
- $sorthash{error} = 1;
- }
- push @sort_loop, \%sorthash;
- }
-}
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
address4 => $bookseller->{'address4'},
count => $count,
);
+} elsif ($op eq 'attachbasket' && $template->{'param_map'}->{'CAN_user_acquisition_group_manage'} == 1) {
+ print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno=' . $basket->{'basketno'} . '&op=attachbasket&booksellerid=' . $booksellerid);
+ # check if we have to "close" a basket before building page
+} elsif ($op eq 'export') {
+ print $query->header(
+ -type => 'text/csv',
+ -attachment => 'basket' . $basket->{'basketno'} . '.csv',
+ );
+ print GetBasketAsCSV($query->param('basketno'));
+ exit;
+} elsif ($op eq 'close') {
+ my $confirm = $query->param('confirm');
+ if ($confirm) {
+ my $basketno = $query->param('basketno');
+ my $booksellerid = $query->param('booksellerid');
+ $basketno =~ /^\d+$/ and CloseBasket($basketno);
+ # if requested, create basket group, close it and attach the basket
+ if ($query->param('createbasketgroup')) {
+ my $basketgroupid = NewBasketgroup( { name => $basket->{basketname},
+ booksellerid => $booksellerid,
+ closed => 1,
+ });
+ ModBasket( { basketno => $basketno,
+ basketgroupid => $basketgroupid } );
+ print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid);
+ } else {
+ print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno='.$basketno.'&op=attachbasket&booksellerid=' . $booksellerid);
+ }
+ exit;
+ } else {
+ $template->param(confirm_close => "1",
+ booksellerid => $booksellerid,
+ basketno => $basket->{'basketno'},
+ basketname => $basket->{'basketname'},
+ basketgroupname => $basket->{'basketname'});
+
+ }
+} elsif ($query->param('op') eq 'reopen') {
+ my $basket;
+ $basket->{basketno} = $query->param('basketno');
+ $basket->{closedate} = undef;
+ ModBasket($basket);
+ print $query->redirect('/cgi-bin/koha/acqui/basket.pl?basketno='.$basket->{'basketno'})
} else {
# get librarian branch...
if ( C4::Context->preference("IndependantBranches") ) {
if ($basket->{closedate} && haspermission({ flagsrequired => { acquisition => 'group_manage'} })) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
for (my $i=0; $i < scalar(@$basketgroups); $i++) {
- if (@$basketgroups[$i]->{closed}) {
- splice(@$basketgroups, $i, 1);
- $i--;
- } elsif ($basket->{basketgroupid} == @$basketgroups[$i]->{id}){
+ if ($basket->{basketgroupid} == @$basketgroups[$i]->{id}){
@$basketgroups[$i]->{default} = 1;
}
}
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
$basket->{creationdate}, $basket->{authorisedby};
- my @results = GetOrders( $basketno, $sort );
+ my @results = GetOrders( $basketno );
my $count = scalar @results;
-
- my $sub_total; # total of line totals
- my $grand_total; # $subttotal + $gist
-
- # my $line_total_est; # total of each line
- my $sub_total_est; # total of line totals
- my $sub_total_rrp; # total of line totals
- my $grand_total_est; # $subttotal + $gist
-
+
+ my $gist = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
+ my $discount = $bookseller->{'discount'} / 100;
+ my $total_rrp; # RRP Total, its value will be assigned to $total_rrp_gsti or $total_rrp_gste depending of $bookseller->{'listincgst'}
+ my $total_rrp_gsti; # RRP Total, GST included
+ my $total_rrp_gste; # RRP Total, GST excluded
+ my $gist_rrp;
+
my $qty_total;
my @books_loop;
for ( my $i = 0 ; $i < $count ; $i++ ) {
my $rrp = $results[$i]->{'listprice'};
- my $qty = $results[$i]->{'quantity'};
+ my $qty = $results[$i]->{'quantity'} || 0;
my $budget = GetBudget( $results[$i]->{'budget_id'} );
$rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp );
- $sub_total_rrp += $qty * $results[$i]->{'rrp'};
+ $total_rrp += $qty * $results[$i]->{'rrp'};
my $line_total = $qty * $results[$i]->{'ecost'};
# FIXME: what about the "actual cost" field?
- $sub_total += $line_total;
$qty_total += $qty;
my %line = %{ $results[$i] };
($i%2) and $line{toggle} = 1;
$line{$key} .= '??';
}
}
- my $volume = $results[$i]->{'volume'};
- my $seriestitle = $results[$i]->{'seriestitle'};
- $line{'title'} .= " / $seriestitle" if $seriestitle;
- $line{'title'} .= " / $volume" if $volume;
+ if ($line{'title'}){
+ my $volume = $results[$i]->{'volume'};
+ my $seriestitle = $results[$i]->{'seriestitle'};
+ $line{'title'} .= " / $seriestitle" if $seriestitle;
+ $line{'title'} .= " / $volume" if $volume;
+ } else {
+ $line{'title'} = "Deleted bibliographic notice, can't find title.";
+ }
push @books_loop, \%line;
}
-
-
-
- my $prefgist = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
- my $gist = $sub_total * $prefgist;
- my $gist_rrp = $sub_total_rrp * $prefgist;
- $grand_total = $sub_total_est = $sub_total;
- $grand_total_est = $sub_total_est; # FIXME: Too many things that are ALL the SAME
- my $temp;
- if ($temp = $bookseller->{'listincgst'}) {
- $template->param(listincgst => $temp);
- $gist = 0;
- } else {
- $grand_total += $gist;
- $grand_total_est += $sub_total_est * $prefgist; # same thing as += gist
- }
- if ($temp = $bookseller->{'discount'}) {
- $template->param(discount => sprintf( "%.2f", $temp ));
+ if ($bookseller->{'listincgst'}) { # if prices already includes GST
+ $total_rrp_gsti = $total_rrp; # we know $total_rrp_gsti
+ $total_rrp_gste = $total_rrp_gsti / ($gist + 1); # and can reverse compute other values
+ $gist_rrp = $total_rrp_gsti - $total_rrp_gste; #
+ } else { # if prices does not include GST
+ $total_rrp_gste = $total_rrp; # then we use the common way to compute other values
+ $gist_rrp = $total_rrp_gste * $gist; #
+ $total_rrp_gsti = $total_rrp_gste + $gist_rrp; #
}
+ # These vars are estimated totals and GST, taking in account the booksellet discount
+ my $total_est_gsti = $total_rrp_gsti - ($total_rrp_gsti * $discount);
+ my $gist_est = $gist_rrp - ($gist_rrp * $discount);
+ my $total_est_gste = $total_rrp_gste - ($total_rrp_gste * $discount);
+
my $contract = &GetContract($basket->{contractnumber});
$template->param(
basketno => $basketno,
basketbooksellernote => $basket->{booksellernote},
basketcontractno => $basket->{contractnumber},
basketcontractname => $contract->{contractname},
- creationdate => format_date( $basket->{creationdate} ),
+ creationdate => C4::Dates->new($basket->{creationdate},'iso')->output,
authorisedby => $basket->{authorisedby},
authorisedbyname => $basket->{authorisedbyname},
- closedate => format_date( $basket->{closedate} ),
+ closedate => C4::Dates->new($basket->{closedate},'iso')->output,
active => $bookseller->{'active'},
booksellerid => $bookseller->{'id'},
name => $bookseller->{'name'},
- address1 => $bookseller->{'address1'},
- address2 => $bookseller->{'address2'},
- address3 => $bookseller->{'address3'},
- address4 => $bookseller->{'address4'},
- entrydate => format_date( $results[0]->{'entrydate'} ),
+ entrydate => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
books_loop => \@books_loop,
- sort_loop => \@sort_loop,
count => $count,
- gist => $gist ? sprintf( "%.2f", $gist ) : 0,
- gist_rate => sprintf( "%.2f", $prefgist * 100 ) . '%',
- gist_est => sprintf( "%.2f", $sub_total_est * $prefgist ),
- gist_rrp => sprintf( "%.2f", $gist_rrp ),
- sub_total => sprintf( "%.2f", $sub_total ),
- grand_total => sprintf( "%.2f", $grand_total ),
- sub_total_est => sprintf( "%.2f", $sub_total_est ),
- grand_total_est => sprintf( "%.2f", $grand_total_est ),
- sub_total_rrp => sprintf( "%.2f", $sub_total_rrp ),
- grand_total_rrp => sprintf( "%.2f", $sub_total_rrp + $gist_rrp ),
- currency => $bookseller->{'listprice'},
- qty_total => $qty_total,
- GST => $prefgist,
- basketgroups => $basketgroups,
- grouped => $basket->{basketgroupid},
+ gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',
+ total_rrp_gste => sprintf( "%.2f", $total_rrp_gste ),
+ total_est_gste => sprintf( "%.2f", $total_est_gste ),
+ gist_est => sprintf( "%.2f", $gist_est ),
+ gist_rrp => sprintf( "%.2f", $gist_rrp ),
+ total_rrp_gsti => sprintf( "%.2f", $total_rrp_gsti ),
+ total_est_gsti => sprintf( "%.2f", $total_est_gsti ),
+ currency => $bookseller->{'listprice'},
+ qty_total => $qty_total,
+ GST => $gist,
+ basketgroups => $basketgroups,
+ grouped => $basket->{basketgroupid},
);
}
+
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff