Attachment #59306 for bug #11708

View | Details | Raw Unified | Return to bug 11708
Collapse All | Expand All




package Koha::Basket;

# 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 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.
#
# 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 Modern::Perl;

use Koha::Orders;

use base qw(Koha::Object);

sub _type {
    return 'Aqbasket';
}

sub orders {
    my ($self) = @_;

    $self->{_orders} ||= Koha::Orders->search({ basketno => $self->basketno });

    return wantarray ? $self->{_orders}->as_list : $self->{_orders};
}

1;




package Koha::Basketgroup;

# 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 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.
#
# 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 Modern::Perl;

use List::MoreUtils qw/uniq/;

use Koha::Baskets;

use base qw(Koha::Object);

sub _type {
    return 'Aqbasketgroup';
}

sub bookseller {
    my ($self) = @_;

    return Koha::Booksellers->find($self->booksellerid);
}

sub baskets {
    my ($self) = @_;

    $self->{_baskets} ||= Koha::Baskets->search({ basketgroupid => $self->id });

    return wantarray ? $self->{_baskets}->as_list : $self->{_baskets};
}

sub baskets_count {
    my ($self) = @_;

    return $self->baskets->count;
}

sub ordered_titles_count {
    my ($self) = @_;

    my @biblionumbers;
    foreach my $basket ($self->baskets) {
        foreach my $order ($basket->orders) {
            push @biblionumbers, $order->biblionumber;
        }
    }

    return scalar uniq @biblionumbers;
}

sub received_titles_count {
    my ($self) = @_;

    my @biblionumbers;
    foreach my $basket ($self->baskets) {
        foreach my $order ($basket->orders) {
            if ($order->datereceived) {
                push @biblionumbers, $order->biblionumber;
            }
        }
    }

    return scalar uniq @biblionumbers;
}

1;




package Koha::Basketgroups;

# 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 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.
#
# 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 Modern::Perl;

use Koha::Basketgroup;

use base qw(Koha::Objects);

sub _type {
    return 'Aqbasketgroup';
}

sub object_class {
    return 'Koha::Basketgroup';
}

1;




package Koha::Baskets;

# 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 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.
#
# 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 Modern::Perl;

use Koha::Basket;

use base qw(Koha::Objects);

sub _type {
    return 'Aqbasket';
}

sub object_class {
    return 'Koha::Basket';
}

1;




package Koha::Bookseller;

# 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 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.
#
# 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 Modern::Perl;

use base qw(Koha::Object);

sub _type {
    return 'Aqbookseller';
}

1;




package Koha::Booksellers;

# 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 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.
#
# 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 Modern::Perl;

use Koha::Bookseller;

use base qw(Koha::Objects);

sub _type {
    return 'Aqbookseller';
}

sub object_class {
    return 'Koha::Bookseller';
}

1;




package Koha::Order;

# 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 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.
#
# 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 Modern::Perl;

use base qw(Koha::Object);

sub _type {
    return 'Aqorder';
}

1;




package Koha::Orders;

# 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 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.
#
# 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 Modern::Perl;

use Koha::Order;

use base qw(Koha::Objects);

sub _type {
    return 'Aqorder';
}

sub object_class {
    return 'Koha::Order';
}

1;

Lines 200-206 if ( $op eq 'delete_confirm' ) { Link Here

(-)a/acqui/basket.pl (-2 / +2 lines)
200	});	200	});
201	ModBasket( { basketno => $basketno,	201	ModBasket( { basketno => $basketno,
202	basketgroupid => $basketgroupid } );	202	basketgroupid => $basketgroupid } );
203	print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1');	203	print $query->redirect('/cgi-bin/koha/acqui/basketgroups.pl?booksellerid='.$booksellerid);
204	} else {	204	} else {
205	print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);	205	print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid);
206	}	206	}
Lines 547-553 sub edi_close_and_order { Link Here
547	}	547	}
548	);	548	);
549	print $query->redirect(	549	print $query->redirect(
550	"/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1"	550	"/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=$booksellerid"
551	);	551	);
552	}	552	}
553	else {	553	else {





#displays all basketgroups and all closed baskets (in their respective groups)
sub displaybasketgroups {
    my ($basketgroups, $bookseller, $baskets, $template) = @_;
    my $bookseller = shift;
    my $baskets = shift;
    if (scalar @$basketgroups != 0) {
        foreach my $basketgroup (@$basketgroups){
            my $i = 0;

    return;
}

my $op = $input->param('op') || 'display';
# possible values of $op :
# - add : adds a new basketgroup, or edit an open basketgroup, or display a closed basketgroup
# - mod_basket : modify an individual basket of the basketgroup
# - closeandprint : close and print an closed basketgroup in pdf. called by
#   clicking on "Close and print" button in closed basketgroups list
# - print : print a closed basketgroup. called by clicking on "Print" button in
#   closed basketgroups list
# - ediprint : generate edi order messages for the baskets in the group
# - export : export in CSV a closed basketgroup. called by clicking on "Export"
#   button in closed basketgroups list
# - delete : delete an open basketgroup. called by clicking on "Delete" button
#   in open basketgroups list
# - reopen : reopen a closed basketgroup. called by clicking on "Reopen" button
#   in closed basketgroup list
# - attachbasket : save a modified basketgroup, or creates a new basketgroup
#   when a basket is closed. called from basket page
my $op = $input->param('op');
my $booksellerid = $input->param('booksellerid');
$template->param(booksellerid => $booksellerid);

if ($op eq 'mod_basket') {
#
# if no param('basketgroupid') is not defined, adds a new basketgroup
# else, edit (if it is open) or display (if it is close) the basketgroup basketgroupid
# the template will know if basketgroup must be displayed or edited, depending on the value of closed key
#
    my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
    my $basketgroupid = $input->param('basketgroupid');
    my $billingplace;
    my $deliveryplace;
    my $freedeliveryplace;
    if ( $basketgroupid ) {
        # Get the selected baskets in the basketgroup to display them
        my $selecteds = GetBasketsByBasketgroup($basketgroupid);
        foreach my $basket(@{$selecteds}){
            $basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
        }
        $template->param(basketgroupid => $basketgroupid,
                         selectedbaskets => $selecteds);

        # Get general informations about the basket group to prefill the form
        my $basketgroup = GetBasketgroup($basketgroupid);
        $template->param(
            name            => $basketgroup->{name},
            deliverycomment => $basketgroup->{deliverycomment},
            freedeliveryplace => $basketgroup->{freedeliveryplace},
        );
        $billingplace  = $basketgroup->{billingplace};
        $deliveryplace = $basketgroup->{deliveryplace};
        $freedeliveryplace = $basketgroup->{freedeliveryplace};
        $template->param( closedbg => ($basketgroup ->{'closed'}) ? 1 : 0);
    } else {
        $template->param( closedbg => 0);
    }
    # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
    my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
    $billingplace  = $billingplace  || $borrower->{'branchcode'};
    $deliveryplace = $deliveryplace || $borrower->{'branchcode'};

    $template->param( billingplace => $billingplace );
    $template->param( deliveryplace => $deliveryplace );
    $template->param( booksellerid => $booksellerid );

    # the template will display a unique basketgroup
    $template->param(grouping => 1);
    my $basketgroups = &GetBasketgroups($booksellerid);
    my $baskets = &GetBasketsByBookseller($booksellerid);
    displaybasketgroups($basketgroups, $bookseller, $baskets);
} elsif ($op eq 'mod_basket') {
#
# edit an individual basket contained in this basketgroup
#

#
    my $basketgroupid = $input->param('basketgroupid');
    DelBasketgroup($basketgroupid);
    print $input->redirect('/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' . $booksellerid);
    exit;
}elsif ( $op eq 'reopen'){
#
# reopen a closed basketgroup

    my $basketgroupid   = $input->param('basketgroupid');
    my $booksellerid    = $input->param('booksellerid');
    ReOpenBasketgroup($basketgroupid);
    my $redirectpath;
    my $mode = $input->param('mode');
    if (defined $mode && $mode eq 'singlebg') {
        $redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;basketgroupid='.$basketgroupid.'&amp;booksellerid='.$booksellerid;
    } else {
        $redirectpath = '/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' .$booksellerid;
    }
    print $input->redirect($redirectpath);
    exit;
} elsif ( $op eq 'attachbasket') {
#
# save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page

        };
        $basketgroupid = NewBasketgroup($basketgroup);
    }
    my $redirectpath;
    my $mode = $input->param('mode');
    if (defined $mode && $mode eq 'singlebg') {
        $redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;basketgroupid='.$basketgroupid.'&amp;booksellerid='.$booksellerid;
    } else {
        $redirectpath = '/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' . $booksellerid;
    }
    print $input->redirect($redirectpath);
    exit;
} elsif ( $op eq 'ediprint') {
    my $basketgroupid = $input->param('basketgroupid');
    generate_edifact_orders( $basketgroupid );
    exit;
}

# if no param('basketgroupid') is not defined, adds a new basketgroup else, edit
# (if it is open) or display (if it is close) the basketgroup basketgroupid the
# template will know if basketgroup must be displayed or edited, depending on
# the value of closed key

my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
my $basketgroupid = $input->param('basketgroupid');
my $billingplace;
my $deliveryplace;
my $freedeliveryplace;
if ( $basketgroupid ) {
    # Get the selected baskets in the basketgroup to display them
    my $selecteds = GetBasketsByBasketgroup($basketgroupid);
    foreach my $basket(@{$selecteds}){
        $basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
                my @orders = GetOrders($basket->{basketno});
                foreach my $order (@orders) {
                    push @ordered_biblionumbers, $order->{biblionumber};
                    if ($order->{datereceived}) {
                        push @received_biblionumbers, $order->{biblionumber};
                    }
                }
            }
            $basketgroup->{ordered_titles_count} = uniq @ordered_biblionumbers;
            $basketgroup->{received_titles_count} = uniq @received_biblionumbers;
        }
    }
    $template->param(basketgroupid => $basketgroupid,
                     selectedbaskets => $selecteds);

    # Get general informations about the basket group to prefill the form
    my $basketgroup = GetBasketgroup($basketgroupid);
    $template->param(
        name => $basketgroup->{name},
        billingplace => $basketgroup->{billingplace},
        deliveryplace => $basketgroup->{deliveryplace},
        deliverycomment => $basketgroup->{deliverycomment},
        freedeliveryplace => $basketgroup->{freedeliveryplace},
        closedbg => $basketgroup->{closed} ? 1 : 0
    );
} else {
    $template->param( closedbg => 0);
}
# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
$billingplace  = $billingplace  || $borrower->{'branchcode'};
$deliveryplace = $deliveryplace || $borrower->{'branchcode'};

$template->param( booksellerid => $booksellerid );

# the template will display a unique basketgroup
my $basketgroups = &GetBasketgroups($booksellerid);
my $baskets = &GetBasketsByBookseller($booksellerid);
displaybasketgroups($basketgroups, $bookseller, $baskets, $template);

output_html_with_http_headers $input, $cookie, $template->output;




#!/usr/bin/perl

# 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 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.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI qw(-utf8);

use C4::Auth;
use C4::Output;

use Koha::Acquisition::Basketgroups;
use Koha::Acquisition::Booksellers;

my $cgi = new CGI;

my ($template, $loggedinuser, $cookie) = get_template_and_user({
    template_name => 'acqui/basketgroups.tt',
    query => $cgi,
    type => 'intranet',
    flagsrequired => { acquisition => 'group_manage' },
});

my $booksellerid = $cgi->param('booksellerid');

my $params = {};
if ($booksellerid) {
    $params->{booksellerid} = $booksellerid;
    my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
    $template->param(bookseller => $bookseller);
}

my @basketgroups = Koha::Acquisition::Basketgroups->search($params);

$template->param(
    basketgroups => \@basketgroups,
);

output_html_with_http_headers $cgi, $cookie, $template->output;

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-1 / +1 lines)
1	<ul>	1	<ul>
2	[% IF ( CAN_user_acquisition_group_manage ) %]	2	[% IF ( CAN_user_acquisition_group_manage ) %]
3	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>	3	<li><a href="/cgi-bin/koha/acqui/basketgroups.pl">Basket groups</a></li>
4	[% END %]	4	[% END %]
5	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>	5	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
6	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]	6	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% ELSE %][% END %]

Lines 19-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc (+2 lines)
19	var MSG_DT_SEARCH = _("Search:");	19	var MSG_DT_SEARCH = _("Search:");
20	var MSG_DT_ZERO_RECORDS = _("No matching records found");	20	var MSG_DT_ZERO_RECORDS = _("No matching records found");
21	var MSG_DT_ALL = _("All");	21	var MSG_DT_ALL = _("All");
		22	var MSG_DT_SORT_ASC = _(": activate to sort column ascending");
		23	var MSG_DT_SORT_DESC = _(": activate to sort column descending");
22	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");	24	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");
23	//]]>	25	//]]>
24	</script>	26	</script>

Lines 2-8 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc (-1 / +1 lines)
2	<div id="menu">	2	<div id="menu">
3	<ul>	3	<ul>
4	[% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">Baskets</a></li>[% END %]	4	[% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]">Baskets</a></li>[% END %]
5	[% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a></li>[% END %]	5	[% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=[% booksellerid %]">Basket groups</a></li>[% END %]
6	[% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>[% END %]	6	[% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a></li>[% END %]
7	<li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&op=do_search">Invoices</a></li>	7	<li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid %]&op=do_search">Invoices</a></li>
8	[% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]	8	[% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %]




<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min.js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/menu/menu-min.js"></script>
<script type="text/javascript" src="[% interface %]/[% theme %]/js/basketgroup.js"></script>
[% IF ( grouping ) %]
<script type="text/javascript" src="[% interface %]/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/animation/animation-min.js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/dragdrop/dragdrop-min.js"></script>

}

</style>
 [% END %]
<script type="text/javascript">
//<![CDATA[
	YAHOO.util.Event.onDOMReady(DDApp.init, DDApp, true);

[% INCLUDE 'acquisitions-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a>
    &rsaquo;
    <a href="/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=[% booksellerid %]">Basket groups</a>
    &rsaquo;
    Add basket group for [% booksellername |html %]
  [% END %]
  Basket groups
[% END %]
</div>

<div id="doc3" class="yui-t2">
    <div id="bd">
        <div id="yui-main">
            <div class="yui-b">
                [% IF (closedbg) %]
                    <div id="toolbar" class="btn-toolbar">
                        <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
                        <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
                        <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
                        <div class="btn-group"><a href="[% script_name %]?op=ediprint&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
                    </div>
                [% END %]
                [% IF (name && closedbg) %]
                    <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
                [% ELSIF (name) %]
                    <h1>Edit basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
                [% ELSE %]
                    <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
                [% END %]
                <div id="basketgroupcolumns" class="yui-g">
                    [% UNLESS (closedbg) %]
                        <div class="yui-u">
                            <form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
                                <div id="groups">
                                    <fieldset class="brief">
                                        <div class="workarea_alt" >
                                            <h3>Ungrouped baskets</h3>
                                            <ul id="ungrouped" class="draglist_alt">
                                                [% IF ( baskets ) %]
                                                    [% FOREACH basket IN baskets %]
                                                        <li class="ungrouped" id="b-[% basket.basketno %]" >
                                                            <a href="basket.pl?basketno=[% basket.basketno %]">
                                                                [% IF ( basket.basketname ) %]
                                                                    [% basket.basketname %]
                                                                [% ELSE %]
                                                                    No name, basketnumber: [% basket.basketno %]
                                                                [% END %]
                                                            </a>, <br />
                                                            Total: [% basket.total %]
                                                            <input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />
                                                        </li>
                                                    [% END %]
                                                [% END %]
                                            </ul>
                                        </div>
                                    </fieldset>
                                </div>
                            </form>
                        </div>
                    [% END %]
                    <div class="yui-u first">
                        <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
                            <fieldset id="various" class="brief">
                                <ol>
                                    [% UNLESS (closedbg) %]
                                        <li>
                                            <label for="basketgroupname">Basket group name:</label>
                                            <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" />
                                        </li>
                                    [% ELSE %]
                                        <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
                                    [% END %]
                                    <li>
                                            <div class="workarea_alt" >
                                                <h3>Ungrouped baskets</h3>
                                                <ul id="ungrouped" class="draglist_alt">
                                                    [% IF ( baskets ) %]
                                                        [% FOREACH basket IN baskets %]
                                                            <li class="ungrouped" id="b-[% basket.basketno %]" >
                                                                <a href="basket.pl?basketno=[% basket.basketno %]">
                                                                    [% IF ( basket.basketname ) %]
                                                                        [% basket.basketname %]
                                                                    [% ELSE %]
                                                                        No name, basketnumber: [% basket.basketno %]
                                                                    [% END %]
                                                                </a>, <br />
                                                                Total: [% basket.total %]
                                                                <input type="hidden" class="basket" name="basket" value="[% basket.basketno %]" />
                                                            </li>
                                                        [% END %]
                                                    [% END %]
                                                </ul>
                                            </div>
                                        </fieldset>
                                    </div>
                                </form>
                            </div>
                        [% END %]
                        <div class="yui-u first">
                            <form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
                                <fieldset id="various" class="brief">
                                    <ol>
                                        [% UNLESS (closedbg) %]
                                            <label for="billingplace">Billing place:</label>
                                            <select name="billingplace" id="billingplace" style="width:13em;">
                                                <option value="">--</option>
                                                [% PROCESS options_for_libraries libraries => Branches.all( selected => billingplace ) %]
                                            </select>
                                        [% ELSE %]
                                            <span class="label">Billing place:</span>
                                            <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplace %]" />[% Branches.GetName( billingplace ) %]
                                        [% END %]
                                    </li>
                                    [% UNLESS (closedbg) %]
                                        <li>
                                            <label for="deliveryplace">Delivery place:</label>
                                            <select name="deliveryplace" id="deliveryplace" style="width:13em;">
                                                <option value="">--</option>
                                                [% PROCESS options_for_libraries libraries => Branches.all( selected => deliveryplace ) %]
                                            <select>
                                                </select>
                                            [% ELSE %]
                                                <span class="label">Billing place:</span>
                                                <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplace %]" />[% Branches.GetName( billingplace ) %]
                                            [% END %]
                                        </li>
                                        <li><p>or</p></li>
                                        <li>
                                            <label for="freedeliveryplace">Delivery place:</label>
                                            <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea>
                                        </li>
                                        [% ELSE %]
                                                <select>
                                            </li>
                                            <li><p>or</p></li>
                                            <li>
                                                <label for="freedeliveryplace">Delivery place:</label>
                                                <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea>
                                            </li>
                                            [% ELSE %]
                                                <li>
                                                    <span class="label">Delivery place:</span>
                                                    [% IF (freedeliveryplace) %]
                                                        <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
                                                        <input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
                                                    [% ELSE %]
                                                        <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplace %]" />[% Branches.GetName( deliveryplace ) %]
                                                        <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
                                                    [% END %]
                                                </li>
                                            [% END %]
                                            <li>
                                                <span class="label">Delivery place:</span>
                                                [% IF (freedeliveryplace) %]
                                                    <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
                                                    <input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
                                                [% ELSE %]
                                                    <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplace %]" />[% Branches.GetName( deliveryplace ) %]
                                                    <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
                                                [% END %]
                                            </li>
                                        [% END %]
                                        <li>
                                            [% UNLESS (closedbg) %]
                                                <label for="deliverycomment">Delivery comment:</label>
                                                <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
                                            [% ELSE %]
                                                <span class="label">Delivery comment:</span>[% deliverycomment %]
                                                <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
                                            [% END %]
                                                        <a href="basket.pl?basketno=[% selectedbasket.basketno %]">
                                                            [% IF ( selectedbasket.basketname ) %]
                                                                [% selectedbasket.basketname %]
                                                            [% ELSE %]
                                                                No name, basketnumber: [% selectedbasket.basketno %]
                                                            [% END %]
                                                        </a>, <br />
                                                        Total: [% selectedbasket.total %]
                                                        <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
                                                    </li>
                                                [% END %]
                                            </ul>
                                        </li>
                                        <li>
                                            <span class="label">Baskets in this group:</span>
                                            [% UNLESS (closedbg) %]
                                                <ul class="draglist" id="bg">
                                            [% ELSE %]
                                                <ul>
                                            [% END %]
                                            [% FOREACH selectedbasket IN selectedbaskets %]
                                                <li class="grouped" id="b-[% selectedbasket.basketno %]" >
                                                    <a href="basket.pl?basketno=[% selectedbasket.basketno %]">
                                                        [% IF ( selectedbasket.basketname ) %]
                                                            [% selectedbasket.basketname %]
                                                        [% ELSE %]
                                                            No name, basketnumber: [% selectedbasket.basketno %]
                                                        [% END %]
                                                    </a>, <br />
                                                    Total: [% selectedbasket.total %]
                                                    <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno %]" />
                                                </li>
                                            [% END %]
                                        </ul>
                                    </li>
                                        [% UNLESS (closedbg) %]
                                            <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
                                        [% ELSE %]
                                            <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
                                        [% END %]
                                </ol>
                            </fieldset>
                            [% UNLESS (closedbg) %]
                                <fieldset class="action"><input type="hidden" name="booksellerid" value="[% booksellerid %]" />
                                    [% IF ( basketgroupid ) %]
                                        <input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
                                    [% END %]
                                    <input type="hidden" name="op" value="attachbasket" />
                                    <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
                                </fieldset>
                            [% END %]
                        </form>
                    </div>
                </div>
                    [% IF booksellerid %]
                        <div id="toolbar" class="btn-toolbar">
                            <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
                        </div>
                    [% END %]

                    [% FOREACH bookseller IN booksellers %]
                        [% IF bookseller.basketgroups.size > 0 %]
                            <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |html %]</a></h1>
                            <div class="basket_groups toptabs">
                                <ul class="ui-tabs-nav">
                                    [% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
                                    [% ELSE%]<li><a href="#opened[% bookseller.id %]">Open</a></li>[% END %]
                                    [% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed[% bookseller.id %]">Closed</a></li>
                                    [% ELSE %]<li><a href="#closed[% bookseller.id %]">Closed</a></li>[% END %]
                                </ul>
                                <div id="opened[% bookseller.id %]">
                                    <table id="basket_group_opened">
                                        <thead>
                                            <tr>
                                                <th>Search name</th>
                                                <th>Search no.</th>
                                                <th>Search billing place</th>
                                                <th>Search delivery place</th>
                                                <th>Search no. of baskets</th>
                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                            </tr>
                                            <tr>
                                                <th>Name</th>
                                                <th>No.</th>
                                                <th>Billing place</th>
                                                <th>Delivery place</th>
                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>
                                        <tbody>
                                            [% FOREACH basketgroup IN bookseller.basketgroups %]
                                                [% UNLESS ( basketgroup.closed ) %]
                                                    <tr>
                                                        <td>
                                                            [% IF ( basketgroup.name ) %]
                                                                [% basketgroup.name %]
                                                            [% ELSE %]
                                                                Basket group no. [% basketgroup.id %]
                                                            [% END %]
                                                        </td>
                                                        <td>[% basketgroup.id %]</td>
                                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
                                                        <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>
                                                            <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and export as PDF" />
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
                                                            [% UNLESS basketgroup.basketsqty %]
                                                                <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
                                                            [% END %]
                                                        </td>
                                                    </tr>
                                                [% END %]
                                            [% END %]
                                        </tbody>
                                    </table>
                                </div>
                                <div id="closed[% bookseller.id %]">
                                    <table class="basket_group_closed">
                                        <thead>
                                            <tr>
                                                <th>Search name</th>
                                                <th>Search no.</th>
                                                <th>Search date closed</th>
                                                <th>Search billing place</th>
                                                <th>Search delivery place</th>
                                                <th>Search no. of baskets</th>
                                                <th>Search no. of ordered titles</th>
                                                <th>Search no. of received titles</th>
                                                <th></th>
                                            </tr>
                                            <tr>
                                                <th>Name</th>
                                                <th>No.</th>
                                                <th>Date closed</th>
                                                <th>Billing place</th>
                                                <th>Delivery place</th>
                                                <th>No. of baskets</th>
                                                <th>No. of ordered titles</th>
                                                <th>No. of received titles</th>
                                                <th>Action</th>
                                            </tr>
                                        </thead>
                                        <tbody>
                                            [% FOREACH basketgroup IN bookseller.basketgroups %]
                                                [% IF ( basketgroup.closed ) %]
                                                    <tr>
                                                        <td>
                                                            [% IF ( basketgroup.name ) %]
                                                                [% basketgroup.name %]
                                                            [% ELSE %]
                                                                Basket group no. [% basketgroup.id %]
                                                            [% END %]
                                                        </td>
                                                        <td>[% basketgroup.id %]</td>
                                                        <td>[% basketgroup.closeddate |$KohaDates %]</td>
                                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
                                                        <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
                                                        <td>[% basketgroup.basketsqty %]</td>
                                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                                        <td>[% basketgroup.received_titles_count %]</td>
                                                        <td>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as PDF" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>
                                                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Generate EDIFACT order" /></form>
                                                        </td>
                                                    </tr>
                                                [% END %]
                                            [% END %]
                                        </tbody>
                                    </table>
                                </div>
                            </div>
                        [% END %]
                    [% END %]
                [% END %]
            </div>
        </div>
        <div class="yui-b">
            [% INCLUDE 'vendor-menu.inc' %]
                [% INCLUDE 'vendor-menu.inc' %]
            [% END %]
            [% INCLUDE 'acquisitions-menu.inc' %]
        </div>
    </div>




[% USE Branches %]
[% USE KohaDates %]

[% INCLUDE 'doc-head-open.inc' %]
    [% IF bookseller %]
        <title>Koha &rsaquo; Basket groups for [% bookseller.name |html %]</title>
    [% ELSE %]
        <title>Koha &rsaquo; Basket groups</title>
    [% END %]

    <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
    [% INCLUDE 'doc-head-close.inc' %]
    [% INCLUDE 'datatables.inc' %]
    <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
    <script type="text/javascript">
        $(document).ready(function() {
            var options = {
                "paging": false,
                "autoWidth": false,
                "columnDefs": [
                    { "visible": false, "targets": 1 },
                    { "orderable": false, "targets": -1 }
                ],
                "orderFixed": [[ 1, 'asc' ]]
            };
            [% UNLESS bookseller %]
                options.drawCallback = function(settings) {
                    var api = this.api();
                    var rows = api.rows({page: 'current'}).nodes();
                    var last = null;

                    api.column(1, {page: 'current'}).data().each(function(group, i) {
                        if (last !== group) {
                            $(rows).eq(i).before(
                                '<tr><td class="group" colspan="8">' + group + '</td></tr>'
                            );
                            last = group;
                        }
                    });
                };
            [% END %]
            $("#basketgroups-table").kohaDataTable(options);

            $('#basketgroups-table').on('click', '.closeandprint', function(e) {
                e.preventDefault();
                var w = window.open($(this).attr('href'));
                var timer = setInterval(function() {
                    if (w.closed === true) {
                        clearInterval(timer);
                        window.location.reload(true);
                    }
                }, 1000);
            });
            $('#basketgroups-table').on('click', '.delete', function() {
                return confirm(_("Are you sure you want to delete this basketgroup ?"));
            });
        });
    </script>
</head>
<body id="acq_basketgroup" class="acq">
    [% INCLUDE 'header.inc' %]
    [% INCLUDE 'acquisitions-search.inc' %]

    <div id="breadcrumbs">
        <a href="/cgi-bin/koha/mainpage.pl">Home</a>
        &rsaquo;
        <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
        &rsaquo;
        [% IF (bookseller) %]
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |html %]</a>
            &rsaquo;
        [% END %]
        Basket groups
    </div>

    <div id="doc3" class="yui-t2">
        <div id="bd">
            <div id="yui-main">
                <div class="yui-b">
                    [% IF bookseller %]
                        <div id="toolbar" class="btn-toolbar">
                            <div class="btn-group">
                                <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% bookseller.id %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
                            </div>
                        </div>

                        <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a></h1>
                    [% END %]

                    [% IF basketgroups.size > 0 %]
                        <table id="basketgroups-table" class="group">
                            <thead>
                                <tr>
                                    <th>Name</th>
                                    <th>Bookseller</th>
                                    <th>Billing place</th>
                                    <th>Delivery place</th>
                                    <th>No. of baskets</th>
                                    <th>No. of ordered titles</th>
                                    <th>No. of received titles</th>
                                    <th>Date closed</th>
                                    <th>Action</th>
                                </tr>
                            </thead>
                            <tbody>
                                [% FOREACH basketgroup IN basketgroups %]
                                    <tr>
                                        <td>
                                            [% IF ( basketgroup.name ) %]
                                                [% basketgroup.name %]
                                            [% ELSE %]
                                                Basket group no. [% basketgroup.id %]
                                            [% END %]
                                        </td>
                                        <td>[% basketgroup.bookseller.name %]</td>
                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
                                        <td>
                                            [% IF (basketgroup.freedeliveryplace) %]
                                                [% basketgroup.freedeliveryplace %]
                                            [% ELSE %]
                                                [% Branches.GetName(basketgroup.deliveryplace) %]
                                            [% END %]
                                        </td>
                                        <td>[% basketgroup.baskets_count %]</td>
                                        <td>[% basketgroup.ordered_titles_count %]</td>
                                        <td>[% basketgroup.received_titles_count %]</td>
                                        <td>[% basketgroup.closeddate | $KohaDates %]</td>
                                        <td>
                                            <div class="dropdown">
                                            <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id %]">
                                            [% IF basketgroup.closeddate %]
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-eye"></i> View</a></li>
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Export as PDF</a></li>
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id %]">Generate EDIFACT Order</a></li>
                                            [% ELSE %]
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-pencil"></i> Edit</a></li>
                                                <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
                                                [% UNLESS basketgroup.baskets_count %]
                                                    <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-trash"></i> Delete</a></li>
                                                [% END %]
                                            [% END %]
                                            </ul>
                                            </div>
                                        </td>
                                    </tr>
                                [% END %]
                            </tbody>
                        </table>
                    [% END %]
                </div>
            </div>
            <div class="yui-b">
                [% IF bookseller %]
                    [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %]
                [% END %]
                [% INCLUDE 'acquisitions-menu.inc' %]
            </div>
        </div>
    [% INCLUDE 'intranet-bottom.inc' %]




    div.appendChild(unclosegroup);
}

function closeandprint(bg){
    if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&amp;basketgroupid=' + bg ){
        setTimeout("window.location.reload();",3000);
    }else{
        alert(MSG_FILE_DOWNLOAD_ERROR);
    }
}

//function that lets the user unclose a basketgroup as long as he hasn't submitted the changes to the page.
function unclosegroup(bgid){
    var div = document.getElementById('basketgroup-'+bgid+'-closed').parentNode;




// These default options are for translation but can be used
// for any other datatables settings
// MSG_DT_* variables comes from datatables.inc
// Since version 1.10, DataTables has a new API while still providing the older
// one.
// You can use the new API with these defaults by writing:
//
//   $('#table_id').kohaDataTable({ ... });
//
// To use the older API, write:
//
//   $("#table_id").dataTable($.extend(true, {}, dataTablesDefaults, { ... });

var DataTableDefaults = {
    "language": {
        "emptyTable":     window.MSG_DT_EMPTY_TABLE || "No data available in table",
        "info":           window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries",
        "infoEmpty":      window.MSG_DT_INFO_EMPTY || "No entries to show",
        "infoFiltered":   window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)",
        "lengthMenu":     window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries",
        "loadingRecords": window.MSG_DT_LOADING_RECORDS || "Loading...",
        "processing":     window.MSG_DT_PROCESSING || "Processing...",
        "search":         window.MSG_DT_SEARCH || "Search:",
        "zeroRecords":    window.MSG_DT_ZERO_RECORDS || "No matching records found",
        "paginate": {
            "first":      window.MSG_DT_FIRST || "First",
            "last":       window.MSG_DT_LAST || "Last",
            "next":       window.MSG_DT_NEXT || "Next",
            "previous":   window.MSG_DT_PREVIOUS || "Previous"
        },
        "aria": {
            "sortAscending":  window.MSG_DT_SORT_ASC || ": activate to sort column ascending",
            "sortDescending": window.MSG_DT_SORT_DESC || ": activate to sort column descending"
        }
    },
    "dom": '<"top pager"ilpf>tr<"bottom pager"ip>',
    "lengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]],
    "pageLength": 20
};

var dataTablesDefaults = {
    "oLanguage": {
        "oPaginate": {
            "sFirst"    : DataTableDefaults.language.paginate.first,
            "sLast"     : DataTableDefaults.language.paginate.last,
            "sNext"     : DataTableDefaults.language.paginate.next,
            "sPrevious" : DataTableDefaults.language.paginate.previous,
        },
        "sEmptyTable"       : DataTableDefaults.language.emptyTable,
        "sInfo"             : DataTableDefaults.language.info,
        "sInfoEmpty"        : DataTableDefaults.language.infoEmpty,
        "sInfoFiltered"     : DataTableDefaults.language.infoFiltered,
        "sLengthMenu"       : DataTableDefaults.language.lengthMenu,
        "sLoadingRecords"   : DataTableDefaults.language.loadingRecords,
        "sProcessing"       : DataTableDefaults.language.processing,
        "sSearch"           : DataTableDefaults.language.search,
        "sZeroRecords"      : DataTableDefaults.language.zeroRecords,
    },
    "dom": '<"top pager"ilpfB>tr<"bottom pager"ip>',
    "buttons": [],
    "aLengthMenu": DataTableDefaults.lengthMenu,
    "iDisplayLength": DataTableDefaults.pageLength
};

(function($) {
    $.fn.kohaDataTable = function(options) {
        return this.DataTable($.extend(true, {}, DataTableDefaults, options));
    };
})(jQuery);


// Return an array of string containing the values of a particular column
$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
- 

Return to bug 11708

Lines 89-97 sub BasketTotal { Link Here

(-)a/acqui/basketgroup.pl (-99 / +78 lines)
89		89
90	#displays all basketgroups and all closed baskets (in their respective groups)	90	#displays all basketgroups and all closed baskets (in their respective groups)
91	sub displaybasketgroups {	91	sub displaybasketgroups {
92	my $basketgroups = shift;	92	my ($basketgroups, $bookseller, $baskets, $template) = @_;
93	my $bookseller = shift;
94	my $baskets = shift;
95	if (scalar @$basketgroups != 0) {	93	if (scalar @$basketgroups != 0) {
96	foreach my $basketgroup (@$basketgroups){	94	foreach my $basketgroup (@$basketgroups){
97	my $i = 0;	95	my $i = 0;
Lines 225-294 sub generate_edifact_orders { Link Here
225	return;	223	return;
226	}	224	}
227		225
228	my $op = $input->param('op') \|\| 'display';
229	# possible values of $op :	226	# possible values of $op :
230	# - add : adds a new basketgroup, or edit an open basketgroup, or display a closed basketgroup
231	# - mod_basket : modify an individual basket of the basketgroup	227	# - mod_basket : modify an individual basket of the basketgroup
232	# - closeandprint : close and print an closed basketgroup in pdf. called by clicking on "Close and print" button in closed basketgroups list	228	# - closeandprint : close and print an closed basketgroup in pdf. called by
233	# - print : print a closed basketgroup. called by clicking on "Print" button in closed basketgroups list	229	# clicking on "Close and print" button in closed basketgroups list
		230	# - print : print a closed basketgroup. called by clicking on "Print" button in
		231	# closed basketgroups list
234	# - ediprint : generate edi order messages for the baskets in the group	232	# - ediprint : generate edi order messages for the baskets in the group
235	# - export : export in CSV a closed basketgroup. called by clicking on "Export" button in closed basketgroups list	233	# - export : export in CSV a closed basketgroup. called by clicking on "Export"
236	# - delete : delete an open basketgroup. called by clicking on "Delete" button in open basketgroups list	234	# button in closed basketgroups list
237	# - reopen : reopen a closed basketgroup. called by clicking on "Reopen" button in closed basketgroup list	235	# - delete : delete an open basketgroup. called by clicking on "Delete" button
238	# - attachbasket : save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page	236	# in open basketgroups list
239	# - display : display the list of all basketgroups for a vendor	237	# - reopen : reopen a closed basketgroup. called by clicking on "Reopen" button
		238	# in closed basketgroup list
		239	# - attachbasket : save a modified basketgroup, or creates a new basketgroup
		240	# when a basket is closed. called from basket page
		241	my $op = $input->param('op');
240	my $booksellerid = $input->param('booksellerid');	242	my $booksellerid = $input->param('booksellerid');
241	$template->param(booksellerid => $booksellerid);
242		243
243	if ( $op eq "add" ) {	244	if ($op eq 'mod_basket') {
244	#
245	# if no param('basketgroupid') is not defined, adds a new basketgroup
246	# else, edit (if it is open) or display (if it is close) the basketgroup basketgroupid
247	# the template will know if basketgroup must be displayed or edited, depending on the value of closed key
248	#
249	my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
250	my $basketgroupid = $input->param('basketgroupid');
251	my $billingplace;
252	my $deliveryplace;
253	my $freedeliveryplace;
254	if ( $basketgroupid ) {
255	# Get the selected baskets in the basketgroup to display them
256	my $selecteds = GetBasketsByBasketgroup($basketgroupid);
257	foreach my $basket(@{$selecteds}){
258	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
259	}
260	$template->param(basketgroupid => $basketgroupid,
261	selectedbaskets => $selecteds);
262
263	# Get general informations about the basket group to prefill the form
264	my $basketgroup = GetBasketgroup($basketgroupid);
265	$template->param(
266	name => $basketgroup->{name},
267	deliverycomment => $basketgroup->{deliverycomment},
268	freedeliveryplace => $basketgroup->{freedeliveryplace},
269	);
270	$billingplace = $basketgroup->{billingplace};
271	$deliveryplace = $basketgroup->{deliveryplace};
272	$freedeliveryplace = $basketgroup->{freedeliveryplace};
273	$template->param( closedbg => ($basketgroup ->{'closed'}) ? 1 : 0);
274	} else {
275	$template->param( closedbg => 0);
276	}
277	# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
278	my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
279	$billingplace = $billingplace \|\| $borrower->{'branchcode'};
280	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};
281
282	$template->param( billingplace => $billingplace );
283	$template->param( deliveryplace => $deliveryplace );
284	$template->param( booksellerid => $booksellerid );
285
286	# the template will display a unique basketgroup
287	$template->param(grouping => 1);
288	my $basketgroups = &GetBasketgroups($booksellerid);
289	my $baskets = &GetBasketsByBookseller($booksellerid);
290	displaybasketgroups($basketgroups, $bookseller, $baskets);
291	} elsif ($op eq 'mod_basket') {
292	#	245	#
293	# edit an individual basket contained in this basketgroup	246	# edit an individual basket contained in this basketgroup
294	#	247	#
Lines 329-335 if ( $op eq "add" ) { Link Here
329	#	282	#
330	my $basketgroupid = $input->param('basketgroupid');	283	my $basketgroupid = $input->param('basketgroupid');
331	DelBasketgroup($basketgroupid);	284	DelBasketgroup($basketgroupid);
332	print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid.'&listclosed=1');	285	print $input->redirect('/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' . $booksellerid);
		286	exit;
333	}elsif ( $op eq 'reopen'){	287	}elsif ( $op eq 'reopen'){
334	#	288	#
335	# reopen a closed basketgroup	289	# reopen a closed basketgroup
Lines 337-344 if ( $op eq "add" ) { Link Here
337	my $basketgroupid = $input->param('basketgroupid');	291	my $basketgroupid = $input->param('basketgroupid');
338	my $booksellerid = $input->param('booksellerid');	292	my $booksellerid = $input->param('booksellerid');
339	ReOpenBasketgroup($basketgroupid);	293	ReOpenBasketgroup($basketgroupid);
340	my $redirectpath = ((defined $input->param('mode'))&& ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' .$booksellerid.'&listclosed=1';	294	my $redirectpath;
		295	my $mode = $input->param('mode');
		296	if (defined $mode && $mode eq 'singlebg') {
		297	$redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid;
		298	} else {
		299	$redirectpath = '/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' .$booksellerid;
		300	}
341	print $input->redirect($redirectpath);	301	print $input->redirect($redirectpath);
		302	exit;
342	} elsif ( $op eq 'attachbasket') {	303	} elsif ( $op eq 'attachbasket') {
343	#	304	#
344	# save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page	305	# save a modified basketgroup, or creates a new basketgroup when a basket is closed. called from basket page
Lines 384-428 if ( $op eq "add" ) { Link Here
384	};	345	};
385	$basketgroupid = NewBasketgroup($basketgroup);	346	$basketgroupid = NewBasketgroup($basketgroup);
386	}	347	}
387	my $redirectpath = ((defined $input->param('mode')) && ($input->param('mode') eq 'singlebg')) ?'/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid : '/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid;	348	my $redirectpath;
388	$redirectpath .= "&listclosed=1" if $closedbg ;	349	my $mode = $input->param('mode');
389	print $input->redirect($redirectpath );	350	if (defined $mode && $mode eq 'singlebg') {
390		351	$redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&booksellerid='.$booksellerid;
		352	} else {
		353	$redirectpath = '/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' . $booksellerid;
		354	}
		355	print $input->redirect($redirectpath);
		356	exit;
391	} elsif ( $op eq 'ediprint') {	357	} elsif ( $op eq 'ediprint') {
392	my $basketgroupid = $input->param('basketgroupid');	358	my $basketgroupid = $input->param('basketgroupid');
393	generate_edifact_orders( $basketgroupid );	359	generate_edifact_orders( $basketgroupid );
394	exit;	360	exit;
395	}else{	361	}
396	my @booksellers;	362
397	if ($booksellerid) {	363	# if no param('basketgroupid') is not defined, adds a new basketgroup else, edit
398	my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });	364	# (if it is open) or display (if it is close) the basketgroup basketgroupid the
399	push @booksellers, $bookseller;	365	# template will know if basketgroup must be displayed or edited, depending on
400	$template->param(booksellername => $booksellers[0]->{name});	366	# the value of closed key
401	} else {	367
402	@booksellers = Koha::Acquisition::Bookseller->search;	368	my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
403	}	369	my $basketgroupid = $input->param('basketgroupid');
404	foreach my $bookseller (@booksellers) {	370	my $billingplace;
405	$bookseller->{basketgroups} = GetBasketgroups($bookseller->{id});	371	my $deliveryplace;
406	foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {	372	my $freedeliveryplace;
407	my $baskets = GetBasketsByBasketgroup($basketgroup->{id});	373	if ( $basketgroupid ) {
408	$basketgroup->{basketsqty} = 0;	374	# Get the selected baskets in the basketgroup to display them
409	my (@ordered_biblionumbers, @received_biblionumbers);	375	my $selecteds = GetBasketsByBasketgroup($basketgroupid);
410	foreach my $basket (@$baskets) {	376	foreach my $basket(@{$selecteds}){
411	$basketgroup->{basketsqty} += 1;	377	$basket->{total} = BasketTotal($basket->{basketno}, $bookseller);
412	my @orders = GetOrders($basket->{basketno});
413	foreach my $order (@orders) {
414	push @ordered_biblionumbers, $order->{biblionumber};
415	if ($order->{datereceived}) {
416	push @received_biblionumbers, $order->{biblionumber};
417	}
418	}
419	}
420	$basketgroup->{ordered_titles_count} = uniq @ordered_biblionumbers;
421	$basketgroup->{received_titles_count} = uniq @received_biblionumbers;
422	}
423	}	378	}
424	$template->param(booksellers => \@booksellers);	379	$template->param(basketgroupid => $basketgroupid,
		380	selectedbaskets => $selecteds);
		381
		382	# Get general informations about the basket group to prefill the form
		383	my $basketgroup = GetBasketgroup($basketgroupid);
		384	$template->param(
		385	name => $basketgroup->{name},
		386	billingplace => $basketgroup->{billingplace},
		387	deliveryplace => $basketgroup->{deliveryplace},
		388	deliverycomment => $basketgroup->{deliverycomment},
		389	freedeliveryplace => $basketgroup->{freedeliveryplace},
		390	closedbg => $basketgroup->{closed} ? 1 : 0
		391	);
		392	} else {
		393	$template->param( closedbg => 0);
425	}	394	}
426	$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );	395	# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
427	#prolly won't use all these, maybe just use print, the rest can be done inside validate	396	my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
		397	$billingplace = $billingplace \|\| $borrower->{'branchcode'};
		398	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};
		399
		400	$template->param( booksellerid => $booksellerid );
		401
		402	# the template will display a unique basketgroup
		403	my $basketgroups = &GetBasketgroups($booksellerid);
		404	my $baskets = &GetBasketsByBookseller($booksellerid);
		405	displaybasketgroups($basketgroups, $bookseller, $baskets, $template);
		406
428	output_html_with_http_headers $input, $cookie, $template->output;	407	output_html_with_http_headers $input, $cookie, $template->output;

Lines 233-246 function closebasketgroup(bgid) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js (-8 lines)
233	div.appendChild(unclosegroup);	233	div.appendChild(unclosegroup);
234	}	234	}
235		235
236	function closeandprint(bg){
237	if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){
238	setTimeout("window.location.reload();",3000);
239	}else{
240	alert(MSG_FILE_DOWNLOAD_ERROR);
241	}
242	}
243
244	//function that lets the user unclose a basketgroup as long as he hasn't submitted the changes to the page.	236	//function that lets the user unclose a basketgroup as long as he hasn't submitted the changes to the page.
245	function unclosegroup(bgid){	237	function unclosegroup(bgid){
246	var div = document.getElementById('basketgroup-'+bgid+'-closed').parentNode;	238	var div = document.getElementById('basketgroup-'+bgid+'-closed').parentNode;

Line 0 Link Here

(-)a/Koha/Basket.pm (+36 lines)
	1	package Koha::Basket;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use Koha::Orders;
	21
	22	use base qw(Koha::Object);
	23
	24	sub _type {
	25	return 'Aqbasket';
	26	}
	27
	28	sub orders {
	29	my ($self) = @_;
	30
	31	$self->{_orders} \|\|= Koha::Orders->search({ basketno => $self->basketno });
	32
	33	return wantarray ? $self->{_orders}->as_list : $self->{_orders};
	34	}
	35
	36	1;

Line 0 Link Here

(-)a/Koha/Basketgroup.pm (+78 lines)
		1	package Koha::Basketgroup;
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it under the
		6	# terms of the GNU General Public License as published by the Free Software
		7	# Foundation; either version 3 of the License, or (at your option) any later
		8	# version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License along
		15	# with Koha; if not, write to the Free Software Foundation, Inc.,
		16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		17
		18	use Modern::Perl;
		19
		20	use List::MoreUtils qw/uniq/;
		21
		22	use Koha::Baskets;
		23
		24	use base qw(Koha::Object);
		25
		26	sub _type {
		27	return 'Aqbasketgroup';
		28	}
		29
		30	sub bookseller {
		31	my ($self) = @_;
		32
		33	return Koha::Booksellers->find($self->booksellerid);
		34	}
		35
		36	sub baskets {
		37	my ($self) = @_;
		38
		39	$self->{_baskets} \|\|= Koha::Baskets->search({ basketgroupid => $self->id });
		40
		41	return wantarray ? $self->{_baskets}->as_list : $self->{_baskets};
		42	}
		43
		44	sub baskets_count {
		45	my ($self) = @_;
		46
		47	return $self->baskets->count;
		48	}
		49
		50	sub ordered_titles_count {
		51	my ($self) = @_;
		52
		53	my @biblionumbers;
		54	foreach my $basket ($self->baskets) {
		55	foreach my $order ($basket->orders) {
		56	push @biblionumbers, $order->biblionumber;
		57	}
		58	}
		59
		60	return scalar uniq @biblionumbers;
		61	}
		62
		63	sub received_titles_count {
		64	my ($self) = @_;
65
66	my @biblionumbers;
67	foreach my $basket ($self->baskets) {
68	foreach my $order ($basket->orders) {
69	if ($order->datereceived) {
70	push @biblionumbers, $order->biblionumber;
71	}
72	}
73	}
74
75	return scalar uniq @biblionumbers;
76	}
77
78	1;

Line 0 Link Here

(-)a/Koha/Basketgroups.pm (+32 lines)
	1	package Koha::Basketgroups;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use Koha::Basketgroup;
	21
	22	use base qw(Koha::Objects);
	23
	24	sub _type {
	25	return 'Aqbasketgroup';
	26	}
	27
	28	sub object_class {
	29	return 'Koha::Basketgroup';
	30	}
	31
	32	1;

Line 0 Link Here

(-)a/Koha/Baskets.pm (+32 lines)
	1	package Koha::Baskets;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use Koha::Basket;
	21
	22	use base qw(Koha::Objects);
	23
	24	sub _type {
	25	return 'Aqbasket';
	26	}
	27
	28	sub object_class {
	29	return 'Koha::Basket';
	30	}
	31
	32	1;

Line 0 Link Here

(-)a/Koha/Bookseller.pm (+26 lines)
	1	package Koha::Bookseller;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use base qw(Koha::Object);
	21
	22	sub _type {
	23	return 'Aqbookseller';
	24	}
	25
	26	1;

Line 0 Link Here

(-)a/Koha/Booksellers.pm (+32 lines)
	1	package Koha::Booksellers;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use Koha::Bookseller;
	21
	22	use base qw(Koha::Objects);
	23
	24	sub _type {
	25	return 'Aqbookseller';
	26	}
	27
	28	sub object_class {
	29	return 'Koha::Bookseller';
	30	}
	31
	32	1;

Line 0 Link Here

(-)a/Koha/Order.pm (+26 lines)
	1	package Koha::Order;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use base qw(Koha::Object);
	21
	22	sub _type {
	23	return 'Aqorder';
	24	}
	25
	26	1;

Line 0 Link Here

(-)a/Koha/Orders.pm (+32 lines)
	1	package Koha::Orders;
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it under the
	6	# terms of the GNU General Public License as published by the Free Software
	7	# Foundation; either version 3 of the License, or (at your option) any later
	8	# version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License along
	15	# with Koha; if not, write to the Free Software Foundation, Inc.,
	16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	17
	18	use Modern::Perl;
	19
	20	use Koha::Order;
	21
	22	use base qw(Koha::Objects);
	23
	24	sub _type {
	25	return 'Aqorder';
	26	}
	27
	28	sub object_class {
	29	return 'Koha::Order';
	30	}
	31
	32	1;

Line 0 Link Here

(-)a/acqui/basketgroups.pl (+52 lines)
	1	#!/usr/bin/perl
	2
	3	# This file is part of Koha.
	4	#
	5	# Koha is free software; you can redistribute it and/or modify it
	6	# under the terms of the GNU General Public License as published by
	7	# the Free Software Foundation; either version 3 of the License, or
	8	# (at your option) any later version.
	9	#
	10	# Koha is distributed in the hope that it will be useful, but
	11	# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	13	# GNU General Public License for more details.
	14	#
	15	# You should have received a copy of the GNU General Public License
	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	17
	18	use Modern::Perl;
	19
	20	use CGI qw(-utf8);
	21
	22	use C4::Auth;
	23	use C4::Output;
	24
	25	use Koha::Acquisition::Basketgroups;
	26	use Koha::Acquisition::Booksellers;
	27
	28	my $cgi = new CGI;
	29
	30	my ($template, $loggedinuser, $cookie) = get_template_and_user({
	31	template_name => 'acqui/basketgroups.tt',
	32	query => $cgi,
	33	type => 'intranet',
	34	flagsrequired => { acquisition => 'group_manage' },
	35	});
	36
	37	my $booksellerid = $cgi->param('booksellerid');
	38
	39	my $params = {};
	40	if ($booksellerid) {
	41	$params->{booksellerid} = $booksellerid;
	42	my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
	43	$template->param(bookseller => $bookseller);
	44	}
	45
	46	my @basketgroups = Koha::Acquisition::Basketgroups->search($params);
	47
	48	$template->param(
	49	basketgroups => \@basketgroups,
	50	);
	51
	52	output_html_with_http_headers $cgi, $cookie, $template->output;

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt (+162 lines)
		1	[% USE Branches %]
		2	[% USE KohaDates %]
		3
		4	[% INCLUDE 'doc-head-open.inc' %]
		5	[% IF bookseller %]
		6	<title>Koha &rsaquo; Basket groups for [% bookseller.name \|html %]</title>
		7	[% ELSE %]
		8	<title>Koha &rsaquo; Basket groups</title>
		9	[% END %]
		10
		11	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
		12	[% INCLUDE 'doc-head-close.inc' %]
		13	[% INCLUDE 'datatables.inc' %]
		14	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
		15	<script type="text/javascript">
		16	$(document).ready(function() {
		17	var options = {
		18	"paging": false,
		19	"autoWidth": false,
		20	"columnDefs": [
		21	{ "visible": false, "targets": 1 },
		22	{ "orderable": false, "targets": -1 }
		23	],
		24	"orderFixed": [[ 1, 'asc' ]]
		25	};
		26	[% UNLESS bookseller %]
		27	options.drawCallback = function(settings) {
		28	var api = this.api();
		29	var rows = api.rows({page: 'current'}).nodes();
		30	var last = null;
		31
		32	api.column(1, {page: 'current'}).data().each(function(group, i) {
		33	if (last !== group) {
		34	$(rows).eq(i).before(
		35	'<tr><td class="group" colspan="8">' + group + '</td></tr>'
		36	);
		37	last = group;
		38	}
		39	});
		40	};
		41	[% END %]
		42	$("#basketgroups-table").kohaDataTable(options);
		43
		44	$('#basketgroups-table').on('click', '.closeandprint', function(e) {
		45	e.preventDefault();
		46	var w = window.open($(this).attr('href'));
		47	var timer = setInterval(function() {
		48	if (w.closed === true) {
		49	clearInterval(timer);
		50	window.location.reload(true);
		51	}
		52	}, 1000);
		53	});
		54	$('#basketgroups-table').on('click', '.delete', function() {
		55	return confirm(_("Are you sure you want to delete this basketgroup ?"));
		56	});
		57	});
		58	</script>
		59	</head>
		60	<body id="acq_basketgroup" class="acq">
		61	[% INCLUDE 'header.inc' %]
		62	[% INCLUDE 'acquisitions-search.inc' %]
		63
		64	<div id="breadcrumbs">
65	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
66	&rsaquo;
67	<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
68	&rsaquo;
69	[% IF (bookseller) %]
70	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name \|html %]</a>
71	&rsaquo;
72	[% END %]
73	Basket groups
74	</div>
75
76	<div id="doc3" class="yui-t2">
77	<div id="bd">
78	<div id="yui-main">
79	<div class="yui-b">
80	[% IF bookseller %]
81	<div id="toolbar" class="btn-toolbar">
82	<div class="btn-group">
83	<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% bookseller.id %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
84	</div>
85	</div>
86
87	<h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a></h1>
88	[% END %]
89
90	[% IF basketgroups.size > 0 %]
91	<table id="basketgroups-table" class="group">
92	<thead>
93	<tr>
94	<th>Name</th>
95	<th>Bookseller</th>
96	<th>Billing place</th>
97	<th>Delivery place</th>
98	<th>No. of baskets</th>
99	<th>No. of ordered titles</th>
100	<th>No. of received titles</th>
101	<th>Date closed</th>
102	<th>Action</th>
103	</tr>
104	</thead>
105	<tbody>
106	[% FOREACH basketgroup IN basketgroups %]
107	<tr>
108	<td>
109	[% IF ( basketgroup.name ) %]
110	[% basketgroup.name %]
111	[% ELSE %]
112	Basket group no. [% basketgroup.id %]
113	[% END %]
114	</td>
115	<td>[% basketgroup.bookseller.name %]</td>
116	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
117	<td>
118	[% IF (basketgroup.freedeliveryplace) %]
119	[% basketgroup.freedeliveryplace %]
120	[% ELSE %]
121	[% Branches.GetName(basketgroup.deliveryplace) %]
122	[% END %]
123	</td>
124	<td>[% basketgroup.baskets_count %]</td>
125	<td>[% basketgroup.ordered_titles_count %]</td>
126	<td>[% basketgroup.received_titles_count %]</td>
127	<td>[% basketgroup.closeddate \| $KohaDates %]</td>
128	<td>
129	<div class="dropdown">
130	<a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
131	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id %]">
132	[% IF basketgroup.closeddate %]
133	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-eye"></i> View</a></li>
134	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
135	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Export as PDF</a></li>
136	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
137	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id %]">Generate EDIFACT Order</a></li>
138	[% ELSE %]
139	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-pencil"></i> Edit</a></li>
140	<li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
141	[% UNLESS basketgroup.baskets_count %]
142	<li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-trash"></i> Delete</a></li>
143	[% END %]
144	[% END %]
145	</ul>
146	</div>
147	</td>
148	</tr>
149	[% END %]
150	</tbody>
151	</table>
152	[% END %]
153	</div>
154	</div>
155	<div class="yui-b">
156	[% IF bookseller %]
157	[% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %]
158	[% END %]
159	[% INCLUDE 'acquisitions-menu.inc' %]
160	</div>
161	</div>
162	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-20 / +58 lines)
1	// These default options are for translation but can be used	1	// These default options are for translation but can be used
2	// for any other datatables settings	2	// for any other datatables settings
3	// MSG_DT_* variables comes from datatables.inc	3	// MSG_DT_* variables comes from datatables.inc
4	// To use it, write:	4	// Since version 1.10, DataTables has a new API while still providing the older
5	// $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, {	5	// one.
6	// // other settings	6	// You can use the new API with these defaults by writing:
7	// } ) );	7	//
		8	// $('#table_id').kohaDataTable({ ... });
		9	//
		10	// To use the older API, write:
		11	//
		12	// $("#table_id").dataTable($.extend(true, {}, dataTablesDefaults, { ... });
		13
		14	var DataTableDefaults = {
		15	"language": {
		16	"emptyTable": window.MSG_DT_EMPTY_TABLE \|\| "No data available in table",
		17	"info": window.MSG_DT_INFO \|\| "Showing _START_ to _END_ of _TOTAL_ entries",
		18	"infoEmpty": window.MSG_DT_INFO_EMPTY \|\| "No entries to show",
		19	"infoFiltered": window.MSG_DT_INFO_FILTERED \|\| "(filtered from _MAX_ total entries)",
		20	"lengthMenu": window.MSG_DT_LENGTH_MENU \|\| "Show _MENU_ entries",
		21	"loadingRecords": window.MSG_DT_LOADING_RECORDS \|\| "Loading...",
		22	"processing": window.MSG_DT_PROCESSING \|\| "Processing...",
		23	"search": window.MSG_DT_SEARCH \|\| "Search:",
		24	"zeroRecords": window.MSG_DT_ZERO_RECORDS \|\| "No matching records found",
		25	"paginate": {
		26	"first": window.MSG_DT_FIRST \|\| "First",
		27	"last": window.MSG_DT_LAST \|\| "Last",
		28	"next": window.MSG_DT_NEXT \|\| "Next",
		29	"previous": window.MSG_DT_PREVIOUS \|\| "Previous"
		30	},
		31	"aria": {
		32	"sortAscending": window.MSG_DT_SORT_ASC \|\| ": activate to sort column ascending",
		33	"sortDescending": window.MSG_DT_SORT_DESC \|\| ": activate to sort column descending"
		34	}
		35	},
		36	"dom": '<"top pager"ilpf>tr<"bottom pager"ip>',
		37	"lengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL \|\| "All"]],
		38	"pageLength": 20
		39	};
		40
8	var dataTablesDefaults = {	41	var dataTablesDefaults = {
9	"oLanguage": {	42	"oLanguage": {
10	"oPaginate": {	43	"oPaginate": {
11	"sFirst" : window.MSG_DT_FIRST \|\| "First",	44	"sFirst" : DataTableDefaults.language.paginate.first,
12	"sLast" : window.MSG_DT_LAST \|\| "Last",	45	"sLast" : DataTableDefaults.language.paginate.last,
13	"sNext" : window.MSG_DT_NEXT \|\| "Next",	46	"sNext" : DataTableDefaults.language.paginate.next,
14	"sPrevious" : window.MSG_DT_PREVIOUS \|\| "Previous"	47	"sPrevious" : DataTableDefaults.language.paginate.previous,
15	},	48	},
16	"sEmptyTable" : window.MSG_DT_EMPTY_TABLE \|\| "No data available in table",	49	"sEmptyTable" : DataTableDefaults.language.emptyTable,
17	"sInfo" : window.MSG_DT_INFO \|\| "Showing _START_ to _END_ of _TOTAL_ entries",	50	"sInfo" : DataTableDefaults.language.info,
18	"sInfoEmpty" : window.MSG_DT_INFO_EMPTY \|\| "No entries to show",	51	"sInfoEmpty" : DataTableDefaults.language.infoEmpty,
19	"sInfoFiltered" : window.MSG_DT_INFO_FILTERED \|\| "(filtered from _MAX_ total entries)",	52	"sInfoFiltered" : DataTableDefaults.language.infoFiltered,
20	"sLengthMenu" : window.MSG_DT_LENGTH_MENU \|\| "Show _MENU_ entries",	53	"sLengthMenu" : DataTableDefaults.language.lengthMenu,
21	"sLoadingRecords" : window.MSG_DT_LOADING_RECORDS \|\| "Loading...",	54	"sLoadingRecords" : DataTableDefaults.language.loadingRecords,
22	"sProcessing" : window.MSG_DT_PROCESSING \|\| "Processing...",	55	"sProcessing" : DataTableDefaults.language.processing,
23	"sSearch" : window.MSG_DT_SEARCH \|\| "Search:",	56	"sSearch" : DataTableDefaults.language.search,
24	"sZeroRecords" : window.MSG_DT_ZERO_RECORDS \|\| "No matching records found"	57	"sZeroRecords" : DataTableDefaults.language.zeroRecords,
25	},	58	},
26	"dom": '<"top pager"ilpfB>tr<"bottom pager"ip>',	59	"dom": '<"top pager"ilpfB>tr<"bottom pager"ip>',
27	"buttons": [],	60	"buttons": [],
28	"aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL \|\| "All"]],	61	"aLengthMenu": DataTableDefaults.lengthMenu,
29	"iDisplayLength": 20	62	"iDisplayLength": DataTableDefaults.pageLength
30	};	63	};
31		64
		65	(function($) {
		66	$.fn.kohaDataTable = function(options) {
		67	return this.DataTable($.extend(true, {}, DataTableDefaults, options));
		68	};
		69	})(jQuery);
		70
32		71
33	// Return an array of string containing the values of a particular column	72	// Return an array of string containing the values of a particular column
34	$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {	73	$.fn.dataTableExt.oApi.fnGetColumnData = function ( oSettings, iColumn, bUnique, bFiltered, bIgnoreEmpty ) {
35	-