my $printer = $query->param('printer');
if ($printer){
# update our session so the userenv is updated
- $session->param('branchprinter',$printer);
-
+ $session->param('branchprinter',$printer);
}
+
if (!C4::Context->userenv && !$branch){
if ($session->param('branch') eq 'NO_LIBRARY_SET'){
# no branch set we can't issue
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { circulate => 1 },
+ flagsrequired => { circulate => 'circulate_remaining_permissions' },
}
);
my $printers = GetPrinters();
my @failedrenews = $query->param('failedrenew');
-my @renew_failed;
-for (@failedrenews) { $renew_failed[$_] = 1; }
+my %renew_failed;
+for (@failedrenews) { $renew_failed{$_} = 1; }
my $findborrower = $query->param('findborrower');
$findborrower =~ s|,| |g;
$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
-my $stickyduedate = $query->param('stickyduedate') || $session->param( 'stickyduedate' );
-my $duedatespec = $query->param('duedatespec') || $session->param( 'stickyduedate' );
+my $stickyduedate = $query->param('stickyduedate') || $session->param('stickyduedate');
+my $duedatespec = $query->param('duedatespec') || $session->param('stickyduedate');
my $issueconfirmed = $query->param('issueconfirmed');
my $cancelreserve = $query->param('cancelreserve');
-my $organisation = $query->param('organisations');
my $print = $query->param('print');
my $newexpiry = $query->param('dateexpiry');
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
my $borrowerslist;
my $message;
if ($findborrower) {
- my ( $count, $borrowers ) =
- SearchMember($findborrower, 'cardnumber', 'web' );
+ my ($count, $borrowers) = SearchMember($findborrower, 'cardnumber', 'web');
my @borrowers = @$borrowers;
+ if (C4::Context->preference("AddPatronLists")) {
$template->param(
- "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
+ "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
);
if (C4::Context->preference("AddPatronLists")=~/code/){
- my $categories=GetBorrowercategoryList;
- $categories->[0]->{'first'}=1;
- $template->param(categories=>$categories);
+ my $categories = GetBorrowercategoryList;
+ $categories->[0]->{'first'} = 1;
+ $template->param(categories=>$categories);
}
+ }
if ( $#borrowers == -1 ) {
$query->param( 'findborrower', '' );
$message = "'$findborrower'";
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'};
+ 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 ) =
+ my ( $renew_year, $renew_month, $renew_day) =
Add_Delta_YM( $enrol_year, $enrol_month, $enrol_day,
0 , $borrower->{'enrolmentperiod'}) if ($enrol_year*$enrol_month*$enrol_day>0);
# if the expiry date is before today ie they have expired
if ( $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 ) )
+ || Date_to_Days($today_year, $today_month, $today_day )
+ > Date_to_Days($warning_year, $warning_month, $warning_day) )
{
#borrowercard expired, no issues
$template->param(
- flagged => "1",
- noissues => "1",
- expired => format_date($borrower->{dateexpiry}),
- renewaldate => format_date("$renew_year-$renew_month-$renew_day")
+ flagged => "1",
+ noissues => "1",
+ expired => format_date($borrower->{dateexpiry}),
+ renewaldate => format_date("$renew_year-$renew_month-$renew_day")
);
}
# 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 ) )
- {
- # borrower card soon to expire warn librarian
- $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
- flagged => "1",);
- if ( C4::Context->preference('ReturnBeforeExpiry')){
- $template->param("returnbeforeexpiry" => 1);
- }
+ 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 ) )
+ {
+ # borrower card soon to expire warn librarian
+ $template->param("warndeparture" => format_date($borrower->{dateexpiry}),
+ flagged => "1",);
+ if (C4::Context->preference('ReturnBeforeExpiry')){
+ $template->param("returnbeforeexpiry" => 1);
+ }
}
$template->param(
overduecount => $od,
# STEP 3 : ISSUING
#
#
+my $noerror = 1;
if ($barcode) {
# always check for blockers on issuing
my ( $error, $question ) =
delete $question->{'DEBT'} if ($debt_confirmed);
foreach my $impossible ( keys %$error ) {
if ($impossible eq "NOT_FOR_LOAN_CAN_FORCE"){
- $$question{$impossible}=$$error{$impossible},
+ $$question{$impossible}=$$error{$impossible};
} else {
$template->param(
$impossible => $$error{$impossible},
IMPOSSIBLE => 1
);
+ $blocker = 1;
+ }
+ }
+ if( !$blocker ){
+ my $confirm_required = 0;
+ unless($issueconfirmed){
+ # Get the item title for more information
+ my $getmessageiteminfo = GetBiblioFromItemNumber(undef,$barcode);
+ $template->param( itemhomebranch => $getmessageiteminfo->{'homebranch'} );
+
+ # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed.
+ foreach my $needsconfirmation ( keys %$question ) {
+ $template->param(
+ $needsconfirmation => $$question{$needsconfirmation},
+ getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+ NEEDSCONFIRMATION => 1
+ );
+ $confirm_required = 1;
+ }
+ }
+ unless($confirm_required) {
+ AddIssue( $borrower, $barcode, $datedue, $cancelreserve );
+ $inprocess = 1;
+ if($globalduedate && ! $stickyduedate && $duedatespec_allow ){
+ $duedatespec = $globalduedate->output();
+ $stickyduedate = 1;
}
$noerror = 0;
}
my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
$template->param( issuecount => $issue );
}
+}
# reload the borrower info for the sake of reseting the flags.....
if ($borrowernumber) {
{
$getreserv{nottransfered} = 1;
$getreserv{nottransferedby} =
- GetBranchName( $getiteminfo->{'holdingbranch'} );
+ GetBranchName( $getiteminfo->{'holdingbranch'} );
}
# if we don't have a reserv on item, we put the biblio infos and the waiting position
if ( $getiteminfo->{'title'} eq '' ) {
my $getbibinfo = GetBiblioData( $num_res->{'biblionumber'} );
- my $getbibtype = getitemtypeinfo( $getbibinfo->{'itemtype'} ); # fixme - we should have item-level reserves here ?
+
$getreserv{color} = 'inwait';
$getreserv{title} = $getbibinfo->{'title'};
$getreserv{nottransfered} = 0;
- $getreserv{itemtype} = $getbibtype->{'description'};
+ $getreserv{itemtype} = $itemtypeinfo->{'description'};
$getreserv{author} = $getbibinfo->{'author'};
- $getreserv{biblionumber} = $num_res->{'biblionumber'};
+ $getreserv{biblionumber} = $num_res->{'biblionumber'};
}
$getreserv{waitingposition} = $num_res->{'priority'};
push( @reservloop, \%getreserv );
$it->{'dd'} = format_date($it->{'date_due'});
$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
($it->{'author'} eq '') and $it->{'author'} = ' ';
- $it->{'renew_failed'} = $renew_failed[$it->{'itemnumber'}];
+ $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
# ADDED BY JF: NEW ITEMTYPE COUNT DISPLAY
$issued_itemtypes_count->{ $it->{'itemtype'} }++;
LEFT JOIN itemtypes ON (itemtypes.itemtype=issuingrules.itemtype)
WHERE categorycode=?
" );
-#my @issued_itemtypes_count; # huh?
$issueqty_sth->execute("*"); # This is a literal asterisk, not a wildcard.
while ( my $data = $issueqty_sth->fetchrow_hashref() ) {
$template->param( 'catcode' => $catcodes->[0]) if $cnt == 1;
}
-my $CGIorganisations;
-my $member_of_institution;
-if ( C4::Context->preference("memberofinstitution") ) {
- my $organisations = get_institutions();
- my @orgs;
- my %org_labels;
- foreach my $organisation ( keys %$organisations ) {
- push @orgs, $organisation;
- $org_labels{$organisation} =
- $organisations->{$organisation}->{'surname'};
- }
- $member_of_institution = 1;
- $CGIorganisations = CGI::popup_menu(
- -id => 'organisations',
- -name => 'organisations',
- -labels => \%org_labels,
- -values => \@orgs,
- );
-}
$amountold = $temp[1];
todayissues => \@todaysissues,
previssues => \@previousissues,
inprocess => $inprocess,
- memberofinstution => $member_of_institution,
- CGIorganisations => $CGIorganisations,
is_child => ($borrower->{'category_type'} eq 'C'),
circview => 1,
);
projects / koha.git / blobdiff