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::Borrower::Debarments qw(GetDebarments IsDebarred);
+use Koha::AuthorisedValues;
+use Koha::Patron;
+use Koha::Patron::Debarments qw(GetDebarments);
use Koha::DateUtils;
use Koha::Database;
+use Koha::Patron::Messages;
+use Koha::Patron::Images;
+use Koha::SearchEngine;
+use Koha::SearchEngine::Search;
+use Koha::Patron::Modifications;
use Date::Calc qw(
Today
- Add_Delta_YM
Add_Delta_Days
Date_to_Days
);
#
my $query = new CGI;
+my $override_high_holds = $query->param('override_high_holds');
+my $override_high_holds_tmp = $query->param('override_high_holds_tmp');
+
my $sessionID = $query->cookie("CGISESSID") ;
my $session = get_session($sessionID);
-
-# branch and printer are now defined by the userenv
-# but first we have to check if someone has tried to change them
-
-my $branch = $query->param('branch');
-if ($branch){
- # update our session so the userenv is updated
- $session->param('branch', $branch);
- $session->param('branchname', GetBranchName($branch));
-}
-
-my $printer = $query->param('printer');
-if ($printer){
- # update our session so the userenv is updated
- $session->param('branchprinter', $printer);
-}
-
-if (!C4::Context->userenv && !$branch){
+if (!C4::Context->userenv){
if ($session->param('branch') eq 'NO_LIBRARY_SET'){
# no branch set we can't issue
print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl");
}
my $barcodes = [];
-if ( my $barcode = $query->param('barcode') ) {
+my $barcode = $query->param('barcode');
+# Barcode given by user could be '0'
+if ( $barcode || ( defined($barcode) && $barcode eq '0' ) ) {
$barcodes = [ $barcode ];
} else {
my $filefh = $query->upload('uploadfile');
push @$barcodes, split( /\s\n/, $list );
$barcodes = [ map { $_ =~ /^\s*$/ ? () : $_ } @$barcodes ];
} else {
- @$barcodes = $query->param('barcodes');
+ @$barcodes = $query->multi_param('barcodes');
}
}
}
);
-my $branches = GetBranches();
-
my $force_allow_issue = $query->param('forceallow') || 0;
if (!C4::Auth::haspermission( C4::Context->userenv->{id} , { circulate => 'force_checkout' } )) {
$force_allow_issue = 0;
my $onsite_checkout = $query->param('onsite_checkout');
-my @failedrenews = $query->param('failedrenew'); # expected to be itemnumbers
+my @failedrenews = $query->multi_param('failedrenew'); # expected to be itemnumbers
our %renew_failed = ();
for (@failedrenews) { $renew_failed{$_} = 1; }
-my @failedreturns = $query->param('failedreturn');
+my @failedreturns = $query->multi_param('failedreturn');
our %return_failed = ();
for (@failedreturns) { $return_failed{$_} = 1; }
+my $searchtype = $query->param('searchtype') || q{contain};
+
my $findborrower = $query->param('findborrower') || q{};
$findborrower =~ s|,| |g;
-$branch = C4::Context->userenv->{'branch'};
-$printer = C4::Context->userenv->{'branchprinter'};
+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) {
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') || $session->param('stickyduedate') || $duedatespec;
-if ($restoreduedatespec eq "highholds_empty") {
+my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec || $session->param('stickyduedate');
+if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) {
undef $restoreduedatespec;
}
my $issueconfirmed = $query->param('issueconfirmed');
$stickyduedate = $query->param('stickyduedate');
$duedatespec = $query->param('duedatespec');
}
- $session->param('auto_renew', $query->param('auto_renew'));
+ $session->param('auto_renew', scalar $query->param('auto_renew'));
}
else {
$session->clear('auto_renew');
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};
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'};
- # Renew day is calculated by adding the enrolment period to today
- my ( $renew_year, $renew_month, $renew_day);
- if ($enrol_year*$enrol_month*$enrol_day>0) {
- ( $renew_year, $renew_month, $renew_day) =
- Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
- 0 , $borrower->{'enrolmentperiod'});
- }
# 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 )
{
#borrowercard expired, no issues
$template->param(
- flagged => "1",
noissues => ($force_allow_issue) ? 0 : "1",
forceallow => $force_allow_issue,
expired => "1",
- renewaldate => "$renew_year-$renew_month-$renew_day",
);
}
# check for NotifyBorrowerDeparture
{
# borrower card soon to expire warn librarian
$template->param( "warndeparture" => $borrower->{dateexpiry} ,
- flagged => "1"
);
if (C4::Context->preference('ReturnBeforeExpiry')){
$template->param("returnbeforeexpiry" => 1);
finetotal => $fines
);
- if ( IsDebarred($borrowernumber) ) {
+ my $patron = Koha::Patrons->find( $borrowernumber );
+ if ( $patron and $patron->is_debarred ) {
$template->param(
'userdebarred' => $borrower->{debarred},
'debarredcomment' => $borrower->{debarredcomment},
for my $barcode ( @$barcodes ) {
my $template_params = { barcode => $barcode };
# always check for blockers on issuing
- my ( $error, $question, $alerts ) =
- CanBookBeIssued( $borrower, $barcode, $datedue , $inprocess, undef, { onsite_checkout => $onsite_checkout } );
+ my ( $error, $question, $alerts, $messages ) = CanBookBeIssued(
+ $borrower,
+ $barcode, $datedue,
+ $inprocess,
+ undef,
+ {
+ onsite_checkout => $onsite_checkout,
+ override_high_holds => $override_high_holds || $override_high_holds_tmp || 0,
+ }
+ );
+
my $blocker = $invalidduedate ? 1 : 0;
$template_params->{alert} = $alerts;
+ $template_params->{messages} = $messages;
# Get the item title for more information
my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode);
- $template_params->{authvalcode_notforloan} =
- C4::Koha::GetAuthValCode('items.notforloan', $getmessageiteminfo->{'frameworkcode'});
+
+ my $mss = Koha::MarcSubfieldStructures->search({ frameworkcode => $getmessageiteminfo->{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
{
$template_params->{FALLBACK} = 1;
+ my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
my $query = "kw=" . $barcode;
- my ( $searcherror, $results, $total_hits ) = SimpleSearch($query);
+ my ( $searcherror, $results, $total_hits ) = $searcher->simple_search_compat($query, 0, 10);
# if multiple hits, offer options to librarian
if ( $total_hits > 0 ) {
my @options = ();
foreach my $hit ( @{$results} ) {
my $chosen =
- TransformMarcToKoha( C4::Context->dbh,
- C4::Search::new_record_from_zebra('biblioserver',$hit) );
+ TransformMarcToKoha( C4::Search::new_record_from_zebra('biblioserver',$hit) );
# offer all barcodes individually
if ( $chosen->{barcode} ) {
my $confirm_required = 0;
unless($issueconfirmed){
# Get the item title for more information
- $template_params->{additional_materials} = $iteminfo->{'materials'};
+ my $materials = $iteminfo->{'materials'};
+ my $av = Koha::AuthorisedValues->search_by_koha_field({ frameworkcode => $getmessageiteminfo->{frameworkcode}, kohafield => 'items.materials', authorised_value => $materials });
+ $materials = $av->count ? $av->next->lib : '';
+ $template_params->{additional_materials} = $materials;
$template_params->{itemhomebranch} = $iteminfo->{'homebranch'};
# pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed.
}
}
unless($confirm_required) {
- my $issue = AddIssue( $borrower, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew') } );
- $template->param( issue => $issue );
+ my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
+ my $issue = AddIssue( $borrower, $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;
}
if ($question->{RESERVE_WAITING} or $question->{RESERVED}){
$template->param(
- reserveborrowernumber => $question->{'resborrowernumber'},
- itembiblionumber => $getmessageiteminfo->{'biblionumber'}
+ reserveborrowernumber => $question->{'resborrowernumber'}
);
}
+ $template->param(
+ itembiblionumber => $getmessageiteminfo->{'biblionumber'}
+ );
+
+
+
$template_params->{issuecount} = $issue;
if ( $iteminfo ) {
#title
my $flags = $borrower->{'flags'};
foreach my $flag ( sort keys %$flags ) {
- $template->param( flagged=> 1);
$flags->{$flag}->{'message'} =~ s#\n#<br />#g;
if ( $flags->{$flag}->{'noissues'} ) {
$template->param(
charges_is_blocker => 1
);
}
+ elsif ( $flag eq 'CHARGES_GUARANTEES' ) {
+ $template->param(
+ charges_guarantees => 'true',
+ chargesmsg_guarantees => $flags->{'CHARGES_GUARANTEES'}->{'message'},
+ chargesamount_guarantees => $flags->{'CHARGES_GUARANTEES'}->{'amount'},
+ charges_guarantees_is_blocker => 1
+ );
+ }
elsif ( $flag eq 'CREDITS' ) {
$template->param(
credits => 'true',
chargesamount => $flags->{'CHARGES'}->{'amount'},
);
}
+ elsif ( $flag eq 'CHARGES_GUARANTEES' ) {
+ $template->param(
+ charges_guarantees => 'true',
+ chargesmsg_guarantees => $flags->{'CHARGES_GUARANTEES'}->{'message'},
+ chargesamount_guarantees => $flags->{'CHARGES_GUARANTEES'}->{'amount'},
+ );
+ }
elsif ( $flag eq 'CREDITS' ) {
$template->param(
credits => 'true',
}
}
-my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
+my $amountold = $borrower->{flags} ? $borrower->{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;
+ 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 $lib_messages_loop = GetMessages( $borrowernumber, 'L', $branch );
-if($lib_messages_loop){ $template->param(flagged => 1 ); }
+my $librarian_messages = Koha::Patron::Messages->search(
+ {
+ borrowernumber => $borrowernumber,
+ message_type => 'L',
+ }
+);
-my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
-if($bor_messages_loop){ $template->param(flagged => 1 ); }
+my $patron_messages = Koha::Patron::Messages->search(
+ {
+ borrowernumber => $borrowernumber,
+ message_type => 'B',
+ }
+);
my $fast_cataloging = 0;
if (defined getframeworkinfo('FA')) {
?'batch_checkout_view'
: 'circview';
-my @relatives = GetMemberRelatives( $borrower->{'borrowernumber'} );
+my @relatives;
+if ( $borrowernumber ) {
+ if ( my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ) ) {
+ if ( my $guarantor = $patron->guarantor ) {
+ push @relatives, $guarantor->borrowernumber;
+ push @relatives, $_->borrowernumber for $patron->siblings;
+ } else {
+ push @relatives, $_->borrowernumber for $patron->guarantees;
+ }
+ }
+}
my $relatives_issues_count =
Koha::Database->new()->schema()->resultset('Issue')
->count( { borrowernumber => \@relatives } );
-my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
+my $av = Koha::AuthorisedValues->search({ category => 'ROADTYPE', authorised_value => $borrower->{streettype} });
+my $roadtype = $av->count ? $av->next->lib : '';
$template->param(%$borrower);
}
$template->param(
- lib_messages_loop => $lib_messages_loop,
- bor_messages_loop => $bor_messages_loop,
- all_messages_del => C4::Context->preference('AllowAllMessageDeletion'),
- findborrower => $findborrower,
+ librarian_messages => $librarian_messages,
+ patron_messages => $patron_messages,
borrower => $borrower,
borrowernumber => $borrowernumber,
categoryname => $borrower->{'description'},
branch => $branch,
- branchname => GetBranchName($borrower->{'branchcode'}),
- printer => $printer,
- printername => $printer,
- was_renewed => $query->param('was_renewed') ? 1 : 0,
+ was_renewed => scalar $query->param('was_renewed') ? 1 : 0,
expiry => $borrower->{'dateexpiry'},
roadtype => $roadtype,
amountold => $amountold,
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"),
relatives_borrowernumbers => \@relatives,
);
-my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
-$template->param( picture => 1 ) if $picture;
-
-# get authorised values with type of BOR_NOTES
-
-my $canned_notes = GetAuthorisedValues("BOR_NOTES");
+my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
+$template->param( picture => 1 ) if $patron_image;
+my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
$template->param(
debt_confirmed => $debt_confirmed,
SpecifyDueDate => $duedatespec_allow,
CircAutocompl => C4::Context->preference("CircAutocompl"),
- AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
- canned_bor_notes_loop => $canned_notes,
debarments => GetDebarments({ borrowernumber => $borrowernumber }),
todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
+ has_modifications => $has_modifications,
+ override_high_holds => $override_high_holds,
+ nopermission => scalar $query->param('nopermission'),
);
output_html_with_http_headers $query, $cookie, $template->output;
projects / srvgit / blobdiff