# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
+# FIXME There are too many calls to Koha::Patrons->find in this script
+
use strict;
use warnings;
use CGI qw ( -utf8 );
use C4::Output;
use C4::Print;
use C4::Auth qw/:DEFAULT get_session haspermission/;
-use C4::Branch; # GetBranches
use C4::Koha; # GetPrinter
use C4::Circulation;
use C4::Utils::DataTables::Members;
use C4::Context;
use CGI::Session;
use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Patron;
-use Koha::Patron::Debarments qw(GetDebarments IsDebarred);
+use Koha::AuthorisedValues;
+use Koha::CsvProfiles;
+use Koha::Patrons;
+use Koha::Patron::Debarments qw(GetDebarments);
use Koha::DateUtils;
use Koha::Database;
+use Koha::BiblioFrameworks;
+use Koha::Items;
use Koha::Patron::Messages;
-use Koha::Patron::Images;
use Koha::SearchEngine;
use Koha::SearchEngine::Search;
use Koha::Patron::Modifications;
my $template_name = q|circ/circulation.tt|;
my $borrowernumber = $query->param('borrowernumber');
-my $borrower = $borrowernumber ? GetMember( borrowernumber => $borrowernumber ) : undef;
+my $patron = $borrowernumber ? Koha::Patrons->find( $borrowernumber ) : undef;
my $batch = $query->param('batch');
my $batch_allowed = 0;
if ( $batch && C4::Context->preference('BatchCheckouts') ) {
$template_name = q|circ/circulation_batch_checkouts.tt|;
my @batch_category_codes = split '\|', C4::Context->preference('BatchCheckoutsValidCategories');
- if ( grep {/^$borrower->{categorycode}$/} @batch_category_codes ) {
+ my $categorycode = $patron->categorycode;
+ if ( $categorycode && grep {/^$categorycode$/} @batch_category_codes ) {
$batch_allowed = 1;
} else {
$barcodes = [];
our %return_failed = ();
for (@failedreturns) { $return_failed{$_} = 1; }
+my $searchtype = $query->param('searchtype') || q{contain};
+
my $findborrower = $query->param('findborrower') || q{};
$findborrower =~ s|,| |g;
my $branch = C4::Context->userenv->{'branch'};
-# If AutoLocation is not activated, we show the Circulation Parameters to chage settings of librarian
-if (C4::Context->preference("AutoLocation") != 1) {
- $template->param(ManualLocation => 1);
-}
-
if (C4::Context->preference("DisplayClearScreenButton")) {
$template->param(DisplayClearScreenButton => 1);
}
my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate');
my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate');
-$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso' }); }
+$duedatespec = eval { output_pref( { dt => dt_from_string( $duedatespec ), dateformat => 'iso', timeformat => '24hr' }); }
if ( $duedatespec );
my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || $session->param('stickyduedate');
if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
#
my $message;
if ($findborrower) {
- my $borrower = C4::Members::GetMember( cardnumber => $findborrower );
- if ( $borrower ) {
- $borrowernumber = $borrower->{borrowernumber};
+ my $patron = Koha::Patrons->find( { cardnumber => $findborrower } );
+ if ( $patron ) {
+ $borrowernumber = $patron->borrowernumber;
} else {
my $dt_params = { iDisplayLength => -1 };
my $results = C4::Utils::DataTables::Members::search(
{
searchmember => $findborrower,
- searchtype => 'contain',
- dt_params => $dt_params,
+ searchtype => $searchtype,
+ dt_params => $dt_params,
}
);
my $borrowers = $results->{patrons};
}
# get the borrower information.....
-if ($borrowernumber) {
- $borrower = GetMemberDetails( $borrowernumber, 0 );
- my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
-
- # Warningdate is the date that the warning starts appearing
- my ( $today_year, $today_month, $today_day) = Today();
- my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'};
- my ( $enrol_year, $enrol_month, $enrol_day) = split /-/, $borrower->{'dateenrolled'};
+$patron ||= Koha::Patrons->find( $borrowernumber ) if $borrowernumber;
+if ($patron) {
+ my $overdues = $patron->get_overdues;
+ my $issues = $patron->checkouts;
+ my $balance = $patron->account->balance;
+
+
# if the expiry date is before today ie they have expired
- if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0
- || Date_to_Days($today_year, $today_month, $today_day )
- > Date_to_Days($warning_year, $warning_month, $warning_day) )
- {
+ if ( $patron->is_expired ) {
#borrowercard expired, no issues
$template->param(
noissues => ($force_allow_issue) ? 0 : "1",
);
}
# check for NotifyBorrowerDeparture
- elsif ( C4::Context->preference('NotifyBorrowerDeparture') &&
- Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
- Date_to_Days( $today_year, $today_month, $today_day ) )
- {
+ elsif ( $patron->is_going_to_expire ) {
# borrower card soon to expire warn librarian
- $template->param( "warndeparture" => $borrower->{dateexpiry} ,
+ $template->param( "warndeparture" => $patron->dateexpiry ,
);
if (C4::Context->preference('ReturnBeforeExpiry')){
$template->param("returnbeforeexpiry" => 1);
}
}
$template->param(
- overduecount => $od,
- issuecount => $issue,
- finetotal => $fines
+ overduecount => $overdues->count,
+ issuecount => $issues->count,
+ finetotal => $balance,
);
- if ( IsDebarred($borrowernumber) ) {
+ if ( $patron and $patron->is_debarred ) {
$template->param(
- 'userdebarred' => $borrower->{debarred},
- 'debarredcomment' => $borrower->{debarredcomment},
+ 'userdebarred' => $patron->debarred,
+ 'debarredcomment' => $patron->debarredcomment,
);
- if ( $borrower->{debarred} ne "9999-12-31" ) {
- $template->param( 'userdebarreddate' => $borrower->{debarred} );
+ if ( $patron->debarred ne "9999-12-31" ) {
+ $template->param( 'userdebarreddate' => $patron->debarred );
}
}
for my $barcode ( @$barcodes ) {
my $template_params = { barcode => $barcode };
# always check for blockers on issuing
- my ( $error, $question, $alerts ) = CanBookBeIssued(
- $borrower,
+ my ( $error, $question, $alerts, $messages ) = CanBookBeIssued(
+ $patron,
$barcode, $datedue,
$inprocess,
undef,
my $blocker = $invalidduedate ? 1 : 0;
$template_params->{alert} = $alerts;
+ $template_params->{messages} = $messages;
+
+ my $item = Koha::Items->find({ barcode => $barcode });
+ my ( $biblio, $mss );
- # Get the item title for more information
- my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode);
- $template_params->{authvalcode_notforloan} =
- C4::Koha::GetAuthValCode('items.notforloan', $getmessageiteminfo->{'frameworkcode'});
+ if ( $item ) {
+ $biblio = $item->biblio;
+ my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $biblio->frameworkcode, kohafield => 'items.notforloan', authorised_value => { not => undef } });
+ $template_params->{authvalcode_notforloan} = $mss->count ? $mss->next->authorised_value : undef;
+ }
# Fix for bug 7494: optional checkout-time fallback search for a book
}
}
- unless( $onsite_checkout and C4::Context->preference("OnSiteCheckoutsForce") ) {
+ if ( $error->{UNKNOWN_BARCODE} or not $onsite_checkout or not C4::Context->preference("OnSiteCheckoutsForce") ) {
delete $question->{'DEBT'} if ($debt_confirmed);
foreach my $impossible ( keys %$error ) {
$template_params->{$impossible} = $$error{$impossible};
$blocker = 1;
}
}
- my $iteminfo = GetBiblioFromItemNumber(undef, $barcode);
- if( !$blocker || $force_allow_issue ){
+
+ if( $item and ( !$blocker or $force_allow_issue ) ){
my $confirm_required = 0;
unless($issueconfirmed){
# Get the item title for more information
- my $materials = $iteminfo->{'materials'};
- my $avcode = GetAuthValCode('items.materials');
- if ($avcode) {
- $materials = GetKohaAuthorisedValueLib($avcode, $materials);
- }
+ my $materials = $item->materials;
+ my $descriptions = Koha::AuthorisedValues->get_description_by_koha_field({ frameworkcode => $biblio->frameworkcode, kohafield => 'items.materials', authorised_value => $materials });
+ $materials = $descriptions->{lib} // $materials;
$template_params->{additional_materials} = $materials;
- $template_params->{itemhomebranch} = $iteminfo->{'homebranch'};
+ $template_params->{itemhomebranch} = $item->homebranch;
# pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed.
foreach my $needsconfirmation ( keys %$question ) {
$template_params->{$needsconfirmation} = $$question{$needsconfirmation};
- $template_params->{getTitleMessageIteminfo} = $iteminfo->{'title'};
- $template_params->{getBarcodeMessageIteminfo} = $iteminfo->{'barcode'};
+ $template_params->{getTitleMessageIteminfo} = $biblio->title;
+ $template_params->{getBarcodeMessageIteminfo} = $item->barcode;
$template_params->{NEEDSCONFIRMATION} = 1;
$template_params->{onsite_checkout} = $onsite_checkout;
+ $template_params->{auto_renew} = $session->param('auto_renew');
$confirm_required = 1;
}
}
unless($confirm_required) {
- my $issue = AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew') } );
+ my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
+ my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, } );
$template_params->{issue} = $issue;
$session->clear('auto_renew');
$inprocess = 1;
}
}
- # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue
- my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber);
-
if ($question->{RESERVE_WAITING} or $question->{RESERVED}){
$template->param(
reserveborrowernumber => $question->{'resborrowernumber'}
);
}
- $template->param(
- itembiblionumber => $getmessageiteminfo->{'biblionumber'}
- );
-
+ # FIXME If the issue is confirmed, we launch another time checkouts->count, now display the issue count after issue
+ $patron = Koha::Patrons->find( $borrowernumber );
+ $template_params->{issuecount} = $patron->checkouts->count;
- $template_params->{issuecount} = $issue;
-
- if ( $iteminfo ) {
- $iteminfo->{subtitle} = GetRecordValue('subtitle', GetMarcBiblio($iteminfo->{biblionumber}), GetFrameworkCode($iteminfo->{biblionumber}));
- $template_params->{item} = $iteminfo;
+ if ( $item ) {
+ $template_params->{item} = $item;
+ $template_params->{biblio} = $biblio;
+ $template_params->{itembiblionumber} = $biblio->biblionumber;
}
push @$checkout_infos, $template_params;
}
}
}
-# reload the borrower info for the sake of reseting the flags.....
-if ($borrowernumber) {
- $borrower = GetMemberDetails( $borrowernumber, 0 );
-}
-
##################################################################################
# BUILD HTML
# show all reserves of this borrower, and the position of the reservation ....
-if ($borrowernumber) {
- my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } );
+if ($patron) {
+ my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
my $waiting_holds = $holds->waiting;
$template->param(
holds_count => $holds->count(),
WaitingHolds => $waiting_holds,
);
- $template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
+ my $category_type = $patron->category->category_type;
+ $template->param( adultborrower => 1 ) if ( $category_type eq 'A' || $category_type eq 'I' );
}
#title
-my $flags = $borrower->{'flags'};
+my $flags = $patron ? C4::Members::patronflags( $patron->unblessed ) : {};
foreach my $flag ( sort keys %$flags ) {
$flags->{$flag}->{'message'} =~ s#\n#<br />#g;
if ( $flags->{$flag}->{'noissues'} ) {
}
}
-my $amountold = $borrower->{flags} ? $borrower->{flags}->{'CHARGES'}->{'message'} || 0 : 0;
+my $amountold = $flags ? $flags->{'CHARGES'}->{'message'} || 0 : 0;
$amountold =~ s/^.*\$//; # remove upto the $, if any
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
-if ( $borrowernumber && $borrower->{'category_type'} eq 'C') {
- my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
- my $cnt = scalar(@$catcodes);
- $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
- $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1;
+if ( $patron && $patron->category->category_type eq 'C') {
+ my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
+ $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
+ $template->param( 'catcode' => $patron_categories->next ) if $patron_categories->count == 1;
}
-my $librarian_messages = Koha::Patron::Messages->search(
+my $messages = Koha::Patron::Messages->search(
{
- borrowernumber => $borrowernumber,
- message_type => 'L',
- }
-);
-
-my $patron_messages = Koha::Patron::Messages->search(
+ 'me.borrowernumber' => $borrowernumber,
+ },
{
- borrowernumber => $borrowernumber,
- message_type => 'B',
+ join => 'manager',
+ '+select' => ['manager.surname', 'manager.firstname' ],
+ '+as' => ['manager_surname', 'manager_firstname'],
}
);
my $fast_cataloging = 0;
-if (defined getframeworkinfo('FA')) {
+if ( Koha::BiblioFrameworks->find('FA') ) {
$fast_cataloging = 1
}
my @relatives;
if ( $borrowernumber ) {
- if ( my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ) ) {
+ if ( $patron ) {
if ( my $guarantor = $patron->guarantor ) {
push @relatives, $guarantor->borrowernumber;
push @relatives, $_->borrowernumber for $patron->siblings;
Koha::Database->new()->schema()->resultset('Issue')
->count( { borrowernumber => \@relatives } );
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
-
-$template->param(%$borrower);
+if ( $patron ) {
+ my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $patron->streettype });
+ my $roadtype = $av->count ? $av->next->lib : '';
+ $template->param(
+ %{ $patron->unblessed },
+ borrower => $patron->unblessed,
+ roadtype => $roadtype,
+ patron => $patron,
+ categoryname => $patron->category->description,
+ expiry => $patron->dateexpiry,
+ is_child => ( $patron->category->category_type eq 'C' ),
+ picture => ( $patron->image ? 1 : 0 ),
+ );
+}
# Restore date if changed by holds and/or save stickyduedate to session
if ($restoreduedatespec || $stickyduedate) {
}
$template->param(
- librarian_messages => $librarian_messages,
- patron_messages => $patron_messages,
- findborrower => $findborrower,
- borrower => $borrower,
+ messages => $messages,
borrowernumber => $borrowernumber,
- categoryname => $borrower->{'description'},
branch => $branch,
- branchname => GetBranchName($borrower->{'branchcode'}),
was_renewed => scalar $query->param('was_renewed') ? 1 : 0,
- expiry => $borrower->{'dateexpiry'},
- roadtype => $roadtype,
amountold => $amountold,
barcodes => $barcodes,
stickyduedate => $stickyduedate,
message => $message,
totaldue => sprintf('%.2f', $total),
inprocess => $inprocess,
- is_child => ($borrowernumber && $borrower->{'category_type'} eq 'C'),
$view => 1,
batch_allowed => $batch_allowed,
batch => $batch,
AudioAlerts => C4::Context->preference("AudioAlerts"),
fast_cataloging => $fast_cataloging,
CircAutoPrintQuickSlip => C4::Context->preference("CircAutoPrintQuickSlip"),
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
- SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
- AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
RoutingSerials => C4::Context->preference('RoutingSerials'),
relatives_issues_count => $relatives_issues_count,
relatives_borrowernumbers => \@relatives,
);
-my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
-$template->param( picture => 1 ) if $patron_image;
+if ( C4::Context->preference("ExportCircHistory") ) {
+ $template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
+}
+
+my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
$template->param(
debt_confirmed => $debt_confirmed,
SpecifyDueDate => $duedatespec_allow,
CircAutocompl => C4::Context->preference("CircAutocompl"),
- debarments => GetDebarments({ borrowernumber => $borrowernumber }),
+ debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
- modifications => Koha::Patron::Modifications->GetModifications({ borrowernumber => $borrowernumber }),
+ has_modifications => $has_modifications,
override_high_holds => $override_high_holds,
nopermission => scalar $query->param('nopermission'),
);
projects / koha.git / blobdiff