Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / offline_circ / list.pl

diff --git a/offline_circ/list.pl b/offline_circ/list.pl
index 72d6dae..a58e94d 100755 (executable)
--- a/offline_circ/list.pl
+++ b/offline_circ/list.pl
@@ -4,34 +4,38 @@
 
 # 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 #
 
-use CGI;
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Auth;
 use C4::Koha;
 use C4::Context;
 use C4::Circulation;
-use C4::Branch;
 use C4::Members;
 use C4::Biblio;
+use Koha::Patrons;
+
+use Koha::Items;
 
 my $query = CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => "offline_circ/list.tmpl",
+    template_name => "offline_circ/list.tt",
     query => $query,
     type => "intranet",
     authnotrequired => 0,
@@ -41,14 +45,20 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
 my $operations = GetOfflineOperations;
 
 for (@$operations) {
-       my $biblio             = GetBiblioFromItemNumber(undef, $_->{'barcode'});
-       $_->{'bibliotitle'}    = $biblio->{'title'};
-       $_->{'biblionumber'}   = $biblio->{'biblionumber'};
-       my $borrower           = GetMemberDetails(undef,$_->{'cardnumber'});
-       $_->{'borrowernumber'} = $borrower->{'borrowernumber'};
-       $_->{'borrower'}       = join(' ', $borrower->{'firstname'}, $borrower->{'surname'});
-       $_->{'actionissue'}    = $_->{'action'} eq 'issue';
-       $_->{'actionreturn'}   = $_->{'action'} eq 'return';
+    my $item = $_->{barcode} ? Koha::Items->find({ barcode => $_->{barcode} }) : undef;
+    if ($item) {
+        my $biblio = $item->biblio;
+        $_->{'bibliotitle'}    = $biblio->title;
+        $_->{'biblionumber'}   = $biblio->biblionumber;
+    }
+    my $patron             = $_->{cardnumber} ? Koha::Patrons->find( { cardnumber => $_->{cardnumber} } ) : undef;
+    if ($patron) {
+        $_->{'borrowernumber'} = $patron->borrowernumber;
+        $_->{'borrower'}       = ($patron->firstname ? $patron->firstname:'').' '.$patron->surname;
+    }
+    $_->{'actionissue'}    = $_->{'action'} eq 'issue';
+    $_->{'actionreturn'}   = $_->{'action'} eq 'return';
+    $_->{'actionpayment'}  = $_->{'action'} eq 'payment';
 }
 $template->param(pending_operations => $operations);