@@ -, +, @@ commit 95d6452462a560ba0c0ac859a2cfb7783c25c925 Adding some more information on issuehistory. commit aa114f53499b9cffde0571fe7e08622f9c9a332a Bug 5549 : Only use DateTime for issues table - my $today = C4::Dates->today('iso'); + my $today = DateTime->now( time_zome => C4::Context->tz); --- C4/Circulation.pm | 48 -------------------------------------- catalogue/issuehistory.pl | 22 +++-------------- t/db_dependent/Circulation/issue.t | 5 ---- 3 files changed, 3 insertions(+), 72 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -89,7 +89,6 @@ BEGIN { &GetSoonestRenewDate &GetLatestAutoRenewDate &GetItemIssue - &GetItemIssues &GetIssuingCharges &GetBranchBorrowerCircRule &GetBranchItemRule @@ -2513,53 +2512,6 @@ sub GetOpenIssue { } -=head2 GetItemIssues - - $issues = &GetItemIssues($itemnumber, $history); - -Returns patrons that have issued a book - -C<$itemnumber> is the itemnumber -C<$history> is false if you just want the current "issuer" (if any) -and true if you want issues history from old_issues also. - -Returns reference to an array of hashes - -=cut - -sub GetItemIssues { - my ( $itemnumber, $history ) = @_; - - my $today = DateTime->now( time_zome => C4::Context->tz); # get today date - $today->truncate( to => 'minute' ); - my $sql = "SELECT * FROM issues - JOIN borrowers USING (borrowernumber) - JOIN items USING (itemnumber) - WHERE issues.itemnumber = ? "; - if ($history) { - $sql .= "UNION ALL - SELECT * FROM old_issues - LEFT JOIN borrowers USING (borrowernumber) - JOIN items USING (itemnumber) - WHERE old_issues.itemnumber = ? "; - } - $sql .= "ORDER BY date_due DESC"; - my $sth = C4::Context->dbh->prepare($sql); - if ($history) { - $sth->execute($itemnumber, $itemnumber); - } else { - $sth->execute($itemnumber); - } - my $results = $sth->fetchall_arrayref({}); - foreach (@$results) { - my $date_due = dt_from_string($_->{date_due},'sql'); - $date_due->truncate( to => 'minute' ); - - $_->{overdue} = (DateTime->compare($date_due, $today) == -1) ? 1 : 0; - } - return $results; -} - =head2 GetBiblioIssues $issues = GetBiblioIssues($biblionumber); --- a/catalogue/issuehistory.pl +++ a/catalogue/issuehistory.pl @@ -42,30 +42,14 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my $params = $query->Vars; my $biblionumber = $params->{'biblionumber'}; -my $itemnumber = $params->{'itemnumber'}; if (C4::Context->preference("HidePatronName")) { $template->param(HidePatronName => 1); } -my ($issues,$biblio,$barcode); -if ($itemnumber){ - $issues=GetItemIssues($itemnumber); - $biblio=GetBiblioFromItemNumber($itemnumber); - $biblionumber=$biblio->{biblionumber}; - $barcode=$issues->[0]->{barcode}; - $template->param( - %$biblio, - barcode=> $barcode, - ); -} else { - $issues = GetBiblioIssues($biblionumber); - my $biblio = GetBiblio($biblionumber); - my $total = scalar @$issues; - $template->param( - %{$biblio}, - ); -} +my $issues = GetBiblioIssues($biblionumber); +my $biblio = GetBiblio($biblionumber); +$template->param(%$biblio); $template->param( total => scalar @$issues, --- a/t/db_dependent/Circulation/issue.t +++ a/t/db_dependent/Circulation/issue.t @@ -46,7 +46,6 @@ can_ok( GetBiblioIssues GetIssuingCharges GetItemIssue - GetItemIssues GetOpenIssue GetRenewCount GetUpcomingDueIssues @@ -224,10 +223,6 @@ is( GetBiblioIssues(), undef, "GetBiblio Issues without parameters" ); is(GetItemIssue,undef,"Without parameter GetItemIssue returns undef"); #is(GetItemIssue($item_id1),{},"Item1's issues"); -#Test GetItemIssues -#FIXME: this routine currently doesn't work be -#is_deeply (GetItemIssues,{},"Without parameter, GetItemIssue returns all the issues"); - #Test GetOpenIssue is( GetOpenIssue(), undef, "Without parameter GetOpenIssue returns undef" ); is( GetOpenIssue(-1), undef, --