Attachment #36262 for bug #13630

View | Details | Raw Unified | Return to bug 13630
Collapse All | Expand All




use base 'Class::Accessor';

use C4::Auth qw( check_api_auth );
use C4::Context;
use C4::Output qw( :ajax );
use CGI;
use DateTime;
use JSON;

our $debug;

    }, $class;
}

=head2 test

    $service->test( $request_method, $path_info, \%params );

Sets up a fake CGI context for unit tests.

=cut

sub test {
    my ( $self, $request_method, $path_info, $params ) = @_;

    $ENV{REQUEST_METHOD} = $request_method;
    $ENV{PATH_INFO} = $path_info;
    $ENV{HTTP_CONTENT_LENGTH} = "0";
    $self->query(CGI->new);

    foreach my $key ( keys %$params ) {
        $self->query->param( $key, $params->{ $key } );
    }

    my $user     = $ENV{KOHA_USER} || C4::Context->config("user");
    my $password = $ENV{KOHA_PASS} || C4::Context->config("pass");

    $self->query->param( 'userid', $user );
    $self->query->param( 'password', $password );

    $self->authenticate;
}

=head2 authenticate

    my ( $query, $cookie ) = $self->authenticate();

sub authenticate {
    my ( $self ) = @_;

    unless ( defined( $self->auth_status ) ) {
        $self->query(CGI->new) unless ( $self->query );

        my ( $status, $cookie, $sessionID ) = check_api_auth( $self->query, $self->{needed_flags} );
        $self->cookie($cookie);
        $self->auth_status($status);
        $self->handle_auth_failure() if ( $status ne 'ok' );
    }

    return ( $self->query, $self->cookie );
}

=head2 handle_auth_failure

    $self->handle_auth_failure();

Called when C<authenticate> fails (C<$self->auth_status> not 'ok'). By default, if
C<$self->{authnotrequired}> is not set, croaks and outputs an auth error.

=cut

sub handle_auth_failure {
    my ( $self ) = @_;

    $self->croak( 'auth', $self->auth_status ) if ( !$self->{authnotrequired} );
}

=head2 output


=cut

*DateTime::TO_JSON = sub { shift->_stringify; };

sub output {
    my ( $self, $response, $options ) = @_;


    };

    if ( $options->{type} eq 'json' ) {
        $response = JSON->new->convert_blessed->encode($response);

        if ( $self->query->param( 'callback' ) ) {
            $response = $self->query->param( 'callback' ) . '(' . $response . ');';
            $options->{status} = '200 OK';
            $options->{type} = 'js';
        }





use Modern::Perl;

# Handles authentication and output manually, so no reason to inherit from Koha::Service::XML
use base 'Koha::Service';

use C4::Auth qw/check_api_auth/;

sub new {
    my ( $class ) = @_;

    # Authentication is handled manually below
    return $class->SUPER::new( {
        authnotrequired => 1,
        needed_flags => { editcatalogue => 'edit_catalogue'},
    } );
}

sub handle_auth_failure {
    # Stub, to allow run() to output XML itself.
}

sub run {
    my ( $self ) = @_;
    # The authentication strategy for the biblios web


    $self->authenticate;

    # Can't reuse Koha::Service::XML, as result node has different name.
    $self->output( XMLout({ status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1), { type => 'xml' } );
}






use Modern::Perl;

use base 'Koha::Service::XML';

use C4::Biblio;
use C4::Items;

sub new {
    my ( $class ) = @_;

    # Authentication is handled manually below
    return $class->SUPER::new( {
        needed_flags => { editcatalogue => 'edit_catalogue' },
        needed_flags => { editcatalogue => 'edit_catalogue'},
        routes => [
            [ qr'GET /(\d+)', 'fetch_bib' ],
            [ qr'POST /(\d+)', 'update_bib' ],

    } );
}

sub run {
    my ( $self ) = @_;

    $self->authenticate;

    unless ( $self->auth_status eq "ok" ) {
        $self->output( XMLout( { auth_status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1 ), { type => 'xml', status => '403 Forbidden' } );
        exit;
    }

    $self->dispatch;
}

sub fetch_bib {
    my ( $self, $biblionumber ) = @_;

    my $record = GetMarcBiblio( $biblionumber, $self->query->url_param('items') );

    if (defined $record) {
        return $record->as_xml_record();
    } else {
        $self->output( '', { status => '404 Not Found', type => 'xml' } );
    }


    my $result = {};
    my $inxml = $self->query->param('POSTDATA');
    use Data::Dumper; warn Dumper($self->query);

    my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};
    my $do_not_escape = 0;

        $do_not_escape = 1;
    }

    return XMLout($result, NoAttr => 1, RootName => 'response', XMLDecl => 1, NoEscape => $do_not_escape);
}

1;





use Modern::Perl;

use base 'Koha::Service::XML';

use C4::Context;
use C4::Koha;


    # Authentication is handled manually below
    return $class->SUPER::new( {
        needed_flags => { editcatalogue => 'edit_catalogue' },
        needed_flags => { editcatalogue => 'edit_catalogue'},
        routes => [
            [ qr'GET /(\d+)', 'fetch_bib' ],
            [ qr'POST /(\d+)', 'update_bib' ],


    $self->authenticate;

    unless ( $self->auth_status eq "ok" ) {
        $self->output( XMLout( { auth_status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1 ), { type => 'xml', status => '403 Forbidden' } );
        exit;
    }

    # get list of required tags
    my $result = {};
    $result->{'auth_status'} = $self->auth_status;

            XMLDecl => 1,
            GroupTags => {mandatory_tags => 'tag', mandatory_subfields => 'subfield', reserved_tags => 'tag', valid_values => 'value'}
        ),
        { type => 'xml' }
    );
}


Lines 47-53 use C4::Log; Link Here

(-)a/Koha/Service/Config/SystemPreferences.pm (-1 lines)
47	sub new {	47	sub new {
48	my ( $class ) = @_;	48	my ( $class ) = @_;
49		49
50	# Authentication is handled manually below
51	return $class->SUPER::new( {	50	return $class->SUPER::new( {
52	needed_flags => { parameters => 1 },	51	needed_flags => { parameters => 1 },
53	routes => [	52	routes => [




#!/usr/bin/perl
package Koha::Service::Patrons;

# This file is part of Koha.
#
# Copyright (C) 2014 ByWater Solutions
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

=head1 NAME

svc/patrons - Web service for getting patron information

=head1 SYNOPSIS

  GET /svc/patrons/BORROWERNUMBER

=head1 DESCRIPTION

This service is used to query and change patron information.

=head1 METHODS

=cut

use Modern::Perl;

use base 'Koha::Service';

use C4::Biblio;
use C4::Circulation;
use C4::Context;
use C4::Dates;
use C4::Items;
use C4::Members;
use C4::Reserves;
use C4::Search qw( SimpleSearch );
use Koha::DateUtils;

sub new {
    my ( $class ) = @_;

    # Authentication is handled manually below
    return $class->SUPER::new( {
        needed_flags => { circulate => 'circulate_remaining_permissions' },
        routes => [
            [ qr'POST /(\d+)/checkouts', 'add_checkout'],
            [ qr'GET /(\d+)/checkouts', 'get_checkouts' ],
            [ qr'GET /(\d+)/holds', 'get_holds' ],
            [ qr'GET /(\d+)/patronInfo', 'get_patron_info' ],
            [ qr'POST /(\d+)/checkouts/(\d+(?:,\d+)*)', 'renew_checkouts', [ 'renewed' ] ],
        ]
    } );
}

=head2 add_checkout

=over 4

POST /svc/patrons/BORROWERNUMBER/checkouts

=back

Checks out an item

=cut

sub add_checkout {
    my ( $self, $borrowernumber ) = @_;

    my $datedue;
    my $duedatespec = $self->query->param('duedate');

    if ( C4::Context->preference('SpecifyDueDate') && $duedatespec ){
        if ($duedatespec =~ C4::Dates->regexp('syspref')) {
            $datedue = dt_from_string($duedatespec);
        } else {
            return {errors => {INVALID_DATE=>$duedatespec}};
        }
    }

    my ($barcode) = $self->require_params('barcode');

    my $borrower = GetMember( borrowernumber => $borrowernumber );

    my ( $errors, $questions, $alerts ) =
    CanBookBeIssued( $borrower, $barcode, $datedue );

    if ( $errors->{'UNKNOWN_BARCODE'} && C4::Context->preference("itemBarcodeFallbackSearch") ) {
        my $query = "kw=" . $barcode;
        my ( $searcherror, $results, $total_hits ) = SimpleSearch($query);

        # if multiple hits, offer options to librarian
        if ( $total_hits > 0 ) {
            my @options = ();
            foreach my $hit ( @{$results} ) {
                my $biblionumber = C4::Biblio::get_koha_field_from_marc(
                    'biblio',
                    'biblionumber',
                    C4::Search::new_record_from_zebra('biblioserver',$hit)
                );

                next unless ( $biblionumber );

                # offer all items with barcodes individually
                foreach my $item ( GetItemsInfo( $biblionumber ) ) {
                    $item->{available} = !( $item->{itemnotforloan} || $item->{onloan} || $item->{itemlost} || $item->{withdrawn} || $item->{damaged} || $item->{transfertwhen} || $item->{reservedate} );

                    push @options, $item if ( $item->{barcode} );
                }
            }

            $errors->{fallback_choices} = \@options;
        }
    }

    if ( %$errors || ( %$questions && !$self->query->param('confirmed') ) ) {
        return {
            item => GetBiblioFromItemNumber( undef, $barcode ),
            errors => $errors,
            questions => $questions,
            alerts => $alerts
        };
    }

    AddIssue( $borrower, $barcode, $datedue );

    return {};
}

=head2 get_holds

=over 4

GET /svc/patrons/BORROWERNUMBER/holds

=back

Retrieves information on the holds for a patron.

=cut

sub get_holds {
    my ( $self, $borrowernumber ) = @_;

    my @holds = GetReservesFromBorrowernumber($borrowernumber);
    foreach my $hold (@holds) {
        my $getiteminfo = GetBiblioFromItemNumber( $hold->{'itemnumber'} );
        $hold->{title} = $getiteminfo->{title};
        $hold->{author} = $getiteminfo->{author};
        $hold->{barcode} = $getiteminfo->{barcode};
    }

    return { holds => \@holds };
}

=head2 get_checkouts

=over 4

GET /svc/patrons/BORROWERNUMBER/checkouts

=back

Retrieves information on the checkouts for a patron.

=cut

sub get_checkouts {
    my ( $self, $borrowernumber ) = @_;

    return { checkouts => GetPendingIssues( $borrowernumber ) };
}

=head2 get_patron_info

=over 4

GET /svc/patrons/BORROWERNUMBER/patronInfo

=back

Retrieves information on a patron.

=cut

sub get_patron_info {
    my ( $self, $borrowernumber ) = @_;

    return { patronInfo => GetMemberDetails( $borrowernumber, 0 ) };
}

=head2 renew_checkouts

=over 4

POST /svc/patrons/BORROWERNUMBER/checkouts/ITEMNUMBER,ITEMNUMBER,.../?renewed=1

=back

Renews several checkouts.

=cut

sub renew_checkouts {
    my ( $self, $borrowernumber, $itemnumbers ) = @_;

    my @items = split /,/, $itemnumbers;

    my $branch = C4::Context->userenv ? C4::Context->userenv->{'branch'} : '';
    my $datedue;
    if ( $self->query->param('newduedate') ) {
        $datedue = dt_from_string( $self->query->param('newduedate') );
        $datedue->set_hour(23);
        $datedue->set_minute(59);
    }

    my $override_limit = $self->query->param("override_limit") || 0;
    my @responses;
    foreach my $itemno (@items) {
        # check status before renewing issue
        my ( $renewokay, $error ) =
          CanBookBeRenewed( $borrowernumber, $itemno, $override_limit );
        if ($renewokay) {
            push @responses, { itemnumber => $itemno, datedue => AddRenewal( $borrowernumber, $itemno, $branch, $datedue ) };
        } else {
            push @responses, { itemnumber => $itemno, error => $error };
        }
    }

    return { responses => \@responses };
}

1;




#!/usr/bin/perl

# This file is part of Koha.
#
# Copyright (C) 2014 ByWater Solutions
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use C4::Auth;
use C4::Branch;
use C4::ClassSource;
use C4::Context;
use C4::Output;
use C4::Members;
use CGI;
use Koha::Database;

my $query = CGI->new;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
    {
        template_name   => 'circ/checkout.tt',
        query           => $query,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { circulate => 'circulate_remaining_permissions' },
    }
);

my $borrowernumber = $query->param( 'borrowernumber' );
$template->{ VARS }->{ borrowernumber }=$borrowernumber;
$template->{ VARS }->{ circview }=1;
$template->param( %{ GetMemberDetails( $borrowernumber, 0 ) } );

my $schema = Koha::Database->new->schema;
my $authorised_values = {};

$authorised_values->{branches} = [];
my $onlymine=C4::Context->preference('IndependentBranches') &&
        C4::Context->userenv &&
        C4::Context->userenv->{flags} % 2 == 0 &&
        C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
foreach my $thisbranch ( sort keys %$branches ) {
    push @{ $authorised_values->{branches} }, { value => $thisbranch, lib => $branches->{$thisbranch}->{'branchname'} };
}

$authorised_values->{itemtypes} = [ $schema->resultset( "Itemtype" )->search( undef, {
    columns => [ { value => 'itemtype' }, { lib => "description" } ],
    order_by => "description",
    result_class => 'DBIx::Class::ResultClass::HashRefInflator'
} ) ];

my $class_sources = GetClassSources();

my $default_source = C4::Context->preference("DefaultClassificationSource");

foreach my $class_source (sort keys %$class_sources) {
    next unless $class_sources->{$class_source}->{'used'} or
                ($class_source eq $default_source);
    push @{ $authorised_values->{cn_source} }, { value => $class_source, lib => $class_sources->{$class_source}->{'description'} };
}

my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
my $results;
if( $branch_limit ) {
    $results = $schema->resultset( "AuthorisedValue" )->search(
    { "authorised_values_branches.branchcode" => { "=", [ $branch_limit, undef ] } },
    { join => "authorised_values_branches", order_by => "lib" } );
} else {
    $results = $schema->resultset( "AuthorisedValue" )->search(
    undef,
    { order_by => "lib" } );
}

foreach my $result ( $results->all ) {
    $authorised_values->{$result->category} ||= [];
    push @{ $authorised_values->{$result->category} }, { value => $result->authorised_value, lib => $result->lib };
}

$template->{VARS}->{authorised_values} = $authorised_values;

$template->{VARS}->{authvalcode_notforloan} = C4::Koha::GetAuthValCode('items.notforloan', '' );

output_html_with_http_headers $query, $cookie, $template->output;

Lines 230-235 if ($findborrower) { Link Here

(-)a/circ/circulation.pl (+3 lines)
230	# get the borrower information.....	230	# get the borrower information.....
231	my $borrower;	231	my $borrower;
232	if ($borrowernumber) {	232	if ($borrowernumber) {
		233	if ( $query->cookie( 'checkout_client' ) eq 'beta' ) {
		234	print $query->redirect( '/cgi-bin/koha/circ/checkout.pl?borrowernumber=' . $borrowernumber );
		235	}
233	$borrower = GetMemberDetails( $borrowernumber, 0 );	236	$borrower = GetMemberDetails( $borrowernumber, 0 );
234	my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );	237	my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
235		238




<!DOCTYPE html>
<!-- TEMPLATE FILE: [% template.name.split('/').last %] -->
[% IF ( bidi ) %]
[% IF ( angular_app ) %]
<html lang="[% lang %]" dir="[% bidi %]" ng-app="[% angular_app %]>
[% ELSE %]
<html lang="[% lang %]" dir="[% bidi %]">
[% END %]
[% ELSE %]
[% IF ( angular_app ) %]
<html lang="[% lang %]" ng-app="[% angular_app %]">
[% ELSE %]
<html lang="[% lang %]">
[% END %]
[% END %]
<head>




        searchToHold();
        return false;
    })
    $("#switchclient").click( function() {
        var borrowernumber = [% borrowernumber || "null" %];

        if ( $.cookie('checkout_client' ) == 'beta' ) {
            $.cookie( 'checkout_client', 'standard', { expires: 365, path: '/' } );
            window.location = '/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + borrowernumber;
        }
        else {
            $.cookie( 'checkout_client', 'beta', { expires: 365, path: '/' } );
            window.location = '/cgi-bin/koha/circ/checkout.pl?borrowernumber=' + borrowernumber;
        }
        return false;
    } );
});

function confirm_deletion() {
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron? This cannot be undone."));
    if (is_confirmed) {

                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li></li>
                [% END %]
                <li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
                <li><a id="switchclient" href="#">Switch checkout client</a></li>
            </ul>
    </div>
</div>




            return;
        }

        var data = eval( '(' + xhr.responseText + ')' );

        if ( data.error == 'auth' ) {
            humanMsg.displayMsg( MSG_SESSION_TIMED_OUT );
        }

        if ( callback ) {
            callback( data );
        } else {
            humanMsg.displayAlert( MSG_DATA_NOT_SAVED );
        }




[% USE Koha %]
[% USE Branches %]
[% USE KohaDates %]
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
   [% SET exports_enabled = 1 %]
[% END %]
[% USE AuthorisedValues %]
[% INCLUDE 'doc-head-open.inc' angular_app = "checkoutApp" %]
[% SET destination = "circ" %]
<title>Koha &rsaquo; Circulation
[% IF borrowernumber %]
  &rsaquo; Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 %]
[% END %]
</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]
[% IF ( UseTablesortForCirc ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %][% END %]
<script src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
<script src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
[% INCLUDE 'timepicker.inc' %]
[% INCLUDE 'doc-head-angular.inc' %]
<script>
var authorised_values = {
    [% FOREACH category IN authorised_values -%]
        "[% category.key %]":{
            [% FOREACH value IN category.value -%]
                "[% value.value %]":"[% value.lib %]",
            [% END -%]
        },
    [% END -%]
}

var checkoutApp = angular.module( 'checkoutApp', [] )
    .filter( 'isNotEmpty', function() {
        return function(obj) {
            return !$.isEmptyObject(obj);
        };
    } );

checkoutApp.controller( 'CheckoutController', function ( $scope, $http ) {
    $http.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded";
    $scope.borrowernumber = [% borrowernumber %];
    $scope.authorised_values = authorised_values;

    $http.get( '/cgi-bin/koha/svc/patrons/' + $scope.borrowernumber + '/patronInfo' ).success( function( data ) {
        $scope.borrower = data.patronInfo;
        $scope.not_loading = true;
        $('#yui-main > .yui-b').show();
    });

    function get_checkouts() {
        $http.get( '/cgi-bin/koha/svc/patrons/' + $scope.borrowernumber + '/checkouts' ).success( function( data ) {
            $scope.checkouts = data.checkouts;
        });
    }

    get_checkouts();

    $scope.checkout = function(barcode, confirmed) {
        var barcode = barcode || $scope.barcode;
        var params = { barcode: barcode, duedate: $scope.duedatespec || '' };
        if ( confirmed ) {
            params.confirmed = 1;
            params.cancelreserve = $scope.cancelreserve;
        }
        $scope.not_loading = false;
        $http.post( '/cgi-bin/koha/svc/patrons/' + $scope.borrowernumber + '/checkouts', $.param( params ) ).success(function( data ) {
                $scope.not_loading = true;
                $scope.last_barcode = barcode;
                $scope.barcode = '';

                if ( data.errors || data.questions ) {
                    $scope.last_item = data.item;
                    $scope.errors = data.errors;
                    $scope.questions = data.questions;
                    $scope.cancelreserve = data.questions.RESERVE_WAITING ? "revert" : null;
                }else {
                    $scope.last_item = null;
                    $scope.errors = null;
                    $scope.questions = null;
                    if ( !$scope.stickyduedate ) $scope.duedatespec = "";
                    $('#barcode')[0].focus();
                    get_checkouts();
                }
            });
    };

    $scope.cancelCheckout = function() {
        $scope.questions = null;
        $scope.errors = null;
        $('#barcode')[0].focus();
    };

     
} );

$(document).ready( function() {
    $('#patronlists').tabs( [% IF ( UseTablesortForCirc ) %]{
        // Correct table sizing for tables hidden in tabs
        // http://www.datatables.net/examples/api/tabs_and_scrolling.html
        "show": function( event, ui ) {
            var oTable = $( 'div.dataTables_wrapper>table', ui.panel ).dataTable();
            if ( oTable.length > 0 ) {
                oTable.fnAdjustColumnSizing();
            }
        }
    }[% END %] );
    $("#duedatespec").datetimepicker({
        onClose: function(dateText, inst) { $("#barcode").focus(); },
        hour: 23,
        minute: 59
    });
    $("#confduedatespec").datetimepicker({
        hour: 23,
        minute: 59
    });
} );
</script>
</head>
<body id="circ_circulation" class="circ" ng-controller="CheckoutController">

   <div class="loading-overlay" ng-hide="not_loading">
       <div>Loading, please wait...</div>
   </div>

[% INCLUDE 'header.inc' %]
[% INCLUDE 'circ-search.inc' %]

<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a>
<span ng-show="borrower"> &rsaquo; Checking out to {{ borrower.surname }}, {{ borrower.firstname }}</span>
</div>
<div id="doc3" class="yui-t2">

   <div id="bd">
	<div id="yui-main">
	<div class="yui-b" style="display: none">

[% INCLUDE 'members-toolbar.inc' %]

<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
<div style="display: none;" id="add_message_form">
<form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="message_form" name="message_f">
<fieldset id="borrower_messages" class="brief">
<legend>Leave a message</legend>
	<ol>
    <li>
            <label for="message_type">Add a message for:</label>
          <select name="message_type" id="message_type">
            <option value="L">Other librarians</option>
            <option value="B">[% firstname %]</option>
        </select>
    </li>
    [% IF ( canned_bor_notes_loop ) %]
        <li>
                <label for="type">Predefined notes: </label>
                <select name="type" id="type" onchange="this.form.borrower_message.value=this.options[this.selectedIndex].value;">
                    <option value="">Select note</option>
                    [% FOREACH canned_bor_notes_loo IN canned_bor_notes_loop %]
                    <option value="[% canned_bor_notes_loo.lib %]">[% canned_bor_notes_loo.lib %]</option>
                    [% END %]
                </select>
        </li>
    [% END %]
    <li>
        <textarea rows="3" cols="60" name="borrower_message" id="borrower_message" ></textarea>
    </li>
	</ol>
    <fieldset class="action">
        <input type="submit" value="Save" /> <a href="#" class="cancel">Cancel</a>
    </fieldset>

        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
        <input type="hidden" name="branchcode" value="[% branch %]" />
</fieldset>
</form>
</div>

<div class="yui-g" ng-show="errors | isNotEmpty">
<div id="circ_impossible" class="dialog alert">
<!-- RESULT OF ISSUING REQUEST -->
    <ul>

        <li ng-show="errors.STATS">Local use recorded</li>

        <li ng-show="errors.INVALID_DATE">The due date &quot;{{errors.INVALID_DATE}}&quot; is invalid</li>

        <li ng-show="errors.UNKNOWN_BARCODE">
            The barcode &quot;{{last_barcode}}&quot; was not found

            <div ng-show="errors.fallback_choices">
                The following items were found by searching:
                <table>
                    <thead>
                        <th scope="col">Title</th>
                        <th scope="col">Author</th>
                        <th scope="col">Barcode</th>
                        <th scope="col">Status</th>
                        <th scope="col">&nbsp;</th>
                    </thead>
                    <tbody>
                        <tr ng-repeat="choice in errors.fallback_choices">
                            <td>{{ choice.title }}</td>
                            <td>{{ choice.author }}</td>
                            <td>{{ choice.barcode }}</td>
                            <td>
                                <span ng-hide="choice.available">
                                    Available
                                </span>
                                <span ng-show="choice.available">
                                    Not Available
                                </span>
                            </td>
                            <td><button ng-click="checkout(choice.barcode)">Check Out</button></td>
                        </tr>
                    </tbody>
                </table>
            </div>
        </li>

        <li ng-show="errors.NOT_FOR_LOAN">
            <span ng-show="errors.itemtype_notforloan">Item type not for loan.</span>

            <span ng-show="errors.item_notforloan">
                Item not for loan

                <span ng-show="authorised_values['[% authvalcode_notforloan %]'][errors.item_notforloan]"> ({{authorised_values['[% authvalcode_notforloan %]'][errors.item_notforloan]}})</span>
            </span>
        </li>

        <li ng-show="errors.WTHDRAWN">Item has been withdrawn</li>

        <li ng-show="errors.RESTRICTED">Item is restricted</li>

        <li ng-show="errors.GNA">Patron's address is in doubt</li>

        <li ng-show="errors.CARD_LOST">Patron's card is lost</li>

        <li ng-show="errors.DERBARRED">Patron is restricted</li>

        <li ng-show="errors.NO_MORE_RENEWALS">No more renewals possible</li>

        <li ng-show="errors.AGE_RESTRICTION">Age restriction {{errors.AGE_RESTRICTION}}.</li>

        <li ng-show="errors.EXPIRED">Patron's card is expired</li>

        <li ng-show="errors.TOO_MANY">Too many checked out. {{errors.current_loan_count}} checked out, only {{errors.max_loans_allowed}} are allowed.</li>

        <li ng-show="errors.ITEMNOTSAMEBRANCH">This item belongs to {{authorised_values.branches[errors.itemhomebranch]}} and cannot be checked out from this location.</li>

        <li ng-show="errors.USERBLOCKEDREMAINING">Patron has had overdue items and is blocked for {{errors.USERBLOCKEDREMAINING}} day(s).</li>

        <li ng-show="errors.USERBLOCKEDOVERDUE">Checkouts are BLOCKED because patron has overdue items</li>
    </ul>

</div></div>
<!-- /impossible -->

<div class="yui-g" ng-show="questions | isNotEmpty">

<div id="circ_needsconfirmation" class="dialog alert">
[% IF CAN_user_circulate_force_checkout %]
  <h3>Please confirm checkout</h3>
[% ELSE %]
  <h3>Cannot check out</h3>
[% END %]

<ul>
    <li ng-show="questions.AGE_RESTRICTION">
        Age restriction {{ questions.AGE_RESTRICTION }}.
        [% IF CAN_user_circulate_force_checkout %]
            Check out anyway?
        [% END %]
    </li>

    <li ng-show="questions.DEBT">The patron has a debt of {{ questions.DEBT }}.</li>

    <li ng-show="questions.RENEW_ISSUE">Item <i>{{ last_item.title }}</i> ({{ last_barcode }}) is currently checked out to this patron.  Renew?</li>

    <li ng-show="questions.RESERVE_WAITING">
        Item <i>{{ last_item.title }}</i> ({{ last_barcode }}) has been waiting for
        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber={{ questions.resborrowernumber }}">{{ questions.resfirstname }} {{ questions.ressurname }}</a>
        ({{ questions.rescardnumber }}) at {{ questions.resbranchname }} since {{ questions.reswaitingdate }}.
    </li>

    <li ng-show="questions.RESERVED">
        Item <i>{{ last_item.title }}</i> ({{ last_barcode }}) has been on hold for
        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber={{ questions.resborrowernumber }}">{{ questions.resfirstname }} {{ questions.ressurname }}</a>
        ({{ questions.rescardnumber }}) at {{ questions.resbranchname }} since {{ questions.resreservedate }}.
    </li>

    <li ng-show="questions.ISSUED_TO_ANOTHER">Item <i>{{ last_item.title }}</i> ({{ last_barcode }}) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber={{ questions.issued_borrowernumber }}">{{ questions.issued_firstname }} {{ questions.issued_surname }}</a> ({{ questions.issued_cardnumber }}).
      [% IF CAN_user_circulate_force_checkout %]
        Check in and check out?
      [% END %]
    </li>

    <li ng-show="questions.TOO_MANY">Too many checked out. {{questions.current_loan_count}} checked out, only {{questions.max_loans_allowed}} are allowed.</li>

    <li ng-show="questions.BORRNOTSAMEBRANCH">This patron is from a different library ({{ questions.BORRNOTSAMEBRANCH }}).</li>

    <li ng-show="questions.PATRON_CANT">This patron can't check out this item per library circulation policy.</li>

    <li ng-show="questions.NOT_FOR_LOAN_FORCING">
        <span ng-show="questions.itemtype_notforloan">Item type is normally not for loan.</span>

        <span ng-show="questions.item_notforloan">
            Item is normally not for loan

            <span ng-show="authorised_values['[% authvalcode_notforloan %]'][questions.item_notforloan]"> ({{authorised_values['[% authvalcode_notforloan %]'][questions.item_notforloan]}})</span>.
        </span>

        [% IF CAN_user_circulate_force_checkout %]
            Check out anyway?
        [% END %]
    </li>

    <li ng-show="questions.USERBLOCKEDOVERDUE">
        Patron has {{ questions.USERBLOCKEDOVERDUE }} overdue item(s).
        [% IF CAN_user_circulate_force_checkout %]
                Check out anyway?
        [% END %]
    </li>

    <li ng-show="questions.ITEM_LOST">
        This item has been lost with a status of "{{ questions.ITEM_LOST }}".
        [% IF CAN_user_circulate_force_checkout %]
            Check out anyway?
        [% END %]
    </li>

    <li ng-show="questions.HIGHHOLDS">High demand item. Loan period shortened to {{ questions.HIGHHOLDS.duration }} days (due {{ questions.HIGHHOLDS.returndate }}). Check out anyway?</li>

    <li ng-show="questions.BIBLIO_ALREADY_ISSUED">
        Patron has already checked out another item from this record.
        [% IF CAN_user_circulate_force_checkout %]
            Check out anyway?
        [% END %]
    </li>
</ul>

[% IF CAN_user_circulate_force_checkout %]
<form autocomplete="off">
[% ELSE %]
<form autocomplete="off" ng-show="questions.HIGHHOLDS">
[% END %]

   <p ng-show="questions.RESERVED">
       <input type="checkbox" id="cancelreserve" name="cancelreserve" value="cancel" ng-model="cancelreserve"/>
       <label for="cancelreserve">Cancel hold</label>
   </p>

   <p ng-show="questions.RESERVE_WAITING">
       <label for="cancelreserve">Cancel hold</label>
       <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" ng-model="cancelreserve"/><br />
       <label for="revertreserve">Revert waiting status</label>
       <input type="radio" value="revert" name="cancelreserve" id="revertreserve" checked="checked" ng-model="cancelreserve"/>
   </p>

   <p ng-show="questions.INVALID_DATE">
       <input type="text" size="13" id="confduedatespec" name="duedatespec" readonly="readonly" ng-model="duedatespec" />
       <label for="confduedatespec">Due date</label>
   </p>

    <input type="submit" class="approve" value="Yes, Renew (Y)" accesskey="y" ng-show="questions.RENEW_ISSUE" ng-click="checkout( last_barcode, true )" />

    <input type="submit" class="approve" value="Yes, Check Out (Y)" accesskey="y" ng-hide="questions.RENEW_ISSUE" ng-click="checkout( last_barcode, true )" />

    <input type="submit" class="deny" value="No, Don't Renew (N)" accesskey="n" ng-show="questions.RENEW_ISSUE" ng-click="cancelCheckout()" />
   
    <input type="submit" class="deny" value="No, Don't Check Out (N)" accesskey="n" ng-hide="questions.RENEW_ISSUE" ng-click="cancelCheckout()" />

</form>

[% UNLESS CAN_user_circulate_force_checkout %]
<form ng-hide="questions.HIGHHOLDS">
   <input type="submit" class="deny" value="Continue" ng-click="cancelCheckout()" />
</form>
[% END %]

</div></div>

[% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% expiry %]</div>[% END %]

[% IF additional_materials %]
    <div id="materials" class="dialog message">Note about the accompanying materials: <br />
    [% additional_materials %]
    </div>
[% END %]

[% IF ( alert.ITEM_LOST ) %]
    <div class="dialog message">This item has been lost with a status of "[% alert.ITEM_LOST %]".</div>
[% END %]

[% IF ( alert.OTHER_CHARGES ) %]
    <div class="dialog message">The patron has unpaid charges for reserves, rentals etc of [% alert.OTHER_CHARGES %]</div>
[% END %]

[% IF ( issued ) %]
<p>Item checked out</p>
[% END %]

<!-- BARCODE ENTRY -->

<div class="yui-g" ng-show="borrower">
[% UNLESS ( noissues ) %]
[% IF ( flagged ) %]
<div class="yui-u first">
[% ELSE %]
<div>

[% END %]

<form method="post" id="mainform" name="mainform" autocomplete="off" ng-submit="checkout()">
<fieldset id="circ_circulation_issue">
    [% IF ( DisplayClearScreenButton ) %]
        <span id="clearscreen"><a href="/cgi-bin/koha/circ/circulation.pl" title="Clear screen">x</a></span>
    [% END %]

    <label for="barcode">Checking out to {{ borrower.surname }}, {{ borrower.firstname }} ({{ borrower.cardnumber }})</label>

	<div class="hint">Enter item barcode:</div>

	<input type="text" name="barcode" id="barcode" class="barcode focus" size="14" ng-attr-disabled="{{questions? 'disabled':''}}" ng-model="barcode"/>

    <input type="submit" value="Check Out" />

    [% IF ( Koha.Preference( 'SpecifyDueDate' ) ) %]<div class="date-select">
        <div class="hint">Specify due date [% INCLUDE 'date-format.inc' %]: </div>
        <input type="text" size="13" id="duedatespec" name="duedatespec" readonly="readonly" ng-model="duedatespec" />
        <label for="stickyduedate"> Remember for session:</label>
        <input type="checkbox" id="stickyduedate" onclick="this.form.barcode.focus();" name="stickyduedate" ng-model="stickyduedate"/>
        <input type="button" class="action" id="cleardate" value="Clear" name="cleardate" onclick="this.checked = false; this.form.duedatespec.value = ''; this.form.stickyduedate.checked = false; this.form.barcode.focus(); return false;" />
</div>[% END %]
</fieldset>
</form></div>[% END %]<!-- /unless noissues -->

[% IF ( noissues ) %]<div>[% ELSE %]<div class="yui-u">[% END %]

    [% IF ( flagged ) %]
		[% IF ( noissues ) %]
		<h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
        <div id="circmessages" class="circmessage warning">
		[% ELSE %]
        <div id="circmessages" class="circmessage attention">
		[% END %]

		<h3>[% IF ( noissues ) %]
		        Cannot check out!
		[% ELSE %]Attention:[% END %]</h3>
		<ul>

			[% IF ( warndeparture ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon.
			Patron's card expires on [% expiry %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>

			</li>
			[% END %]

			[% IF ( returnbeforeexpiry ) %]
			 <li><span class="circ-hlt">Set due date to expiry:</span> You have the ReturnBeforeExpiry system preference enabled this means if the
			 expiry date is before the date due, the date due will be set to the expiry date
			 </li>
			[% END %]

			[% IF ( expired ) %]
			<li><span class="circ-hlt">Expiration:</span> Patron's card has expired.
			[% IF ( expiry ) %]Patron's card expired on [% expiry %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;cardnumber=[% cardnumber %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">Edit Details</a>

			</li>
			[% END %]

            [% IF ( gna ) %]
			<li class="blocker"><span class="circ-hlt">Address:</span> Patron's address in doubt</li>
			[% END %]

            [% IF ( lost ) %]
			<li class="blocker"><span class="circ-hlt">Lost: </span>Patron's card is lost</li>
			[% END %]

            [% IF ( userdebarred ) %]
               <li class="blocker">
                   <span class="circ-hlt"> Restricted:</span> Patron's account is restricted

                   [% IF ( userdebarreddate ) %]
                       until [% userdebarreddate %]
                   [% END %]

                   [% IF ( debarredcomment ) %]
                       with the explanation: <br/><i>[% debarredcomment | html_line_break %]</i>
                   [% END %]

                   <br/>
                   <a class="btn btn-small" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="icon-ban-circle"></i> View restrictions</a>
               </li>
            [% END %]

		[% IF ( odues ) %]<li>[% IF ( nonreturns ) %]<span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a>[% END %]</li>
            [% END %]

		[% IF ( charges ) %]
			    <li>
            <span class="circ-hlt">Fees &amp; Charges:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees &amp; charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>.
                [% IF ( charges_is_blocker ) %]
                    Checkouts are <span class="circ-hlt">BLOCKED</span> because fine balance is <span class="circ-hlt">OVER THE LIMIT</span>.
                [% END %]
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a></li>
			[% END %]

		[% IF ( credits ) %]
			<li>
                <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount %][% END %]
            </li>
			[% END %]



			</ul>
        </div>

			[% IF ( WaitingReserveLoop ) %]
			<div id="holdswaiting" class="circmessage">
		    <h4>Holds waiting:</h4>
			        [% FOREACH WaitingReserveLoo IN WaitingReserveLoop %]
			            <ul>
			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% WaitingReserveLoo.biblionumber %]">[% WaitingReserveLoo.title |html %]</a> ([% WaitingReserveLoo.itemtype %]), [% IF ( WaitingReserveLoo.author ) %]by [% WaitingReserveLoo.author %][% END %] [% IF ( WaitingReserveLoo.itemcallnumber ) %][[% WaitingReserveLoo.itemcallnumber %]] [% END %]Hold placed on [% WaitingReserveLoo.reservedate %].
			            [% IF ( WaitingReserveLoo.waitingat ) %]
			                <br />[% IF ( WaitingReserveLoo.waitinghere ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]Waiting at [% WaitingReserveLoo.waitingat %]</strong>
			            [% END %]
			                </li>
			            </ul>
			    [% END %]
			</div>
			<!-- /If WaitingReserveLoop -->[% END %]
	[% IF ( notes ) %]
			<div id="circnotes" class="circmessage">
			<h4>Notes:</h4>
            <p><span class="circ-hlt">[% notesmsg %]</span></p>
			</div>


    <!-- /If notes -->[% END %]

	<div id="messages" class="circmessage">
		<h4>Messages:</h4>
		<ul>
			[% FOREACH lib_messages_loo IN lib_messages_loop %]
				<li>
					<span class="circ-hlt">
						[% lib_messages_loo.message_date_formatted %]
						[% lib_messages_loo.branchcode %]
						<i>"[% lib_messages_loo.message %]"</i>
					</span>
					[% IF ( lib_messages_loo.can_delete ) %]
						<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% lib_messages_loo.message_id %]&amp;borrowernumber=[% lib_messages_loo.borrowernumber %]">[Delete]</a>
					[% ELSE %]
						[% IF ( all_messages_del ) %]
							<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% lib_messages_loo.message_id %]&amp;borrowernumber=[% lib_messages_loo.borrowernumber %]">[Delete]</a>
						[% END %]
					[% END %]
				</li>
			[% END %]
			[% FOREACH bor_messages_loo IN bor_messages_loop %]
				<li><span class="">[% bor_messages_loo.message_date_formatted %] [% bor_messages_loo.branchcode %] <i>"[% bor_messages_loo.message %]"</i></span> [% IF ( bor_messages_loo.can_delete ) %]<a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
                [% ELSIF ( all_messages_del ) %]
                    <a href="/cgi-bin/koha/circ/del_message.pl?message_id=[% bor_messages_loo.message_id %]&amp;borrowernumber=[% bor_messages_loo.borrowernumber %]">[Delete]</a>
                [% END %]</li>
			[% END %]

		</ul>
	</div>

     <!-- /If flagged -->[% END %]



</div>
</div>

<div class="yui-g" ng-show="borrower"><div id="patronlists" class="toptabs">

<ul>
<li> <a href="#checkouts">{{ checkouts.length }} Checkout(s)</a></li>
[% IF ( displayrelissues ) %]
<li><a href="#relissues">Relatives' checkouts</a></li>
[% END %]
<li>[% IF ( countreserv ) %]
            <a href="#reserves">[% countreserv %] Hold(s)</a>
    [% ELSE %]
            <a href="#reserves">0 Holds</a>
    [% END %]</li>
    <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>

</ul>

<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
<div id="checkouts">

<form name="issues" action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed" ng-show="checkouts.length">
    <input type="hidden" value="circ" name="destination" />
    <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
    <input type="hidden" name="branch" value="[% branch %]" />
        <table id="issuest">
    <thead><tr>
        <th scope="col" class="title-string">Due date</th>
        <th scope="col" class="anti-the">Title</th>
        <th scope="col">Item type</th>
        <th scope="col" class="title-string">Checked out on</th>
        <th scope="col">Checked out from</th>
        <th scope="col">Call no</th>
        <th scope="col">Charge</th>
        <th scope="col">Price</th>
        <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
        <th scope="col">Check in <p class="column-tool"><a href="#" id="CheckAllreturns">select all</a> | <a href="#" id="CheckNoreturns">none</a></p></th>
        [% IF ( exports_enabled ) %]
          <th scope="col">Export <p class="column-tool"><a href="#" id="CheckAllexports">select all</a> | <a href="#" id="CheckNoexports">none</a></p></th>
        [% END %]
    </tr></thead>
[% INCLUDE 'checkouts-table-footer.inc' %]
	<tbody>

    <tr ng-repeat="checkout in checkouts" class="{{ $odd ? 'highlight' : '' }}">
        [% IF ( todayissue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
            <span title="{{ checkout.date_due }}">{{ checkout.date_due }}</span>
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber={{ checkout.biblionumber }}&amp;type=intra"><strong>{{ checkout.title }}</strong></a><span ng-show="checkout.author">, by {{ checkout.author }}</span><span class="circ-hlt" ng-show="checkout.itemnotes"> - {{ checkout.itemnotes }}</span> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber={{ checkout.biblionumber }}&amp;itemnumber={{ checkout.itemnumber }}#item{{ checkout.itemnumber }}">{{ checkout.barcode }}</a></td>
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="{{ checkout.itemtype_image }}" alt="" />[% END %][% END %]{{ checkout.itemtype }}</td>
        <td><span title="{{ checkout.displaydate_sort }}">{{ checkout.issuedate }}</span></td>
        <td>{{ checkout.issuingbranchname }}</td>
        <td>{{ checkout.itemcallnumber }}</td>
            <td>{{ checkout.charge }}</td>
            <td>{{ checkout.replacementprice }}</td>
        <td><span style="padding: 0 1em;">{{ checkout.renewals || 0 }}</span>
        <td><input type="checkbox" class="radio" name="barcodes[]"  value="{{ checkout.barcode }}" />
            <input type="checkbox" name="all_barcodes[]" value="{{ checkout.barcode }}" checked="checked" style="display: none;" />
        </td>
        [% IF ( exports_enabled ) %]
          <td style="text-align:center;">
            <input type="checkbox" id="export_{{ checkout.biblionumber }}" name="biblionumbers" value="{{ checkout.biblionumber }}" />
            <input type="checkbox" name="itemnumbers" value="{{ checkout.itemnumber }}" style="visibility:hidden;" />
          </td>
        [% END %]
    </tr>

[% IF ( previssues ) %]
    [% UNLESS ( todayissues ) %]
    [% INCLUDE 'checkouts-table-footer.inc' %]
        <tbody>
    [% END %]
    [% IF ( UseTablesortForCirc ) %]<tr id="previous"><th><span title="">Previous checkouts</span></th><th></th><th></th><th><span title=""></span></th><th></th><th></th><th></th><th></th><th></th><th></th>[% IF ( exports_enabled ) %]<th></th>[% END %]</tr>[% ELSE %]<tr id="previous">[% IF ( exports_enabled ) %]<th colspan="11">[% ELSE %]<th colspan="10">[% END %]Previous checkouts</th></tr>[% END %]
    [% FOREACH previssue IN previssues %]
    [% IF ( loop.odd ) %]
        <tr>
    [% ELSE %]
        <tr class="highlight">
    [% END %]
        [% IF ( previssue.od ) %]<td class="od">[% ELSE %]<td>[% END %]
        <span title="[% previssue.dd_sort %]">[% previssue.dd %]</span>

            [% IF ( previssue.itemlost ) %]
                <span class="lost">[% AuthorisedValues.GetByCode( 'LOST', previssue.itemlost ) %]</span>
            [% END %]
            [% IF ( previssue.damaged ) %]
                <span class="dmg">[% AuthorisedValues.GetByCode( 'DAMAGED', previssue.damaged ) %]</span>
            [% END %]
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% previssue.biblionumber %]&amp;type=intra"><strong>[% previssue.title |html %][% FOREACH subtitl IN previssue.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( previssue.author ) %], by [% previssue.author %][% END %] [% IF ( previssue.itemnotes ) %]- [% previssue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% previssue.biblionumber %]&amp;itemnumber=[% previssue.itemnumber %]#item[% previssue.itemnumber %]">[% previssue.barcode %]</a></td>
        <td>
            [% previssue.itemtype %]
        </td>
        <td><span title="[% previssue.displaydate_sort %]">[% previssue.displaydate %]</span></td>
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
        <td>[% previssue.issuingbranchname %]</td>
        <td>[% previssue.itemcallnumber %]</td>
        <td>[% previssue.charge %]</td>
        <td>[% previssue.replacementprice %]</td>
      [% IF ( previssue.renew_failed ) %]
            <td class="problem">Renewal failed</td>
      [% ELSE %]
        <td><span style="padding: 0 1em;">[% IF ( previssue.renewals ) %][% previssue.renewals %][% ELSE %]0[% END %]</span>
        [% IF ( previssue.can_renew ) %]
        <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
        [% IF ( previssue.od ) %]
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" checked="checked" />
        [% ELSE %]
            <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
        [% END %]
            [% IF previssue.renewsallowed && previssue.renewsleft %]
                <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
            [% END %]
        [% ELSE %]
            [% IF ( previssue.can_confirm ) %]<span class="renewals-allowed" style="display: none">
                <input type="checkbox" name="all_items[]" value="[% previssue.itemnumber %]" checked="checked" style="display: none;" />
                [% IF ( previssue.od ) %]
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" checked="checked" />
                [% ELSE %]
                    <input type="checkbox" class="radio" name="items[]" value="[% previssue.itemnumber %]" />
                [% END %]
                </span>
                [% IF previssue.renewsallowed && previssue.renewsleft && !previssue.renew_error_too_soon %]
                    <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
                [% END %]
                <span class="renewals-disabled">
            [% END %]
            [% IF ( previssue.renew_error_on_reserve ) %]
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On Hold</a>
            [% ELSIF ( previssue.renew_error_too_many ) %]
                Not renewable
            [% ELSIF ( previssue.renew_error_too_soon ) %]
                No renewal before [% previssue.soonestrenewdate %]
                <span class="renewals">([% previssue.renewsleft %] of [% previssue.renewsallowed %] renewals remaining)</span>
            [% END %]
            [% IF ( previssue.can_confirm ) %]
                </span>
            [% END %]
        [% END %]
        </td>
        [% END %]
		  [% IF ( previssue.return_failed ) %]
            <td class="problem">Check-in failed</td>
        [% ELSE %]
            [% IF ( previssue.renew_error_on_reserve ) %]
               <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% previssue.biblionumber %]">On hold</a>
                <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
                </td>
            [% ELSE %]
            <td><input type="checkbox" class="radio" name="barcodes[]"  value="[% previssue.barcode %]" />
                <input type="checkbox" name="all_barcodes[]" value="[% previssue.barcode %]" checked="checked" style="display: none;" />
            </td>
            [% END %]
        [% END %]
        [% IF ( exports_enabled ) %]
          <td style="text-align:center;">
            <input type="checkbox" id="export_[% previssue.biblionumber %]" name="biblionumbers" value="[% previssue.biblionumber %]" />
            <input type="checkbox" name="itemnumbers" value="[% previssue.itemnumber %]" style="visibility:hidden;" />
          </td>
        [% END %]
    </tr>
    <!-- /loop previssues -->[% END %]
<!--/if previssues -->[% END %]
      </tbody>
    </table>
    [% IF ( issuecount ) %]
    <fieldset class="action">
        [% IF ( CAN_user_circulate_override_renewals ) %]
        [% IF ( AllowRenewalLimitOverride ) %]
        <label for="override_limit">Override renewal limit:</label>
        <input type="checkbox" name="override_limit" id="override_limit" value="1" />
        [% END %]
        [% END %]
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
    </fieldset>
        [% IF ( exports_enabled ) %]
            <fieldset>
            <label for="export_formats"><b>Export checkouts using format:</b></label>
            <select name="export_formats" id="export_formats">
                <option value="iso2709_995">ISO2709 with items</option>
                <option value="iso2709">ISO2709 without items</option>
                [% IF ( export_with_csv_profile ) %]
                    <option value="csv">CSV</option>
                [% END %]

            </select>
           <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
            <input type="hidden" name="op" value="export" />
            <input type="hidden" id="export_format" name="format" value="iso2709" />
            <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" />
            <input type="hidden" id="record_type" name="record_type" value="bibs" />
            <input type="button" id="export_submit" value="Export" />
            </fieldset>
        [% END %]
    [% END %]
</form>
<p ng-hide="checkouts.length">Patron has nothing checked out.</p>

</div>


[% IF ( displayrelissues ) %]
<div id="relissues">
    <table id="relissuest">
    <thead>
    <tr>
        <th scope="col" class="title-string">Due date</th>
        <th scope="col" class="anti-the">Title</th>
        <th scope="col">Item type</th>
        <th scope="col" class="title-string">Checked out on</th>
        <th scope="col">Checked out from</th>
        <th scope="col">Call no</th>
        <th scope="col">Charge</th>
        <th scope="col">Price</th>
        <th scope="col" class="html-content">Patron</th>
    </tr>
    </thead>
[% IF ( relissues ) %]	<tbody>

    [% FOREACH relissue IN relissues %]
    [% IF ( loop.odd ) %]
    <tr>
    [% ELSE %]
    <tr class="highlight">
    [% END %]
        [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
            <span title="[% relissue.dd_sort %]">[% relissue.dd %]</span></td>

            [% IF ( relissue.itemlost ) %]
                <span class="lost">[% AuthorisedValues.GetByCode( 'LOST', relissue.itemlost ) %]</span>
            [% END %]
            [% IF ( relissue.damaged ) %]
                <span class="dmg">[% AuthorisedValues.GetByCode( 'DAMAGED', relissue.damaged ) %]</span>
            [% END %]
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %][% FOREACH subtitl IN relissue.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
        <td><span title="[% relissue.displaydate_sort %]">[% relissue.displaydate %]</span></td>
        <td>[% relissue.issuingbranchname %]</td>
        <td>[% relissue.itemcallnumber %]</td>
        <td>[% relissue.charge %]</td>
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
     </tr>
    [% END %] <!-- /loop relissues -->
    <!-- /if relissues -->[% END %]
[% IF ( relprevissues ) %]
    [% IF ( UseTablesortForCirc ) %]<tr id="relprevious"><th><span title="">Previous checkouts</span></th><th></th><th></th><th><span title=""></span></th><th></th><th></th><th></th><th></th><th></th></tr>[% ELSE %]<tr id="relprevious"><th colspan="9">Previous checkouts</th></tr>[% END %]
    [% FOREACH relprevissue IN relprevissues %]
    [% IF ( loop.odd ) %]
        <tr>
    [% ELSE %]
        <tr class="highlight">
    [% END %]
        [% IF ( relprevissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
        <span title="[% relprevissue.dd_sort %]">[% relprevissue.dd %]</span>
        </td>
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;type=intra"><strong>[% relprevissue.title |html %][% FOREACH subtitl IN relprevissue.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( relprevissue.author ) %], by [% relprevissue.author %][% END %] [% IF ( relprevissue.itemnotes ) %]- [% relprevissue.itemnotes %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relprevissue.biblionumber %]&amp;itemnumber=[% relprevissue.itemnumber %]#item[% relprevissue.itemnumber %]">[% relprevissue.barcode %]</a></td>
        <td>[% UNLESS noItemTypeImages %][% IF relprevissue.itemtype_image %]<img src="[% relprevissue.itemtype_image %]" alt="" />[% END %][% END %][% relprevissue.itemtype %]</td>
        <td><span title="[% relprevissue.displaydate_sort %]">[% relprevissue.displaydate %]</span></td>
        <td>[% relprevissue.issuingbranchname %]</td>
        <td>[% relprevissue.itemcallnumber %]</td>
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.firstname %] [% relprevissue.surname %]</td>[% END %]
        <td>[% relprevissue.charge %]</td>
        <td>[% relprevissue.replacementprice %]</td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>

    </tr>
    <!-- /loop relprevissue -->[% END %]
<!--/if relprevissues -->[% END %]
      </tbody>
    </table>

</div>
[% END %]<!-- end displayrelissues -->

[% INCLUDE borrower_debarments.inc %]

<div id="reserves">
[% IF ( reservloop ) %]
    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
	<input type="hidden" name="from" value="circ" />
    <table id="holdst">
        <thead><tr>
            <th>Hold date</th>
            <th>Title</th>
            <th>Call number</th>
            <th>Barcode</th>
            <th>Expiration</th>
            <th>Priority</th>
            <th>Delete?</th>
            <th>&nbsp;</th>
        </tr></thead>
		<tbody>
        [% FOREACH reservloo IN reservloop %]
        <tr class="[% reservloo.color %]">
                    <td>[% reservloo.reservedate %]</td>
                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% reservloo.biblionumber %]"><strong>[% reservloo.title |html %][% FOREACH subtitl IN reservloo.subtitle %] [% subtitl.subfield %][% END %]</strong></a>[% IF ( reservloo.author ) %], by [% reservloo.author %][% END %]</td>
                    <td>[% reservloo.itemcallnumber %]</td>
					<td><em>[% IF ( reservloo.barcodereserv ) %]Item [% reservloo.barcodereserv %]
                        [% END %][% IF ( reservloo.waiting ) %] <strong>waiting at [% reservloo.waitingat %]</strong>
                        [% END %]
                        [% IF ( reservloo.transfered ) %] <strong>in transit</strong> from
                        [% reservloo.frombranch %] since [% reservloo.datesent %]
                        [% END %]
                        [% IF ( reservloo.nottransfered ) %] hasn't been transferred yet from [% reservloo.nottransferedby %]</i>
                        [% END %]</em></td>
                    <td>[% reservloo.expirationdate | $KohaDates %]</td>
                    <td>
                        [% IF ( reservloo.waitingposition ) %]<b> [% reservloo.waitingposition %] </b>[% END %]
                    </td>
				<td><select name="rank-request">
                    <option value="n">No</option>
                    <option value="del">Yes</option>
                </select>
                <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
                <input type="hidden" name="reserve_id" value="[% reservloo.reserve_id %]" />
            </td>
            <td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %]</td>
            </tr>
        [% END %]</tbody>
    </table>
            <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
    </form>

    [% IF SuspendHoldsIntranet %]
    <fieldset class="action">
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
            <input type="hidden" name="from" value="circ" />
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
            <input type="submit" value="Suspend all holds" />

            [% IF AutoResumeSuspendedHolds %]
            <label for="suspend_until">until</label>
            <input type="text" size="10" id="suspend_until" name="suspend_until" class="datepicker" />
            <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
             [% END %]
        </form>
    </fieldset>

    <fieldset class="action">
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
            <input type="hidden" name="from" value="circ" />
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
            <input type="hidden" name="suspend" value="0" />
            <input type="submit" value="Resume all suspended holds" />
	</form>
    </fieldset>
    [% END # IF SuspendHoldsIntranet %]

[% ELSE %]
	<p>Patron has nothing on hold.</p>
[% END %]
</div> <!-- reservesloop -->

</div></div>



</div>
</div>
<div class="yui-b">
[% INCLUDE 'circ-menu.inc' %]
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]




#!/usr/bin/perl

# This file is part of Koha.
#
# Copyright (C) 2014 ByWater Solutions
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use Koha::Service::Patrons;
Koha::Service::Patrons->new->run;





use Modern::Perl;

use Test::More tests => 73;
use Test::MockModule;
use Koha::Service::Patrons;
use Data::Dumper;
use C4::Context;



is($member->{dateofbirth}, undef, "Empty dates handled correctly");

my $service = Koha::Service::Patrons->new;
my $borrowernumber = $member->{borrowernumber};
$service->test( "GET", "/$borrowernumber/patronInfo" );
my $jsonresponse = $service->dispatch->{patronInfo};

ok ( $jsonresponse->{firstname}    eq $FIRSTNAME    &&
     $jsonresponse->{surname}      eq $SURNAME      &&
     $jsonresponse->{categorycode} eq $CATEGORYCODE &&
     $jsonresponse->{branchcode}   eq $BRANCHCODE
     , "Got member")
  or diag("Mismatching member details: ".Dumper(\%data, $jsonresponse));

C4::Context->_unset_userenv;
C4::Context->set_userenv ( @USERENV );

$member->{firstname} = $CHANGED_FIRSTNAME;
$member->{email}     = $EMAIL;
$member->{ethnicity} = $ETHNICITY;





use Modern::Perl;

use Test::More tests => 55;

use MARC::Record;
use DateTime::Duration;

use C4::Items;
use C4::Members;
use C4::Circulation;
use JSON;
use t::lib::Mocks;
use Test::WWW::Mechanize;

use Koha::DateUtils;

use Data::Dumper;
BEGIN {
    use_ok('C4::Reserves');
    use_ok('Koha::Service::Patrons');
}



# a very minimal mack of userenv for use by the test of DelItemCheck
*C4::Context::userenv = sub {
    return {};

($status, $reserve, $all_reserves) = CheckReserves(undef, $barcode);
is($status, "Reserved", "CheckReserves Test 3");

my $service = Koha::Service::Patrons->new;
$service->test( "GET", "/$borrowernumber/holds" );
my $jsonresponse = $service->dispatch;

ok(
    ref($jsonresponse->{holds}) eq "ARRAY" && scalar @{ $jsonresponse->{holds} } == 1,
    "checks to make sure that API returns one hold"
);

my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');
C4::Context->set_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
ok(
- 

Return to bug 13630

Lines 59-66 use Modern::Perl; Link Here

(-)a/Koha/Service.pm (-8 / +58 lines)
59	use base 'Class::Accessor';	59	use base 'Class::Accessor';
60		60
61	use C4::Auth qw( check_api_auth );	61	use C4::Auth qw( check_api_auth );
		62	use C4::Context;
62	use C4::Output qw( :ajax );	63	use C4::Output qw( :ajax );
63	use CGI;	64	use CGI;
		65	use DateTime;
64	use JSON;	66	use JSON;
65		67
66	our $debug;	68	our $debug;
Lines 109-114 sub new { Link Here
109	}, $class;	111	}, $class;
110	}	112	}
111		113
		114	=head2 test
		115
		116	$service->test( $request_method, $path_info, \%params );
		117
		118	Sets up a fake CGI context for unit tests.
		119
		120	=cut
		121
		122	sub test {
		123	my ( $self, $request_method, $path_info, $params ) = @_;
		124
		125	$ENV{REQUEST_METHOD} = $request_method;
		126	$ENV{PATH_INFO} = $path_info;
		127	$ENV{HTTP_CONTENT_LENGTH} = "0";
		128	$self->query(CGI->new);
		129
		130	foreach my $key ( keys %$params ) {
		131	$self->query->param( $key, $params->{ $key } );
		132	}
		133
		134	my $user = $ENV{KOHA_USER} \|\| C4::Context->config("user");
		135	my $password = $ENV{KOHA_PASS} \|\| C4::Context->config("pass");
		136
		137	$self->query->param( 'userid', $user );
		138	$self->query->param( 'password', $password );
		139
		140	$self->authenticate;
		141	}
		142
112	=head2 authenticate	143	=head2 authenticate
113		144
114	my ( $query, $cookie ) = $self->authenticate();	145	my ( $query, $cookie ) = $self->authenticate();
Lines 123-136 This must be called before the C<croak> or C<output> methods. Link Here
123	sub authenticate {	154	sub authenticate {
124	my ( $self ) = @_;	155	my ( $self ) = @_;
125		156
126	$self->query(CGI->new);	157	unless ( defined( $self->auth_status ) ) {
		158	$self->query(CGI->new) unless ( $self->query );
127		159
128	my ( $status, $cookie, $sessionID ) = check_api_auth( $self->query, $self->{needed_flags} );	160	my ( $status, $cookie, $sessionID ) = check_api_auth( $self->query, $self->{needed_flags} );
129	$self->cookie($cookie);	161	$self->cookie($cookie);
130	$self->auth_status($status);	162	$self->auth_status($status);
131	$self->croak( 'auth', $status ) if ( $status ne 'ok' && !$self->{authnotrequired} );	163	$self->handle_auth_failure() if ( $status ne 'ok' );
		164	}
132		165
133	return ( $self->query, $cookie );	166	return ( $self->query, $self->cookie );
		167	}
		168
		169	=head2 handle_auth_failure
		170
		171	$self->handle_auth_failure();
		172
		173	Called when C<authenticate> fails (C<$self->auth_status> not 'ok'). By default, if
		174	C<$self->{authnotrequired}> is not set, croaks and outputs an auth error.
		175
		176	=cut
		177
		178	sub handle_auth_failure {
		179	my ( $self ) = @_;
		180
		181	$self->croak( 'auth', $self->auth_status ) if ( !$self->{authnotrequired} );
134	}	182	}
135		183
136	=head2 output	184	=head2 output
Lines 157-162 is given, outputs JSONP. Link Here
157		205
158	=cut	206	=cut
159		207
		208	*DateTime::TO_JSON = sub { shift->_stringify; };
		209
160	sub output {	210	sub output {
161	my ( $self, $response, $options ) = @_;	211	my ( $self, $response, $options ) = @_;
162		212
Lines 170-179 sub output { Link Here
170	};	220	};
171		221
172	if ( $options->{type} eq 'json' ) {	222	if ( $options->{type} eq 'json' ) {
173	$response = encode_json($response);	223	$response = JSON->new->convert_blessed->encode($response);
174		224
175	if ( $self->query->param( 'callback' ) ) {	225	if ( $self->query->param( 'callback' ) ) {
176	$response = $self->query->param( 'callback' ) . '(' . encode_json($response) . ');';	226	$response = $self->query->param( 'callback' ) . '(' . $response . ');';
177	$options->{status} = '200 OK';	227	$options->{status} = '200 OK';
178	$options->{type} = 'js';	228	$options->{type} = 'js';
179	}	229	}

Lines 17-24 Link Here

(-)a/t/db_dependent/Members.t (-1 / +17 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 72;	20	use Test::More tests => 73;
21	use Test::MockModule;	21	use Test::MockModule;
		22	use Koha::Service::Patrons;
22	use Data::Dumper;	23	use Data::Dumper;
23	use C4::Context;	24	use C4::Context;
24		25
Lines 113-118 ok ( $member->{firstname} eq $FIRSTNAME && Link Here
113		114
114	is($member->{dateofbirth}, undef, "Empty dates handled correctly");	115	is($member->{dateofbirth}, undef, "Empty dates handled correctly");
115		116
		117	my $service = Koha::Service::Patrons->new;
		118	my $borrowernumber = $member->{borrowernumber};
		119	$service->test( "GET", "/$borrowernumber/patronInfo" );
		120	my $jsonresponse = $service->dispatch->{patronInfo};
		121
		122	ok ( $jsonresponse->{firstname} eq $FIRSTNAME &&
		123	$jsonresponse->{surname} eq $SURNAME &&
		124	$jsonresponse->{categorycode} eq $CATEGORYCODE &&
		125	$jsonresponse->{branchcode} eq $BRANCHCODE
		126	, "Got member")
		127	or diag("Mismatching member details: ".Dumper(\%data, $jsonresponse));
		128
		129	C4::Context->_unset_userenv;
		130	C4::Context->set_userenv ( @USERENV );
		131
116	$member->{firstname} = $CHANGED_FIRSTNAME;	132	$member->{firstname} = $CHANGED_FIRSTNAME;
117	$member->{email} = $EMAIL;	133	$member->{email} = $EMAIL;
118	$member->{ethnicity} = $ETHNICITY;	134	$member->{ethnicity} = $ETHNICITY;

Lines 20-25 package Koha::Service::Authentication; Link Here

(-)a/Koha/Service/Authentication.pm (-2 / +6 lines)
20		20
21	use Modern::Perl;	21	use Modern::Perl;
22		22
		23	# Handles authentication and output manually, so no reason to inherit from Koha::Service::XML
23	use base 'Koha::Service';	24	use base 'Koha::Service';
24		25
25	use C4::Auth qw/check_api_auth/;	26	use C4::Auth qw/check_api_auth/;
Lines 29-41 use XML::Simple; Link Here
29	sub new {	30	sub new {
30	my ( $class ) = @_;	31	my ( $class ) = @_;
31		32
32	# Authentication is handled manually below
33	return $class->SUPER::new( {	33	return $class->SUPER::new( {
34	authnotrequired => 1,
35	needed_flags => { editcatalogue => 'edit_catalogue'},	34	needed_flags => { editcatalogue => 'edit_catalogue'},
36	} );	35	} );
37	}	36	}
38		37
		38	sub handle_auth_failure {
		39	# Stub, to allow run() to output XML itself.
		40	}
		41
39	sub run {	42	sub run {
40	my ( $self ) = @_;	43	my ( $self ) = @_;
41	# The authentication strategy for the biblios web	44	# The authentication strategy for the biblios web
Lines 55-60 sub run { Link Here
55		58
56	$self->authenticate;	59	$self->authenticate;
57		60
		61	# Can't reuse Koha::Service::XML, as result node has different name.
58	$self->output( XMLout({ status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1), { type => 'xml' } );	62	$self->output( XMLout({ status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1), { type => 'xml' } );
59	}	63	}
60		64

Lines 21-27 package Koha::Service::Bib; Link Here

(-)a/Koha/Service/Bib.pm (-20 / +4 lines)
21		21
22	use Modern::Perl;	22	use Modern::Perl;
23		23
24	use base 'Koha::Service';	24	use base 'Koha::Service::XML';
25		25
26	use C4::Biblio;	26	use C4::Biblio;
27	use C4::Items;	27	use C4::Items;
Lines 30-39 use XML::Simple; Link Here
30	sub new {	30	sub new {
31	my ( $class ) = @_;	31	my ( $class ) = @_;
32		32
33	# Authentication is handled manually below
34	return $class->SUPER::new( {	33	return $class->SUPER::new( {
35	authnotrequired => 1,	34	needed_flags => { editcatalogue => 'edit_catalogue' },
36	needed_flags => { editcatalogue => 'edit_catalogue'},
37	routes => [	35	routes => [
38	[ qr'GET /(\d+)', 'fetch_bib' ],	36	[ qr'GET /(\d+)', 'fetch_bib' ],
39	[ qr'POST /(\d+)', 'update_bib' ],	37	[ qr'POST /(\d+)', 'update_bib' ],
Lines 41-66 sub new { Link Here
41	} );	39	} );
42	}	40	}
43		41
44	sub run {
45	my ( $self ) = @_;
46
47	$self->authenticate;
48
49	unless ( $self->auth_status eq "ok" ) {
50	$self->output( XMLout( { auth_status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1 ), { type => 'xml', status => '403 Forbidden' } );
51	exit;
52	}
53
54	$self->dispatch;
55	}
56
57	sub fetch_bib {	42	sub fetch_bib {
58	my ( $self, $biblionumber ) = @_;	43	my ( $self, $biblionumber ) = @_;
59		44
60	my $record = GetMarcBiblio( $biblionumber, $self->query->url_param('items') );	45	my $record = GetMarcBiblio( $biblionumber, $self->query->url_param('items') );
61		46
62	if (defined $record) {	47	if (defined $record) {
63	$self->output( $record->as_xml_record(), { type => 'xml' } );	48	return $record->as_xml_record();
64	} else {	49	} else {
65	$self->output( '', { status => '404 Not Found', type => 'xml' } );	50	$self->output( '', { status => '404 Not Found', type => 'xml' } );
66	}	51	}
Lines 77-83 sub update_bib { Link Here
77		62
78	my $result = {};	63	my $result = {};
79	my $inxml = $self->query->param('POSTDATA');	64	my $inxml = $self->query->param('POSTDATA');
80	use Data::Dumper; warn Dumper($self->query);
81		65
82	my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};	66	my $record = eval {MARC::Record::new_from_xml( $inxml, "utf8", C4::Context->preference('marcflavour'))};
83	my $do_not_escape = 0;	67	my $do_not_escape = 0;
Lines 115-121 sub update_bib { Link Here
115	$do_not_escape = 1;	99	$do_not_escape = 1;
116	}	100	}
117		101
118	$self->output( XMLout($result, NoAttr => 1, RootName => 'response', XMLDecl => 1, NoEscape => $do_not_escape), { type => 'xml' } );	102	return XMLout($result, NoAttr => 1, RootName => 'response', XMLDecl => 1, NoEscape => $do_not_escape);
119	}	103	}
120		104
121	1;	105	1;

Lines 22-28 package Koha::Service::BibProfile; Link Here

(-)a/Koha/Service/BibProfile.pm (-9 / +3 lines)
22		22
23	use Modern::Perl;	23	use Modern::Perl;
24		24
25	use base 'Koha::Service';	25	use base 'Koha::Service::XML';
26		26
27	use C4::Context;	27	use C4::Context;
28	use C4::Koha;	28	use C4::Koha;
Lines 33-40 sub new { Link Here
33		33
34	# Authentication is handled manually below	34	# Authentication is handled manually below
35	return $class->SUPER::new( {	35	return $class->SUPER::new( {
36	authnotrequired => 1,	36	needed_flags => { editcatalogue => 'edit_catalogue' },
37	needed_flags => { editcatalogue => 'edit_catalogue'},
38	routes => [	37	routes => [
39	[ qr'GET /(\d+)', 'fetch_bib' ],	38	[ qr'GET /(\d+)', 'fetch_bib' ],
40	[ qr'POST /(\d+)', 'update_bib' ],	39	[ qr'POST /(\d+)', 'update_bib' ],
Lines 47-57 sub run { Link Here
47		46
48	$self->authenticate;	47	$self->authenticate;
49		48
50	unless ( $self->auth_status eq "ok" ) {
51	$self->output( XMLout( { auth_status => $self->auth_status }, NoAttr => 1, RootName => 'response', XMLDecl => 1 ), { type => 'xml', status => '403 Forbidden' } );
52	exit;
53	}
54
55	# get list of required tags	49	# get list of required tags
56	my $result = {};	50	my $result = {};
57	$result->{'auth_status'} = $self->auth_status;	51	$result->{'auth_status'} = $self->auth_status;
Lines 69-75 sub run { Link Here
69	XMLDecl => 1,	63	XMLDecl => 1,
70	GroupTags => {mandatory_tags => 'tag', mandatory_subfields => 'subfield', reserved_tags => 'tag', valid_values => 'value'}	64	GroupTags => {mandatory_tags => 'tag', mandatory_subfields => 'subfield', reserved_tags => 'tag', valid_values => 'value'}
71	),	65	),
72	{ type => 'xml', status => '403 Forbidden' }	66	{ type => 'xml' }
73	);	67	);
74	}	68	}
75		69

Line 0 Link Here

(-)a/Koha/Service/Patrons.pm (+245 lines)
		1	#!/usr/bin/perl
		2	package Koha::Service::Patrons;
		3
		4	# This file is part of Koha.
		5	#
		6	# Copyright (C) 2014 ByWater Solutions
		7	#
		8	# Koha is free software; you can redistribute it and/or modify it
		9	# under the terms of the GNU General Public License as published by
		10	# the Free Software Foundation; either version 3 of the License, or
		11	# (at your option) any later version.
		12	#
		13	# Koha is distributed in the hope that it will be useful, but
		14	# WITHOUT ANY WARRANTY; without even the implied warranty of
		15	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	# GNU General Public License for more details.
		17	#
		18	# You should have received a copy of the GNU General Public License
		19	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		20
		21	=head1 NAME
		22
		23	svc/patrons - Web service for getting patron information
		24
		25	=head1 SYNOPSIS
		26
		27	GET /svc/patrons/BORROWERNUMBER
		28
		29	=head1 DESCRIPTION
		30
		31	This service is used to query and change patron information.
		32
		33	=head1 METHODS
		34
		35	=cut
		36
		37	use Modern::Perl;
		38
		39	use base 'Koha::Service';
		40
		41	use C4::Biblio;
		42	use C4::Circulation;
		43	use C4::Context;
		44	use C4::Dates;
		45	use C4::Items;
		46	use C4::Members;
		47	use C4::Reserves;
		48	use C4::Search qw( SimpleSearch );
		49	use Koha::DateUtils;
		50
		51	sub new {
		52	my ( $class ) = @_;
		53
		54	# Authentication is handled manually below
		55	return $class->SUPER::new( {
		56	needed_flags => { circulate => 'circulate_remaining_permissions' },
		57	routes => [
		58	[ qr'POST /(\d+)/checkouts', 'add_checkout'],
		59	[ qr'GET /(\d+)/checkouts', 'get_checkouts' ],
		60	[ qr'GET /(\d+)/holds', 'get_holds' ],
		61	[ qr'GET /(\d+)/patronInfo', 'get_patron_info' ],
		62	[ qr'POST /(\d+)/checkouts/(\d+(?:,\d+)*)', 'renew_checkouts', [ 'renewed' ] ],
		63	]
		64	} );
65	}
66
67	=head2 add_checkout
68
69	=over 4
70
71	POST /svc/patrons/BORROWERNUMBER/checkouts
72
73	=back
74
75	Checks out an item
76
77	=cut
78
79	sub add_checkout {
80	my ( $self, $borrowernumber ) = @_;
81
82	my $datedue;
83	my $duedatespec = $self->query->param('duedate');
84
85	if ( C4::Context->preference('SpecifyDueDate') && $duedatespec ){
86	if ($duedatespec =~ C4::Dates->regexp('syspref')) {
87	$datedue = dt_from_string($duedatespec);
88	} else {
89	return {errors => {INVALID_DATE=>$duedatespec}};
90	}
91	}
92
93	my ($barcode) = $self->require_params('barcode');
94
95	my $borrower = GetMember( borrowernumber => $borrowernumber );
96
97	my ( $errors, $questions, $alerts ) =
98	CanBookBeIssued( $borrower, $barcode, $datedue );
99
100	if ( $errors->{'UNKNOWN_BARCODE'} && C4::Context->preference("itemBarcodeFallbackSearch") ) {
101	my $query = "kw=" . $barcode;
102	my ( $searcherror, $results, $total_hits ) = SimpleSearch($query);
103
104	# if multiple hits, offer options to librarian
105	if ( $total_hits > 0 ) {
106	my @options = ();
107	foreach my $hit ( @{$results} ) {
108	my $biblionumber = C4::Biblio::get_koha_field_from_marc(
109	'biblio',
110	'biblionumber',
111	C4::Search::new_record_from_zebra('biblioserver',$hit)
112	);
113
114	next unless ( $biblionumber );
115
116	# offer all items with barcodes individually
117	foreach my $item ( GetItemsInfo( $biblionumber ) ) {
118	$item->{available} = !( $item->{itemnotforloan} \|\| $item->{onloan} \|\| $item->{itemlost} \|\| $item->{withdrawn} \|\| $item->{damaged} \|\| $item->{transfertwhen} \|\| $item->{reservedate} );
119
120	push @options, $item if ( $item->{barcode} );
121	}
122	}
123
124	$errors->{fallback_choices} = \@options;
125	}
126	}
127
128	if ( %$errors \|\| ( %$questions && !$self->query->param('confirmed') ) ) {
129	return {
130	item => GetBiblioFromItemNumber( undef, $barcode ),
131	errors => $errors,
132	questions => $questions,
133	alerts => $alerts
134	};
135	}
136
137	AddIssue( $borrower, $barcode, $datedue );
138
139	return {};
140	}
141
142	=head2 get_holds
143
144	=over 4
145
146	GET /svc/patrons/BORROWERNUMBER/holds
147
148	=back
149
150	Retrieves information on the holds for a patron.
151
152	=cut
153
154	sub get_holds {
155	my ( $self, $borrowernumber ) = @_;
156
157	my @holds = GetReservesFromBorrowernumber($borrowernumber);
158	foreach my $hold (@holds) {
159	my $getiteminfo = GetBiblioFromItemNumber( $hold->{'itemnumber'} );
160	$hold->{title} = $getiteminfo->{title};
161	$hold->{author} = $getiteminfo->{author};
162	$hold->{barcode} = $getiteminfo->{barcode};
163	}
164
165	return { holds => \@holds };
166	}
167
168	=head2 get_checkouts
169
170	=over 4
171
172	GET /svc/patrons/BORROWERNUMBER/checkouts
173
174	=back
175
176	Retrieves information on the checkouts for a patron.
177
178	=cut
179
180	sub get_checkouts {
181	my ( $self, $borrowernumber ) = @_;
182
183	return { checkouts => GetPendingIssues( $borrowernumber ) };
184	}
185
186	=head2 get_patron_info
187
188	=over 4
189
190	GET /svc/patrons/BORROWERNUMBER/patronInfo
191
192	=back
193
194	Retrieves information on a patron.
195
196	=cut
197
198	sub get_patron_info {
199	my ( $self, $borrowernumber ) = @_;
200
201	return { patronInfo => GetMemberDetails( $borrowernumber, 0 ) };
202	}
203
204	=head2 renew_checkouts
205
206	=over 4
207
208	POST /svc/patrons/BORROWERNUMBER/checkouts/ITEMNUMBER,ITEMNUMBER,.../?renewed=1
209
210	=back
211
212	Renews several checkouts.
213
214	=cut
215
216	sub renew_checkouts {
217	my ( $self, $borrowernumber, $itemnumbers ) = @_;
218
219	my @items = split /,/, $itemnumbers;
220
221	my $branch = C4::Context->userenv ? C4::Context->userenv->{'branch'} : '';
222	my $datedue;
223	if ( $self->query->param('newduedate') ) {
224	$datedue = dt_from_string( $self->query->param('newduedate') );
225	$datedue->set_hour(23);
226	$datedue->set_minute(59);
227	}
228
229	my $override_limit = $self->query->param("override_limit") \|\| 0;
230	my @responses;
231	foreach my $itemno (@items) {
232	# check status before renewing issue
233	my ( $renewokay, $error ) =
234	CanBookBeRenewed( $borrowernumber, $itemno, $override_limit );
235	if ($renewokay) {
236	push @responses, { itemnumber => $itemno, datedue => AddRenewal( $borrowernumber, $itemno, $branch, $datedue ) };
237	} else {
238	push @responses, { itemnumber => $itemno, error => $error };
239	}
240	}
241
242	return { responses => \@responses };
243	}
244
245	1;

Line 0 Link Here

(-)a/circ/checkout.pl (+98 lines)
		1	#!/usr/bin/perl
		2
		3	# This file is part of Koha.
		4	#
		5	# Copyright (C) 2014 ByWater Solutions
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21
		22	use C4::Auth;
		23	use C4::Branch;
		24	use C4::ClassSource;
		25	use C4::Context;
		26	use C4::Output;
		27	use C4::Members;
		28	use CGI;
		29	use Koha::Database;
		30
		31	my $query = CGI->new;
		32
		33	my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
		34	{
		35	template_name => 'circ/checkout.tt',
		36	query => $query,
		37	type => "intranet",
		38	authnotrequired => 0,
		39	flagsrequired => { circulate => 'circulate_remaining_permissions' },
		40	}
		41	);
		42
		43	my $borrowernumber = $query->param( 'borrowernumber' );
		44	$template->{ VARS }->{ borrowernumber }=$borrowernumber;
		45	$template->{ VARS }->{ circview }=1;
		46	$template->param( %{ GetMemberDetails( $borrowernumber, 0 ) } );
		47
		48	my $schema = Koha::Database->new->schema;
		49	my $authorised_values = {};
		50
		51	$authorised_values->{branches} = [];
		52	my $onlymine=C4::Context->preference('IndependentBranches') &&
		53	C4::Context->userenv &&
		54	C4::Context->userenv->{flags} % 2 == 0 &&
		55	C4::Context->userenv->{branch};
		56	my $branches = GetBranches($onlymine);
		57	foreach my $thisbranch ( sort keys %$branches ) {
		58	push @{ $authorised_values->{branches} }, { value => $thisbranch, lib => $branches->{$thisbranch}->{'branchname'} };
		59	}
		60
		61	$authorised_values->{itemtypes} = [ $schema->resultset( "Itemtype" )->search( undef, {
		62	columns => [ { value => 'itemtype' }, { lib => "description" } ],
		63	order_by => "description",
		64	result_class => 'DBIx::Class::ResultClass::HashRefInflator'
65	} ) ];
66
67	my $class_sources = GetClassSources();
68
69	my $default_source = C4::Context->preference("DefaultClassificationSource");
70
71	foreach my $class_source (sort keys %$class_sources) {
72	next unless $class_sources->{$class_source}->{'used'} or
73	($class_source eq $default_source);
74	push @{ $authorised_values->{cn_source} }, { value => $class_source, lib => $class_sources->{$class_source}->{'description'} };
75	}
76
77	my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
78	my $results;
79	if( $branch_limit ) {
80	$results = $schema->resultset( "AuthorisedValue" )->search(
81	{ "authorised_values_branches.branchcode" => { "=", [ $branch_limit, undef ] } },
82	{ join => "authorised_values_branches", order_by => "lib" } );
83	} else {
84	$results = $schema->resultset( "AuthorisedValue" )->search(
85	undef,
86	{ order_by => "lib" } );
87	}
88
89	foreach my $result ( $results->all ) {
90	$authorised_values->{$result->category} \|\|= [];
91	push @{ $authorised_values->{$result->category} }, { value => $result->authorised_value, lib => $result->lib };
92	}
93
94	$template->{VARS}->{authorised_values} = $authorised_values;
95
96	$template->{VARS}->{authvalcode_notforloan} = C4::Koha::GetAuthValCode('items.notforloan', '' );
97
98	output_html_with_http_headers $query, $cookie, $template->output;

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc (-1 / +13 lines)
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!-- TEMPLATE FILE: [% template.name.split('/').last %] -->	2	<!-- TEMPLATE FILE: [% template.name.split('/').last %] -->
3	[% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %]	3	[% IF ( bidi ) %]
		4	[% IF ( angular_app ) %]
		5	<html lang="[% lang %]" dir="[% bidi %]" ng-app="[% angular_app %]>
		6	[% ELSE %]
		7	<html lang="[% lang %]" dir="[% bidi %]">
		8	[% END %]
		9	[% ELSE %]
		10	[% IF ( angular_app ) %]
		11	<html lang="[% lang %]" ng-app="[% angular_app %]">
		12	[% ELSE %]
		13	<html lang="[% lang %]">
		14	[% END %]
		15	[% END %]
4	<head>	16	<head>

Lines 62-68 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (+15 lines)
62	searchToHold();	62	searchToHold();
63	return false;	63	return false;
64	})	64	})
		65	$("#switchclient").click( function() {
		66	var borrowernumber = [% borrowernumber \|\| "null" %];
		67
		68	if ( $.cookie('checkout_client' ) == 'beta' ) {
		69	$.cookie( 'checkout_client', 'standard', { expires: 365, path: '/' } );
		70	window.location = '/cgi-bin/koha/circ/circulation.pl?borrowernumber=' + borrowernumber;
		71	}
		72	else {
		73	$.cookie( 'checkout_client', 'beta', { expires: 365, path: '/' } );
		74	window.location = '/cgi-bin/koha/circ/checkout.pl?borrowernumber=' + borrowernumber;
		75	}
		76	return false;
		77	} );
65	});	78	});
		79
66	function confirm_deletion() {	80	function confirm_deletion() {
67	var is_confirmed = window.confirm(_("Are you sure you want to delete this patron? This cannot be undone."));	81	var is_confirmed = window.confirm(_("Are you sure you want to delete this patron? This cannot be undone."));
68	if (is_confirmed) {	82	if (is_confirmed) {
Lines 195-200 function searchToHold(){ Link Here
195	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li></li>	209	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li></li>
196	[% END %]	210	[% END %]
197	<li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>	211	<li><a id="exportcheckins" href="#">Export today's checked in barcodes</a></li>
		212	<li><a id="switchclient" href="#">Switch checkout client</a></li>
198	</ul>	213	</ul>
199	</div>	214	</div>
200	</div>	215	</div>

Lines 19-32 KOHA.AJAX = { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/ajax.js (-3 / +3 lines)
19	return;	19	return;
20	}	20	}
21		21
22	var error = eval( '(' + xhr.responseText + ')' );	22	var data = eval( '(' + xhr.responseText + ')' );
23		23
24	if ( error.type == 'auth' ) {	24	if ( data.error == 'auth' ) {
25	humanMsg.displayMsg( MSG_SESSION_TIMED_OUT );	25	humanMsg.displayMsg( MSG_SESSION_TIMED_OUT );
26	}	26	}
27		27
28	if ( callback ) {	28	if ( callback ) {
29	callback( error );	29	callback( data );
30	} else {	30	} else {
31	humanMsg.displayAlert( MSG_DATA_NOT_SAVED );	31	humanMsg.displayAlert( MSG_DATA_NOT_SAVED );
32	}	32	}

Line 0 Link Here

(-)a/svc/patrons (+23 lines)
	1	#!/usr/bin/perl
	2
	3	# This file is part of Koha.
	4	#
	5	# Copyright (C) 2014 ByWater Solutions
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19
	20	use Modern::Perl;
	21
	22	use Koha::Service::Patrons;
	23	Koha::Service::Patrons->new->run;

Lines 17-23 Link Here

(-)a/t/db_dependent/Reserves.t (-2 / +15 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 53;	20	use Test::More tests => 55;
21		21
22	use MARC::Record;	22	use MARC::Record;
23	use DateTime::Duration;	23	use DateTime::Duration;
Lines 27-41 use C4::Biblio; Link Here
27	use C4::Items;	27	use C4::Items;
28	use C4::Members;	28	use C4::Members;
29	use C4::Circulation;	29	use C4::Circulation;
		30	use JSON;
30	use t::lib::Mocks;	31	use t::lib::Mocks;
		32	use Test::WWW::Mechanize;
31		33
32	use Koha::DateUtils;	34	use Koha::DateUtils;
33		35
34	use Data::Dumper;	36	use Data::Dumper;
35	BEGIN {	37	BEGIN {
36	use_ok('C4::Reserves');	38	use_ok('C4::Reserves');
		39	use_ok('Koha::Service::Patrons');
37	}	40	}
38		41
		42
		43
39	# a very minimal mack of userenv for use by the test of DelItemCheck	44	# a very minimal mack of userenv for use by the test of DelItemCheck
40	*C4::Context::userenv = sub {	45	*C4::Context::userenv = sub {
41	return {};	46	return {};
Lines 127-132 is($status, "Reserved", "CheckReserves Test 2"); Link Here
127	($status, $reserve, $all_reserves) = CheckReserves(undef, $barcode);	132	($status, $reserve, $all_reserves) = CheckReserves(undef, $barcode);
128	is($status, "Reserved", "CheckReserves Test 3");	133	is($status, "Reserved", "CheckReserves Test 3");
129		134
		135	my $service = Koha::Service::Patrons->new;
		136	$service->test( "GET", "/$borrowernumber/holds" );
		137	my $jsonresponse = $service->dispatch;
		138
		139	ok(
		140	ref($jsonresponse->{holds}) eq "ARRAY" && scalar @{ $jsonresponse->{holds} } == 1,
		141	"checks to make sure that API returns one hold"
		142	);
		143
130	my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');	144	my $ReservesControlBranch = C4::Context->preference('ReservesControlBranch');
131	C4::Context->set_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );	145	C4::Context->set_preference( 'ReservesControlBranch', 'ItemHomeLibrary' );
132	ok(	146	ok(
133	-