From 3b7dc4b72e4f36874969ce095670c80ee9bddd30 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Wed, 8 Jan 2014 12:08:50 +0100 Subject: [PATCH] Bug 11708: New page for basket groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch moves the code responsible for displaying a list of basket groups into its own Perl script (acqui/basketgroups.pl), making the code in basketgroup.pl and basketgroup.tt a little bit easier to read. basketgroups.pl displays all basket groups in a single table (as bug 13371 for vendors) where rows are grouped by bookseller. This patch also adds 3 columns: - No. of ordered titles - No. of received titles - Date closed It also adds a wrapper around the new DataTable() constructor to be able to use it with the same defaults than the previous dataTable() constructor Test plan: 0. Create a bunch of booksellers and basketgroups 1. Go back to acquisitions home page and click on "Basket groups" link on the left 2. Play with the table (sort, filter) and try every possible actions (Edit, Close and export as PDF, View, Reopen, Export as CSV) 3. Go to a specific vendor page and click on "Basket groups" tab 4. Check that only the vendor's basket groups are displayed Signed-off-by: Séverine QUEUNE --- C4/Acquisition.pm | 8 +- Koha/Acquisition/Basket.pm | 22 ++ Koha/Acquisition/Basketgroup.pm | 133 +++++++ Koha/Acquisition/Basketgroups.pm | 50 +++ acqui/basket.pl | 4 +- acqui/basketgroup.pl | 187 +++++----- acqui/basketgroups.pl | 52 +++ .../prog/en/includes/acquisitions-menu.inc | 3 + .../intranet-tmpl/prog/en/includes/datatables.inc | 2 + .../intranet-tmpl/prog/en/includes/vendor-menu.inc | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 382 ++++++++------------- .../prog/en/modules/acqui/basketgroups.tt | 163 +++++++++ koha-tmpl/intranet-tmpl/prog/js/basketgroup.js | 8 - koha-tmpl/intranet-tmpl/prog/js/datatables.js | 95 +++-- 14 files changed, 739 insertions(+), 372 deletions(-) create mode 100644 Koha/Acquisition/Basketgroup.pm create mode 100644 Koha/Acquisition/Basketgroups.pm create mode 100755 acqui/basketgroups.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index dda9503a3f..626e6c1f6b 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1510,7 +1510,9 @@ sub ModReceiveOrder { $order->{datereceived} = $datereceived; $order->{invoiceid} = $invoice->{invoiceid}; $order->{orderstatus} = 'complete'; - $new_ordernumber = Koha::Acquisition::Order->new($order)->store->ordernumber; # TODO What if the store fails? + my @columns = Koha::Acquisition::Orders->columns; + my %filtered_order = map { exists $order->{$_} ? ($_ => $order->{$_}) : () } @columns; + $new_ordernumber = Koha::Acquisition::Order->new(\%filtered_order)->store->ordernumber; if ($received_items) { foreach my $itemnumber (@$received_items) { @@ -2000,7 +2002,9 @@ sub TransferOrder { delete $order->{parent_ordernumber}; $order->{'basketno'} = $basketno; - my $newordernumber = Koha::Acquisition::Order->new($order)->store->ordernumber; + my @columns = Koha::Acquisition::Orders->columns; + my %filtered_order = map { exists $order->{$_} ? ($_ => $order->{$_}) : () } @columns; + my $newordernumber = Koha::Acquisition::Order->new(\%filtered_order)->store->ordernumber; $query = q{ UPDATE aqorders_items diff --git a/Koha/Acquisition/Basket.pm b/Koha/Acquisition/Basket.pm index 98e4bd45b5..05ec074aa6 100644 --- a/Koha/Acquisition/Basket.pm +++ b/Koha/Acquisition/Basket.pm @@ -20,6 +20,7 @@ package Koha::Acquisition::Basket; use Modern::Perl; use Koha::Database; +use Koha::Acquisition::Orders; use base qw( Koha::Object ); @@ -58,6 +59,27 @@ sub effective_create_items { return $self->create_items || C4::Context->preference('AcqCreateItem'); } +=head3 orders + +Returns basket's orders + + # As an arrayref + my $orders = $basket->orders; + + # As an array + my @orders = $basket->orders; + +=cut + +sub orders { + my ($self) = @_; + + $self->{_orders} ||= Koha::Acquisition::Orders->search({ basketno => $self->basketno }); + + return wantarray ? $self->{_orders}->as_list : $self->{_orders}; +} + + =head2 Internal methods =head3 _type diff --git a/Koha/Acquisition/Basketgroup.pm b/Koha/Acquisition/Basketgroup.pm new file mode 100644 index 0000000000..26df6b94d8 --- /dev/null +++ b/Koha/Acquisition/Basketgroup.pm @@ -0,0 +1,133 @@ +package Koha::Acquisition::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::Acquisition::Baskets; + +use base qw(Koha::Object); + +=head1 NAME + +Koha::Acquisition::Basketgroup + +=head1 API + +=head2 Methods + +=head3 bookseller + +Returns the basketgroup's bookseller (Koha::Acquisition::Bookseller) + + my $bookseller = $basketgroup->bookseller; + +=cut + +sub bookseller { + my ($self) = @_; + + return scalar Koha::Acquisition::Booksellers->find($self->booksellerid); +} + +=head3 baskets + +Returns the basketgroup's baskets + + my $baskets = $basketgroup->baskets; # Koha::Acquisition::Baskets + my @baskets = $basketgroup->baskets; # array of Koha::Acquisition::Basket + +=cut + +sub baskets { + my ($self) = @_; + + $self->{_baskets} ||= Koha::Acquisition::Baskets->search({ basketgroupid => $self->id }); + + return wantarray ? $self->{_baskets}->as_list : $self->{_baskets}; +} + +=head3 baskets_count + +Returns the number of baskets contained in a basket group + + my $count = $basketgroup->baskets_count; + +=cut + +sub baskets_count { + my ($self) = @_; + + return $self->baskets->count; +} + +=head3 ordered_titles_count + +Returns the number of ordered titles contained in a basket group + + my $count = $basketgroup->ordered_titles_count; + +=cut + +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; +} + +=head3 received_titles_count + +Returns the number of received titles contained in a basket group + + my $count = $basketgroup->ordered_titles_count; + +=cut + +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; +} + +=head2 Internal Methods + +=head3 _type + +=cut + +sub _type { + return 'Aqbasketgroup'; +} + +1; diff --git a/Koha/Acquisition/Basketgroups.pm b/Koha/Acquisition/Basketgroups.pm new file mode 100644 index 0000000000..b227eb4a64 --- /dev/null +++ b/Koha/Acquisition/Basketgroups.pm @@ -0,0 +1,50 @@ +package Koha::Acquisition::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::Acquisition::Basketgroup; + +use base qw(Koha::Objects); + +=head1 NAME + +Koha::Acquisition::Basketgroups + +=head1 API + +=head2 Internal methods + +=cut + +=head3 _type + +=cut + +sub _type { + return 'Aqbasketgroup'; +} + +=head3 object_class + +=cut + +sub object_class { + return 'Koha::Acquisition::Basketgroup'; +} + +1; diff --git a/acqui/basket.pl b/acqui/basket.pl index 92fae60a0a..1b306bdee8 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -207,7 +207,7 @@ if ( $op eq 'delete_confirm' ) { }); ModBasket( { basketno => $basketno, basketgroupid => $basketgroupid } ); - print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid.'&closed=1'); + print $query->redirect('/cgi-bin/koha/acqui/basketgroups.pl?booksellerid='.$booksellerid); } else { print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?booksellerid=' . $booksellerid); } @@ -554,7 +554,7 @@ sub edi_close_and_order { } ); print $query->redirect( -"/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=$booksellerid&closed=1" + "/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=$booksellerid" ); } else { diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl index df625af184..8612a66bf7 100755 --- a/acqui/basketgroup.pl +++ b/acqui/basketgroup.pl @@ -58,6 +58,8 @@ use Koha::Acquisition::Booksellers; use Koha::ItemTypes; use Koha::Patrons; +use List::MoreUtils qw/uniq/; + our $input=new CGI; our ($template, $loggedinuser, $cookie) @@ -87,9 +89,7 @@ sub BasketTotal { #displays all basketgroups and all closed baskets (in their respective groups) sub displaybasketgroups { - my $basketgroups = shift; - my $bookseller = shift; - my $baskets = shift; + my ($basketgroups, $bookseller, $baskets, $template) = @_; if (scalar @$basketgroups != 0) { foreach my $basketgroup (@$basketgroups){ my $i = 0; @@ -123,29 +123,31 @@ sub displaybasketgroups { sub printbasketgrouppdf{ my ($basketgroupid) = @_; - + my $pdfformat = C4::Context->preference("OrderPdfFormat"); if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages' || $pdfformat eq 'pdfformat::layout3pagesfr' || $pdfformat eq 'pdfformat::layout2pagesde'){ - eval { - eval "require $pdfformat"; - import $pdfformat; - }; - if ($@){ - } + eval { + my $pdfformatfile = './' . ($pdfformat =~ s,::,/,gr) . '.pm'; + require $pdfformatfile; + import $pdfformat; + }; + if ($@){ + warn $@; + } } else { - print $input->header; - print $input->start_html; # FIXME Should do a nicer page - print "

Invalid PDF Format set

"; - print "Please go to the systempreferences and set a valid pdfformat"; - exit; + print $input->header; + print $input->start_html; # FIXME Should do a nicer page + print "

Invalid PDF Format set

"; + print "Please go to the systempreferences and set a valid pdfformat"; + exit; } - + my $basketgroup = GetBasketgroup($basketgroupid); my $bookseller = Koha::Acquisition::Booksellers->find( $basketgroup->{booksellerid} ); my $baskets = GetBasketsByBasketgroup($basketgroupid); - + my %orders; for my $basket (@$baskets) { my @ba_orders; @@ -208,7 +210,6 @@ sub printbasketgrouppdf{ ); my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->tax_rate // C4::Context->preference("gist")) || die "pdf generation failed"; print $pdf; - } sub generate_edifact_orders { @@ -222,70 +223,25 @@ sub generate_edifact_orders { 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 +# - 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 -# - display : display the list of all basketgroups for a vendor +# - 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 "add" ) { -# -# 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 $patron = Koha::Patrons->find( $loggedinuser ); # FIXME Not needed if billingplace and deliveryplace are set - $billingplace = $billingplace || $patron->branchcode; - $deliveryplace = $deliveryplace || $patron->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') { +if ($op eq 'mod_basket') { # # edit an individual basket contained in this basketgroup # @@ -326,7 +282,8 @@ if ( $op eq "add" ) { # my $basketgroupid = $input->param('basketgroupid'); DelBasketgroup($basketgroupid); - print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid.'&listclosed=1'); + print $input->redirect('/cgi-bin/koha/acqui/basketgroups.pl?booksellerid=' . $booksellerid); + exit; }elsif ( $op eq 'reopen'){ # # reopen a closed basketgroup @@ -334,8 +291,15 @@ if ( $op eq "add" ) { my $basketgroupid = $input->param('basketgroupid'); my $booksellerid = $input->param('booksellerid'); ReOpenBasketgroup($basketgroupid); - 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'; + my $redirectpath; + my $mode = $input->param('mode'); + if (defined $mode && $mode eq 'singlebg') { + $redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&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 @@ -381,22 +345,63 @@ if ( $op eq "add" ) { }; $basketgroupid = NewBasketgroup($basketgroup); } - 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; - $redirectpath .= "&listclosed=1" if $closedbg ; - print $input->redirect($redirectpath ); - + my $redirectpath; + my $mode = $input->param('mode'); + if (defined $mode && $mode eq 'singlebg') { + $redirectpath = '/cgi-bin/koha/acqui/basketgroup.pl?op=add&basketgroupid='.$basketgroupid.'&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; -}else{ -# no param : display the list of all basketgroups for a given vendor - my $basketgroups = &GetBasketgroups($booksellerid); - my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid ); - my $baskets = &GetBasketsByBookseller($booksellerid); +} - displaybasketgroups($basketgroups, $bookseller, $baskets); +# 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}, + billingplace => $basketgroup->{billingplace}, + deliveryplace => $basketgroup->{deliveryplace}, + deliverycomment => $basketgroup->{deliverycomment}, + freedeliveryplace => $basketgroup->{freedeliveryplace}, + closedbg => $basketgroup->{closed} ? 1 : 0 + ); +} else { + $template->param( closedbg => 0); } -$template->param(listclosed => ((defined $input->param('listclosed')) && ($input->param('listclosed') eq '1'))? 1:0 ); -#prolly won't use all these, maybe just use print, the rest can be done inside validate +# determine default billing and delivery places depending on librarian homebranch and existing basketgroup data +my $borrower = Koha::Patrons->find( $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; diff --git a/acqui/basketgroups.pl b/acqui/basketgroups.pl new file mode 100755 index 0000000000..debe80db1b --- /dev/null +++ b/acqui/basketgroups.pl @@ -0,0 +1,52 @@ +#!/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 . + +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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 8d46d87939..9421bac20e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -3,6 +3,9 @@
Acquisitions
  • Acquisitions home
  • + [% IF ( CAN_user_acquisition_group_manage ) %] +
  • Basket groups
  • + [% END %]
  • Late orders
  • [% IF ( suggestion ) %]
  • Suggestions
  • [% END %]
  • Invoices
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc index b6cd884561..a9ec52f555 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc @@ -23,6 +23,8 @@ var MSG_DT_SEARCH = _("Search:"); var MSG_DT_ZERO_RECORDS = _("No matching records found"); var MSG_DT_ALL = _("All"); + var MSG_DT_SORT_ASC = _(": activate to sort column ascending"); + var MSG_DT_SORT_DESC = _(": activate to sort column descending"); var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); var MSG_DT_COPY_TITLE = _("Copy to clipboard"); var MSG_DT_COPY_KEYS = _("Press ctrl or ⌘ + C to copy the table data
    to your system clipboard.

    To cancel, click this message or press escape."); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc index 106221e203..724b43c610 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc @@ -2,7 +2,7 @@ -[% END %] + [% booksellername |html %] + › + Basket groups + › + Add basket group for [% booksellername |html %] +
    - [% IF ( grouping ) %] - [% IF (closedbg) %] -
    - - - - + [% IF (closedbg) %] + + [% END %] + [% IF (name && closedbg) %] +

    Basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    + [% ELSIF (name) %] +

    Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    + [% ELSE %] +

    Add basket group for [% booksellername |html %]

    + [% END %] +
    + [% UNLESS (closedbg) %] +
    +
    +
    +
    +
    +

    Ungrouped baskets

    + +
    +
    +
    +
    [% END %] - [% IF (name && closedbg) %] -

    Basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    - [% ELSIF (name) %] -

    Edit basket group [% name %] ([% basketgroupid %]) for [% booksellername |html %]

    - [% ELSE %] -

    Add basket group for [% booksellername |html %]

    - [% END %] -
    - [% UNLESS (closedbg) %] -
    -
    -
    -
    -
    -

    Ungrouped baskets

    - -
    -
    -
    -
    -
    - [% END %] -
    -
    -
    -
      +
      + +
      +
        + [% UNLESS (closedbg) %] +
      1. + + +
      2. + [% ELSE %] + + [% END %] +
      3. [% UNLESS (closedbg) %] -
      4. - - -
      5. + + [% ELSE %] - + Billing place: + [% Branches.GetName( billingplace ) %] [% END %] + + [% UNLESS (closedbg) %]
      6. - [% UNLESS (closedbg) %] - - - [% ELSE %] - Billing place: - [% Branches.GetName( billingplace ) %] - [% END %] + +
      7. - [% UNLESS (closedbg) %] -
      8. - - -
      9. -
      10. or

      11. -
      12. - - -
      13. - [% ELSE %] -
      14. - Delivery place: - [% IF (freedeliveryplace) %] - [% freedeliveryplace %] - - [% ELSE %] - [% Branches.GetName( deliveryplace ) %] - - [% END %] -
      15. - [% END %] +
      16. or

      17. +
      18. + + +
      19. + [% ELSE %]
      20. - [% UNLESS (closedbg) %] - - + Delivery place: + [% IF (freedeliveryplace) %] + [% freedeliveryplace %] + [% ELSE %] - Delivery comment:[% deliverycomment %] - + [% Branches.GetName( deliveryplace ) %] + [% END %]
      21. -
      22. - Baskets in this group: - [% UNLESS (closedbg) %] -
      -
      - [% UNLESS (closedbg) %] -
      - [% IF ( basketgroupid ) %] - - [% END %] - - Cancel -
      - [% END %] - -
      -
    - [% ELSE %] - -

    Basket grouping for [% booksellername |html %]

    -
    -
      - [% UNLESS ( listclosed) %]
    • Open
    • - [% ELSE%]
    • Open
    • [% END %] - [% IF ( listclosed) %]
    • Closed
    • - [% ELSE %]
    • Closed
    • [% END %] -
    -
    - - - - - - - - - - - - - [% FOREACH basketgroup IN basketgroups %] - [% UNLESS ( basketgroup.closed ) %] - - - - - - - - - [% END %] - [% END %] - -
    NameNumberBilling placeDelivery placeNumber of basketsAction
    [% IF ( basketgroup.name ) %] - [% basketgroup.name %] - [% ELSE %] - Basket group no. [% basketgroup.id %] - [% END %] - [% basketgroup.id %][% Branches.GetName( basketgroup.billingplace ) %][% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %][% basketgroup.basketsqty %] - -
    - [% UNLESS basketgroup.basketsqty %] -
    - [% END %] -
    -
    -
    - - - - - - - - - - - - - [% FOREACH basketgroup IN basketgroups %] - [% IF ( basketgroup.closed ) %] - - - - - - - - + ,
    + Total: [% selectedbasket.total | $Price %] + + + [% END %] + + + [% UNLESS (closedbg) %] +
  • + [% ELSE %] + [% END %] + + + [% UNLESS (closedbg) %] +
    + [% IF ( basketgroupid ) %] + [% END %] -
    -
    NameNumberBilling placeDelivery placeNumber of basketsAction
    - [% IF ( basketgroup.name ) %] - [% basketgroup.name %] + [% FOREACH selectedbasket IN selectedbaskets %] +
  • + + [% IF ( selectedbasket.basketname ) %] + [% selectedbasket.basketname %] [% ELSE %] - Basket group no. [% basketgroup.id %] + No name, basketnumber: [% selectedbasket.basketno %] [% END %] -
  • [% basketgroup.id %][% Branches.GetName( basketgroup.billingplace ) %][% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %][% basketgroup.basketsqty %] -
    -
    -
    -
    -
    -
    -
    + + Cancel + + [% END %] +
    - [% END %] +
    - [% IF ( booksellerid ) %] - [% INCLUDE 'vendor-menu.inc' %] - [% END %] + [% INCLUDE 'vendor-menu.inc' %] [% INCLUDE 'acquisitions-menu.inc' %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt new file mode 100644 index 0000000000..e9258a9f23 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt @@ -0,0 +1,163 @@ +[% USE Asset %] +[% USE Branches %] +[% USE KohaDates %] + +[% INCLUDE 'doc-head-open.inc' %] + [% IF bookseller %] + Koha › Basket groups for [% bookseller.name |html %] + [% ELSE %] + Koha › Basket groups + [% END %] + + [% Asset.css('css/datatables.css') %] + [% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'datatables.inc' %] + [% Asset.js('lib/jquery/plugins/jquery.dataTables.columnFilter.js') %] + + + + [% INCLUDE 'header.inc' %] + [% INCLUDE 'acquisitions-search.inc' %] + + + +
    +
    +
    +
    + [% IF bookseller %] + + +

    Basket groups for [% bookseller.name %]

    + [% END %] + + [% IF basketgroups.size > 0 %] + + + + + + + + + + + + + + + + [% FOREACH basketgroup IN basketgroups %] + + + + + + + + + + + + [% END %] + +
    NameVendorBilling placeDelivery placeNo. of basketsNo. of ordered titlesNo. of received titlesDate closedAction
    + [% IF ( basketgroup.name ) %] + [% basketgroup.name %] + [% ELSE %] + Basket group no. [% basketgroup.id %] + [% END %] + [% basketgroup.bookseller.name %][% Branches.GetName(basketgroup.billingplace) %] + [% IF (basketgroup.freedeliveryplace) %] + [% basketgroup.freedeliveryplace %] + [% ELSE %] + [% Branches.GetName(basketgroup.deliveryplace) %] + [% END %] + [% basketgroup.baskets_count %][% basketgroup.ordered_titles_count %][% basketgroup.received_titles_count %][% basketgroup.closeddate | $KohaDates %] + +
    + [% END %] +
    +
    +
    + [% IF bookseller %] + [% INCLUDE 'vendor-menu.inc' booksellerid = bookseller.id %] + [% END %] + [% INCLUDE 'acquisitions-menu.inc' %] +
    +
    + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js b/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js index 0d8a525a46..daf0a15d23 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js +++ b/koha-tmpl/intranet-tmpl/prog/js/basketgroup.js @@ -233,14 +233,6 @@ function closebasketgroup(bgid) { div.appendChild(unclosegroup); } -function closeandprint(bg){ - if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){ - setTimeout("window.location.reload();",3000); - }else{ - alert(MSG_FILE_DOWNLOAD_ERROR); - } -} - //function that lets the user unclose a basketgroup //as long as they haven't submitted the changes to the page. function unclosegroup(bgid){ diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 9c3caf1703..cf98786468 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -1,42 +1,89 @@ // These default options are for translation but can be used // for any other datatables settings // MSG_DT_* variables comes from datatables.inc -// To use it, write: -// $("#table_id").dataTable($.extend(true, {}, dataTableDefaults, { -// // other settings -// } ) ); +// 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" + }, + "buttons": { + "copyTitle" : window.MSG_DT_COPY_TITLE || "Copy to clipboard", + "copyKeys" : window.MSG_DT_COPY_KEYS || "Press ctrl or + C to copy the table data
    to your system clipboard.

    To cancel, click this message or press escape.", + "copySuccess": { + "_": window.MSG_DT_COPY_SUCCESS_X || "Copied %d rows to clipboard", + "1": window.MSG_DT_COPY_SUCCESS_ONE || "Copied one row to clipboard" + } + } + }, + "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" : window.MSG_DT_FIRST || "First", - "sLast" : window.MSG_DT_LAST || "Last", - "sNext" : window.MSG_DT_NEXT || "Next", - "sPrevious" : window.MSG_DT_PREVIOUS || "Previous" + "sFirst" : DataTableDefaults.language.paginate.first, + "sLast" : DataTableDefaults.language.paginate.last, + "sNext" : DataTableDefaults.language.paginate.next, + "sPrevious" : DataTableDefaults.language.paginate.previous, }, - "sEmptyTable" : window.MSG_DT_EMPTY_TABLE || "No data available in table", - "sInfo" : window.MSG_DT_INFO || "Showing _START_ to _END_ of _TOTAL_ entries", - "sInfoEmpty" : window.MSG_DT_INFO_EMPTY || "No entries to show", - "sInfoFiltered" : window.MSG_DT_INFO_FILTERED || "(filtered from _MAX_ total entries)", - "sLengthMenu" : window.MSG_DT_LENGTH_MENU || "Show _MENU_ entries", - "sLoadingRecords" : window.MSG_DT_LOADING_RECORDS || "Loading...", - "sProcessing" : window.MSG_DT_PROCESSING || "Processing...", - "sSearch" : window.MSG_DT_SEARCH || "Search:", - "sZeroRecords" : window.MSG_DT_ZERO_RECORDS || "No matching records found", - buttons: { - "copyTitle" : window.MSG_DT_COPY_TITLE || "Copy to clipboard", - "copyKeys" : window.MSG_DT_COPY_KEYS || "Press ctrl or + C to copy the table data
    to your system clipboard.

    To cancel, click this message or press escape.", + "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, + "buttons": { + "copyTitle" : DataTableDefaults.language.buttons.copyTitle, + "copyKeys" : DataTableDefaults.language.buttons.copyKeys, "copySuccess": { - _: window.MSG_DT_COPY_SUCCESS_X || "Copied %d rows to clipboard", - 1: window.MSG_DT_COPY_SUCCESS_ONE || "Copied one row to clipboard" + "_": DataTableDefaults.language.buttons.copySuccess["_"], + "1": DataTableDefaults.language.buttons.copySuccess["1"] } } }, "dom": '<"top pager"ilpfB>tr<"bottom pager"ip>', "buttons": [], - "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, window.MSG_DT_ALL || "All"]], - "iDisplayLength": 20 + "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 ) { -- 2.14.2