# 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., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# 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.
use strict;
use warnings;
use C4::Acquisition;
use C4::Budgets;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId);
use C4::Dates qw/format_date/;
use C4::Debug;
$booksellerid = $basket->{booksellerid} unless $booksellerid;
my ($bookseller) = GetBookSellerFromId($booksellerid);
my $op = $query->param('op');
+if (!defined $op) {
+ $op = q{};
+}
+
+my $confirm_pref= C4::Context->preference("BasketConfirmations") || '1';
+$template->param( skip_confirm_reopen => 1) if $confirm_pref eq '2';
if ( $op eq 'delete_confirm' ) {
my $basketno = $query->param('basketno');
$basket->{creationdate} = "" unless ( $basket->{creationdate} );
$basket->{authorisedby} = $loggedinuser unless ( $basket->{authorisedby} );
my $contract = &GetContract($basket->{contractnumber});
- my $count = scalar GetOrders( $basketno);
$template->param(
basketno => $basketno,
basketname => $basket->{'basketname'},
address2 => $bookseller->{'address2'},
address3 => $bookseller->{'address3'},
address4 => $bookseller->{'address4'},
- count => $count,
);
-} elsif ($op eq 'attachbasket' && $template->{'param_map'}->{'CAN_user_acquisition_group_manage'} == 1) {
+} elsif ($op eq 'attachbasket' && $template->{'VARS'}->{'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');
+ my $confirm = $query->param('confirm') || $confirm_pref eq '2';
if ($confirm) {
my $basketno = $query->param('basketno');
my $booksellerid = $query->param('booksellerid');
});
ModBasket( { basketno => $basketno,
basketgroupid => $basketgroupid } );
- print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid);
+ print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');
} else {
- print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno='.$basketno.'&op=attachbasket&booksellerid=' . $booksellerid);
+ print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?supplierid=' . $booksellerid);
}
exit;
} else {
basketgroupname => $basket->{'basketname'});
}
-} elsif ($query->param('op') eq 'reopen') {
+} elsif ($op eq 'reopen') {
my $basket;
$basket->{basketno} = $query->param('basketno');
$basket->{closedate} = undef;
}
#if the basket is closed,and the user has the permission to edit basketgroups, display a list of basketgroups
my $basketgroups;
- my $member = GetMember($loggedinuser, "borrowernumber");
- if ($basket->{closedate} && haspermission({ flagsrequired => { acquisition => 'group_manage'} })) {
+ my $member = GetMember(borrowernumber => $loggedinuser);
+ if ($basket->{closedate} && haspermission({ acquisition => 'group_manage'} )) {
$basketgroups = GetBasketgroups($basket->{booksellerid});
- for (my $i=0; $i < scalar(@$basketgroups); $i++) {
- if ($basket->{basketgroupid} == @$basketgroups[$i]->{id}){
- @$basketgroups[$i]->{default} = 1;
+ for my $bg ( @{$basketgroups} ) {
+ if ($basket->{basketgroupid} && $basket->{basketgroupid} == $bg->{id}){
+ $bg->{default} = 1;
}
}
my %emptygroup = ( id => undef,
name => "No group");
if ( ! $basket->{basketgroupid} ) {
$emptygroup{default} = 1;
+ $emptygroup{nogroup} = 1;
}
unshift( @$basketgroups, \%emptygroup );
}
"loggedinuser: $loggedinuser; creationdate: %s; authorisedby: %s",
$basket->{creationdate}, $basket->{authorisedby};
+ #to get active currency
+ my $cur = GetCurrency();
+
+
my @results = GetOrders( $basketno );
- my $count = scalar @results;
- my $gist = $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
+ 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 $qty_total;
my @books_loop;
- for ( my $i = 0 ; $i < $count ; $i++ ) {
- my $rrp = $results[$i]->{'listprice'};
- my $qty = $results[$i]->{'quantity'} || 0;
+ for my $order ( @results ) {
+ my $rrp = $order->{'listprice'} || 0;
+ my $qty = $order->{'quantity'} || 0;
+ if (!defined $order->{quantityreceived}) {
+ $order->{quantityreceived} = 0;
+ }
+ for ( qw(rrp ecost quantityreceived)) {
+ if (!defined $order->{$_}) {
+ $order->{$_} = 0;
+ }
+ }
- my $budget = GetBudget( $results[$i]->{'budget_id'} );
- $rrp = ConvertCurrency( $results[$i]->{'currency'}, $rrp );
+ my $budget = GetBudget( $order->{'budget_id'} );
+ $rrp = ConvertCurrency( $order->{'currency'}, $rrp );
- $total_rrp += $qty * $results[$i]->{'rrp'};
- my $line_total = $qty * $results[$i]->{'ecost'};
+ $total_rrp += $qty * $order->{'rrp'};
+ my $line_total = $qty * $order->{'ecost'};
# FIXME: what about the "actual cost" field?
$qty_total += $qty;
- my %line = %{ $results[$i] };
- ($i%2) and $line{toggle} = 1;
+ my %line = %{ $order };
- $line{order_received} = ( $qty eq $results[$i]->{'quantityreceived'} );
+ $line{order_received} = ( $qty == $order->{'quantityreceived'} );
$line{basketno} = $basketno;
- $line{i} = $i;
$line{budget_name} = $budget->{budget_name};
$line{rrp} = sprintf( "%.2f", $line{'rrp'} );
$line{ecost} = sprintf( "%.2f", $line{'ecost'} );
$line{line_total} = sprintf( "%.2f", $line_total );
- $line{odd} = $i % 2;
if ($line{uncertainprice}) {
- $template->param( unclosable => 1 );
- for my $key (qw/ecost line_total rrp/) {
- $line{$key} .= '??';
- }
+ $template->param( uncertainprices => 1 );
+ $line{rrp} .= ' (Uncertain)';
}
if ($line{'title'}){
- my $volume = $results[$i]->{'volume'};
- my $seriestitle = $results[$i]->{'seriestitle'};
+ my $volume = $order->{'volume'};
+ my $seriestitle = $order->{'seriestitle'};
$line{'title'} .= " / $seriestitle" if $seriestitle;
$line{'title'} .= " / $volume" if $volume;
} else {
my $total_est_gste = $total_rrp_gste - ($total_rrp_gste * $discount);
my $contract = &GetContract($basket->{contractnumber});
+ my @orders = GetOrders($basketno);
+
+ my $borrower= GetMember('borrowernumber' => $loggedinuser);
+ my $budgets = GetBudgetHierarchy(q{},$borrower->{branchcode},$borrower->{borrowernumber});
+ my $has_budgets = 0;
+ foreach my $r (@{$budgets}) {
+ if (!defined $r->{budget_amount} || $r->{budget_amount} == 0) {
+ next;
+ }
+ $has_budgets = 1;
+ last;
+ }
+
$template->param(
basketno => $basketno,
basketname => $basket->{'basketname'},
name => $bookseller->{'name'},
entrydate => C4::Dates->new($results[0]->{'entrydate'},'iso')->output,
books_loop => \@books_loop,
- count => $count,
gist_rate => sprintf( "%.2f", $gist * 100 ) . '%',
total_rrp_gste => sprintf( "%.2f", $total_rrp_gste ),
total_est_gste => sprintf( "%.2f", $total_est_gste ),
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'},
+# currency => $bookseller->{'listprice'},
+ currency => $cur->{'currency'},
qty_total => $qty_total,
GST => $gist,
basketgroups => $basketgroups,
grouped => $basket->{basketgroupid},
+ unclosable => @orders ? 0 : 1,
+ has_budgets => $has_budgets,
);
}
projects / koha.git / blobdiff