projects
/
koha_gimpoz
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'kc/master' into merged_5549
[koha_gimpoz]
/
reserve
/
request.pl
diff --git
a/reserve/request.pl
b/reserve/request.pl
index
06fd8a2
..
b96447f
100755
(executable)
--- a/
reserve/request.pl
+++ b/
reserve/request.pl
@@
-28,7
+28,7
@@
script to place reserves/requests
use strict;
use warnings;
use strict;
use warnings;
-use C4::Branch;
# GetBranches get_branchinfos_of
+use C4::Branch;
use CGI;
use List::MoreUtils qw/uniq/;
use Date::Calc qw/Date_to_Days/;
use CGI;
use List::MoreUtils qw/uniq/;
use Date::Calc qw/Date_to_Days/;
@@
-42,6
+42,7
@@
use C4::Circulation;
use C4::Dates qw/format_date/;
use C4::Members;
use C4::Search; # enabled_staff_search_views
use C4::Dates qw/format_date/;
use C4::Members;
use C4::Search; # enabled_staff_search_views
+use Koha::DateUtils;
my $dbh = C4::Context->dbh;
my $sth;
my $dbh = C4::Context->dbh;
my $sth;
@@
-112,26
+113,24
@@
if ( $action eq 'move' ) {
}
if ($findborrower) {
}
if ($findborrower) {
- my ( $count, $borrowers ) =
- SearchMember($findborrower, 'cardnumber', 'web' );
+ my $borrowers = Search($findborrower, 'cardnumber');
- my @borrowers = @$borrowers;
-
- if ( !@borrowers ) {
+ if ($borrowers && @$borrowers) {
+ if ( @$borrowers == 1 ) {
+ $borrowernumber_hold = $borrowers->[0]->{'borrowernumber'};
+ }
+ else {
+ $borrowerslist = $borrowers;
+ }
+ } else {
$messageborrower = "'$findborrower'";
}
$messageborrower = "'$findborrower'";
}
- elsif ( @borrowers == 1 ) {
- $borrowernumber_hold = $borrowers[0]->{'borrowernumber'};
- }
- else {
- $borrowerslist = \@borrowers;
- }
}
# If we have the borrowernumber because we've performed an action, then we
# don't want to try to place another reserve.
if ($borrowernumber_hold && !$action) {
}
# If we have the borrowernumber because we've performed an action, then we
# don't want to try to place another reserve.
if ($borrowernumber_hold && !$action) {
- my $borrowerinfo = GetMember
Details(
$borrowernumber_hold );
+ my $borrowerinfo = GetMember
( borrowernumber =>
$borrowernumber_hold );
my $diffbranch;
my @getreservloop;
my $count_reserv = 0;
my $diffbranch;
my @getreservloop;
my $count_reserv = 0;
@@
-194,9
+193,9
@@
if ($borrowerslist) {
foreach my $borrower (
sort {
foreach my $borrower (
sort {
- $a->{surname}
- . $a->{firstname}
cmp
$b->{surname}
- . $b->{firstname}
+
uc(
$a->{surname}
+ . $a->{firstname}
) cmp uc(
$b->{surname}
+ . $b->{firstname}
)
} @{$borrowerslist}
)
{
} @{$borrowerslist}
)
{
@@
-219,8
+218,8
@@
if ($borrowerslist) {
);
}
);
}
-# FIXME launch another time GetMember
Details
perhaps until
-my $borrowerinfo = GetMember
Details(
$borrowernumber_hold );
+# FIXME launch another time GetMember perhaps until
+my $borrowerinfo = GetMember
( borrowernumber =>
$borrowernumber_hold );
my @biblionumbers = ();
my $biblionumbers = $input->param('biblionumbers');
my @biblionumbers = ();
my $biblionumbers = $input->param('biblionumbers');
@@
-369,13
+368,13
@@
foreach my $biblionumber (@biblionumbers) {
# change the background color
my $issues= GetItemIssue($itemnumber);
if ( $issues->{'date_due'} ) {
# change the background color
my $issues= GetItemIssue($itemnumber);
if ( $issues->{'date_due'} ) {
- $item->{date_due} = format_
date($issues->{'date_due'
});
+ $item->{date_due} = format_
sqldatetime($issues->{date_due
});
$item->{backgroundcolor} = 'onloan';
}
# checking reserve
my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemnumber);
$item->{backgroundcolor} = 'onloan';
}
# checking reserve
my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemnumber);
- my $ItemBorrowerReserveInfo = GetMember
Details( $reservedfor, 0
);
+ my $ItemBorrowerReserveInfo = GetMember
( borrowernumber => $reservedfor
);
if ( defined $reservedate ) {
$item->{backgroundcolor} = 'reserved';
if ( defined $reservedate ) {
$item->{backgroundcolor} = 'reserved';
@@
-544,7
+543,7
@@
foreach my $biblionumber (@biblionumbers) {
}
# get borrowers reserve info
}
# get borrowers reserve info
- my $reserveborrowerinfo = GetMember
Details( $res->{'borrowernumber'}, 0
);
+ my $reserveborrowerinfo = GetMember
( borrowernumber => $res->{'borrowernumber'}
);
if (C4::Context->preference('HidePatronName')){
$reserve{'hidename'} = 1;
$reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
if (C4::Context->preference('HidePatronName')){
$reserve{'hidename'} = 1;
$reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};