Attachment #72693 for bug #11708

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

Lines 58-63 use Koha::Acquisition::Booksellers; Link Here

(-)a/acqui/basketgroup.pl (-6 / +31 lines)
58	use Koha::ItemTypes;	58	use Koha::ItemTypes;
59	use Koha::Patrons;	59	use Koha::Patrons;
60		60
		61	use List::MoreUtils qw/uniq/;
		62
61	our $input=new CGI;	63	our $input=new CGI;
62		64
63	our ($template, $loggedinuser, $cookie)	65	our ($template, $loggedinuser, $cookie)
Lines 391-402 if ( $op eq "add" ) { Link Here
391	generate_edifact_orders( $basketgroupid );	393	generate_edifact_orders( $basketgroupid );
392	exit;	394	exit;
393	}else{	395	}else{
394	# no param : display the list of all basketgroups for a given vendor	396	my @booksellers;
395	my $basketgroups = &GetBasketgroups($booksellerid);	397	if ($booksellerid) {
396	my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );	398	my $bookseller = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
397	my $baskets = &GetBasketsByBookseller($booksellerid);	399	push @booksellers, $bookseller;
398		400	$template->param(booksellername => $booksellers[0]->{name});
399	displaybasketgroups($basketgroups, $bookseller, $baskets);	401	} else {
		402	@booksellers = Koha::Acquisition::Bookseller->search;
		403	}
		404	foreach my $bookseller (@booksellers) {
		405	$bookseller->{basketgroups} = GetBasketgroups($bookseller->{id});
		406	foreach my $basketgroup (@{ $bookseller->{basketgroups} }) {
		407	my $baskets = GetBasketsByBasketgroup($basketgroup->{id});
		408	$basketgroup->{basketsqty} = 0;
		409	my (@ordered_biblionumbers, @received_biblionumbers);
		410	foreach my $basket (@$baskets) {
		411	$basketgroup->{basketsqty} += 1;
		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	}
		424	$template->param(booksellers => \@booksellers);
400	}	425	}
401	$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );	426	$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 );
402	#prolly won't use all these, maybe just use print, the rest can be done inside validate	427	#prolly won't use all these, maybe just use print, the rest can be done inside validate

Lines 252-257 tr.even.selected td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/datatables.css (+3 lines)
252		252
253	/* ColumnFilter */	253	/* ColumnFilter */
254	span.filter_column > input[type="text"] {	254	span.filter_column > input[type="text"] {
		255	box-sizing: border-box;
		256	-moz-box-sizing: border-box;
		257	-webkit-box-sizing: border-box;
255	font-size: 80%;	258	font-size: 80%;
256	width: 100%;	259	width: 100%;
257	box-sizing: border-box;	260	box-sizing: border-box;

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (+3 lines)
6	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>	6	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
7	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]	7	[% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
8	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>	8	<li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
		9	[% IF ( CAN_user_acquisition_group_manage ) %]
		10	<li><a href="/cgi-bin/koha/acqui/basketgroup.pl">Basket groups</a></li>
		11	[% END %]
9	[% IF CAN_user_acquisition_edi_manage %]	12	[% IF CAN_user_acquisition_edi_manage %]
10	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>	13	<li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
11	[% END %]	14	[% END %]




[% USE Branches %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF booksellerid %]
  <title>Koha &rsaquo; Basket groups for [% booksellername |html %]</title>
[% ELSE %]
  <title>Koha &rsaquo; Basket groups</title>
[% END %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script>
<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script>

}

 $(document).ready(function() {
    $(".basket_groups").tabs();

    $("table").each(function () {
      var column_filter_options = {
        sPlaceHolder: "head:after",
        aoColumns: [
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          { type: "text" },
          null
        ]
      };
      if ($(this).hasClass('basket_group_closed')) {
        // There is one more column in closed basketgroups tables
        column_filter_options.aoColumns.unshift({ type: "text" });
      }
      $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
          "aoColumnDefs": [
              { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
          ],
          "bPaginate": false,
          "bAutoWidth": false
      } ))
      .columnFilter(column_filter_options);
    });

 });



<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 ( grouping ) %]
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a> &rsaquo; Add basket group for [% booksellername |html %]
[% ELSE %]
  [% IF (booksellerid) %]
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a> &rsaquo;
  [% END %]
  Basket groups
[% END %]
</div>

<div id="doc3" class="yui-t2">
    <div id="bd">

                        </div>
                    </div>
                [% ELSE %]
                    [% 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>
                                        <th>Number of baskets</th>
                                        <th>Action</th>
                                    </tr>
                                </thead>
                                <tbody>
                                    [% FOREACH basketgroup IN basketgroups %]
                                        [% UNLESS ( basketgroup.closed ) %]
                                            <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>
                                                <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
                                                <td>[% basketgroup.basketsqty %]</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">
                            <table id="basket_group_closed">
                                <thead>
                                    <tr>
                                        <th>Name</th>
                                        <th>Number</th>
                                        <th>Billing place</th>
                                        <th>Delivery place</th>
                                        <th>Number of baskets</th>
                                        <th>Action</th>
                                    </tr>
                                </thead>
                                <tbody>
                                    [% FOREACH basketgroup IN basketgroups %]
                                        [% IF ( basketgroup.closed ) %]
                                            <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>
                                                <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>
                                                    <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>
                                        </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>
- 

Return to bug 11708

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-99 / +167 lines)
1	[% USE Branches %]	1	[% USE Branches %]
		2	[% USE KohaDates %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Basket grouping for [% booksellername \|html %]</title>	4	[% IF booksellerid %]
		5	<title>Koha &rsaquo; Basket groups for [% booksellername \|html %]</title>
		6	[% ELSE %]
		7	<title>Koha &rsaquo; Basket groups</title>
		8	[% END %]
4	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />	9	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].css" />
5	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]
6	[% INCLUDE 'datatables.inc' %]	11	[% INCLUDE 'datatables.inc' %]
		12	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter_[% KOHA_VERSION %].js"></script>
7	<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script>	13	<script type="text/javascript" src="[% interface %]/lib/yui/utilities/utilities_[% KOHA_VERSION %].js"></script>
8	<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script>	14	<script type="text/javascript" src="[% interface %]/lib/yui/button/button-min_[% KOHA_VERSION %].js"></script>
9	<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script>	15	<script type="text/javascript" src="[% interface %]/lib/yui/container/container_core-min_[% KOHA_VERSION %].js"></script>
Lines 107-121 function submitForm(form) { Link Here
107	}	113	}
108		114
109	$(document).ready(function() {	115	$(document).ready(function() {
110	$("#basket_groups").tabs();	116	$(".basket_groups").tabs();
111		117
112	$("table").dataTable($.extend(true, {}, dataTablesDefaults, {	118	$("table").each(function () {
113	"aoColumnDefs": [	119	var column_filter_options = {
114	{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },	120	sPlaceHolder: "head:after",
115	],	121	aoColumns: [
116	"bAutoWidth": false,	122	{ type: "text" },
117	"sPaginationType": "four_button"	123	{ type: "text" },
118	} ));	124	{ type: "text" },
		125	{ type: "text" },
		126	{ type: "text" },
		127	{ type: "text" },
		128	{ type: "text" },
		129	null
		130	]
		131	};
		132	if ($(this).hasClass('basket_group_closed')) {
		133	// There is one more column in closed basketgroups tables
		134	column_filter_options.aoColumns.unshift({ type: "text" });
		135	}
		136	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {
		137	"aoColumnDefs": [
		138	{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
		139	],
		140	"bPaginate": false,
		141	"bAutoWidth": false
		142	} ))
		143	.columnFilter(column_filter_options);
		144	});
119		145
120	});	146	});
121		147
Lines 129-138 function submitForm(form) { Link Here
129		155
130	<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;	156	<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;
131	[% IF ( grouping ) %]	157	[% IF ( grouping ) %]
132	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket grouping</a> &rsaquo; Add basket group for [% booksellername \|html %]</div>	158	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]">Basket groups</a> &rsaquo; Add basket group for [% booksellername \|html %]
133	[% ELSE %]	159	[% ELSE %]
134	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo; Basket grouping</div>	160	[% IF (booksellerid) %]
		161	<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a> &rsaquo;
		162	[% END %]
		163	Basket groups
135	[% END %]	164	[% END %]
		165	</div>
136		166
137	<div id="doc3" class="yui-t2">	167	<div id="doc3" class="yui-t2">
138	<div id="bd">	168	<div id="bd">
Lines 285-381 function submitForm(form) { Link Here
285	</div>	315	</div>
286	</div>	316	</div>
287	[% ELSE %]	317	[% ELSE %]
288	<div id="toolbar" class="btn-toolbar">	318	[% IF booksellerid %]
289	<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>	319	<div id="toolbar" class="btn-toolbar">
290	</div>	320	<div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
291	<h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername \|html %]</a></h1>	321	</div>
292	<div id="basket_groups" class="toptabs">	322	[% END %]
293	<ul class="ui-tabs-nav">	323
294	[% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened">Open</a></li>	324	[% FOREACH bookseller IN booksellers %]
295	[% ELSE%]<li><a href="#opened">Open</a></li>[% END %]	325	[% IF bookseller.basketgroups.size > 0 %]
296	[% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed">Closed</a></li>	326	<h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name \|html %]</a></h1>
297	[% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]	327	<div class="basket_groups toptabs">
298	</ul>	328	<ul class="ui-tabs-nav">
299	<div id="opened">	329	[% UNLESS ( listclosed) %]<li class="ui-tabs-active"><a href="#opened[% bookseller.id %]">Open</a></li>
300	<table id="basket_group_opened">	330	[% ELSE%]<li><a href="#opened[% bookseller.id %]">Open</a></li>[% END %]
301	<thead>	331	[% IF ( listclosed) %]<li class="ui-tabs-active"><a href="#closed[% bookseller.id %]">Closed</a></li>
302	<tr>	332	[% ELSE %]<li><a href="#closed[% bookseller.id %]">Closed</a></li>[% END %]
303	<th>Name</th>	333	</ul>
304	<th>Number</th>	334	<div id="opened[% bookseller.id %]">
305	<th>Billing place</th>	335	<table id="basket_group_opened">
306	<th>Delivery place</th>	336	<thead>
307	<th>Number of baskets</th>
308	<th>Action</th>
309	</tr>
310	</thead>
311	<tbody>
312	[% FOREACH basketgroup IN basketgroups %]
313	[% UNLESS ( basketgroup.closed ) %]
314	<tr>	337	<tr>
315	<td>[% IF ( basketgroup.name ) %]	338	<th>Search name</th>
316	[% basketgroup.name %]	339	<th>Search no.</th>
317	[% ELSE %]	340	<th>Search billing place</th>
318	Basket group no. [% basketgroup.id %]	341	<th>Search delivery place</th>
319	[% END %]	342	<th>Search no. of baskets</th>
320	</td>	343	<th>Search no. of ordered titles</th>
321	<td>[% basketgroup.id %]</td>	344	<th>Search no. of received titles</th>
322	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>	345	<th></th>
323	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
324	<td>[% basketgroup.basketsqty %]</td>
325	<td>
326	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and export as PDF" />
327	<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>
328	[% UNLESS basketgroup.basketsqty %]
329	<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>
330	[% END %]
331	</td>
332	</tr>	346	</tr>
333	[% END %]
334	[% END %]
335	</tbody>
336	</table>
337	</div>
338	<div id="closed">
339	<table id="basket_group_closed">
340	<thead>
341	<tr>
342	<th>Name</th>
343	<th>Number</th>
344	<th>Billing place</th>
345	<th>Delivery place</th>
346	<th>Number of baskets</th>
347	<th>Action</th>
348	</tr>
349	</thead>
350	<tbody>
351	[% FOREACH basketgroup IN basketgroups %]
352	[% IF ( basketgroup.closed ) %]
353	<tr>	347	<tr>
354	<td>	348	<th>Name</th>
355	[% IF ( basketgroup.name ) %]	349	<th>No.</th>
356	[% basketgroup.name %]	350	<th>Billing place</th>
357	[% ELSE %]	351	<th>Delivery place</th>
358	Basket group no. [% basketgroup.id %]	352	<th>No. of baskets</th>
359	[% END %]	353	<th>No. of ordered titles</th>
360	</td>	354	<th>No. of received titles</th>
361	<td>[% basketgroup.id %]</td>	355	<th>Action</th>
362	<td>[% Branches.GetName( basketgroup.billingplace ) %]</td>
363	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
364	<td>[% basketgroup.basketsqty %]</td>
365	<td>
366	<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>
367	<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>
368	<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>
369	<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>
370	<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>
371	</td>
372	</tr>	356	</tr>
373	[% END %]	357	</thead>
374	[% END %]	358	<tbody>
375	</tbody>	359	[% FOREACH basketgroup IN bookseller.basketgroups %]
376	</table>	360	[% UNLESS ( basketgroup.closed ) %]
377	</div>	361	<tr>
378	</div>	362	<td>
		363	[% IF ( basketgroup.name ) %]
		364	[% basketgroup.name %]
		365	[% ELSE %]
		366	Basket group no. [% basketgroup.id %]
		367	[% END %]
		368	</td>
		369	<td>[% basketgroup.id %]</td>
		370	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
		371	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
		372	<td>[% basketgroup.basketsqty %]</td>
		373	<td>[% basketgroup.ordered_titles_count %]</td>
		374	<td>[% basketgroup.received_titles_count %]</td>
		375	<td>
		376	<input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and export as PDF" />
		377	<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>
		378	[% UNLESS basketgroup.basketsqty %]
		379	<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>
		380	[% END %]
		381	</td>
		382	</tr>
		383	[% END %]
		384	[% END %]
		385	</tbody>
		386	</table>
		387	</div>
		388	<div id="closed[% bookseller.id %]">
		389	<table class="basket_group_closed">
		390	<thead>
		391	<tr>
		392	<th>Search name</th>
		393	<th>Search no.</th>
		394	<th>Search date closed</th>
		395	<th>Search billing place</th>
		396	<th>Search delivery place</th>
		397	<th>Search no. of baskets</th>
		398	<th>Search no. of ordered titles</th>
		399	<th>Search no. of received titles</th>
		400	<th></th>
		401	</tr>
		402	<tr>
		403	<th>Name</th>
		404	<th>No.</th>
		405	<th>Date closed</th>
		406	<th>Billing place</th>
		407	<th>Delivery place</th>
		408	<th>No. of baskets</th>
		409	<th>No. of ordered titles</th>
		410	<th>No. of received titles</th>
		411	<th>Action</th>
		412	</tr>
		413	</thead>
		414	<tbody>
		415	[% FOREACH basketgroup IN bookseller.basketgroups %]
		416	[% IF ( basketgroup.closed ) %]
		417	<tr>
		418	<td>
		419	[% IF ( basketgroup.name ) %]
		420	[% basketgroup.name %]
		421	[% ELSE %]
		422	Basket group no. [% basketgroup.id %]
		423	[% END %]
		424	</td>
		425	<td>[% basketgroup.id %]</td>
		426	<td>[% basketgroup.closeddate \|$KohaDates %]</td>
427	<td>[% Branches.GetName(basketgroup.billingplace) %]</td>
428	<td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName(basketgroup.deliveryplace) %][% END %]</td>
429	<td>[% basketgroup.basketsqty %]</td>
430	<td>[% basketgroup.ordered_titles_count %]</td>
431	<td>[% basketgroup.received_titles_count %]</td>
432	<td>
433	<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>
434	<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>
435	<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>
436	<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>
437	<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>
438	</td>
439	</tr>
440	[% END %]
441	[% END %]
442	</tbody>
443	</table>
444	</div>
445	</div>
446	[% END %]
447	[% END %]
379	[% END %]	448	[% END %]
380	</div>	449	</div>
381	</div>	450	</div>
382	-