Attachment #64214 for bug #18789

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




    return C4::Auth::haspermission( $self->userid, $flagsrequired );
}

sub is_adult {
    my ( $self ) = @_;
    return $self->category->category_type =~ /^(A|I)$/ ? 1 : 0;
}

sub is_child {
    my( $self ) = @_;
    return $self->category->category_type eq 'C' ? 1 : 0;
}

=head3 type

=cut





use Modern::Perl;

use Test::More tests => 24;
use Test::Warn;
use DateTime;


    $patron->delete;
};

subtest 'is_child | is_adult' => sub {
    plan tests => 8;
    my $category = $builder->build_object(
        {
            class => 'Koha::Patron::Categories',
            value => { category_type => 'A' }
        }
    );
    my $patron_adult = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => { categorycode => $category->categorycode }
        }
    );
    $category = $builder->build_object(
        {
            class => 'Koha::Patron::Categories',
            value => { category_type => 'I' }
        }
    );
    my $patron_adult_i = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => { categorycode => $category->categorycode }
        }
    );
    $category = $builder->build_object(
        {
            class => 'Koha::Patron::Categories',
            value => { category_type => 'C' }
        }
    );
    my $patron_child = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => { categorycode => $category->categorycode }
        }
    );
    $category = $builder->build_object(
        {
            class => 'Koha::Patron::Categories',
            value => { category_type => 'O' }
        }
    );
    my $patron_other = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => { categorycode => $category->categorycode }
        }
    );
    is( $patron_adult->is_adult, 1, 'Patron from category A should be considered adult' );
    is( $patron_adult_i->is_adult, 1, 'Patron from category I should be considered adult' );
    is( $patron_child->is_adult, 0, 'Patron from category C should not be considered adult' );
    is( $patron_other->is_adult, 0, 'Patron from category O should not be considered adult' );

    is( $patron_adult->is_child, 0, 'Patron from category A should be considered child' );
    is( $patron_adult_i->is_child, 0, 'Patron from category I should be considered child' );
    is( $patron_child->is_child, 1, 'Patron from category C should not be considered child' );
    is( $patron_other->is_child, 0, 'Patron from category O should not be considered child' );

    # Clean up
    $patron_adult->delete;
    $patron_adult_i->delete;
    $patron_child->delete;
    $patron_other->delete;
};

$retrieved_patron_1->delete;
is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have deleted the patron' );

- 

Return to bug 18789

Lines 745-750 sub can { Link Here

(-)a/Koha/Patron.pm (+10 lines)
745	return C4::Auth::haspermission( $self->userid, $flagsrequired );	745	return C4::Auth::haspermission( $self->userid, $flagsrequired );
746	}	746	}
747		747
		748	sub is_adult {
		749	my ( $self ) = @_;
		750	return $self->category->category_type =~ /^(A\|I)$/ ? 1 : 0;
		751	}
		752
		753	sub is_child {
		754	my( $self ) = @_;
		755	return $self->category->category_type eq 'C' ? 1 : 0;
		756	}
		757
748	=head3 type	758	=head3 type
749		759
750	=cut	760	=cut

Lines 19-25 Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-2 / +68 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 23;	22	use Test::More tests => 24;
23	use Test::Warn;	23	use Test::Warn;
24	use DateTime;	24	use DateTime;
25		25
Lines 1001-1006 subtest 'account_locked' => sub { Link Here
1001	$patron->delete;	1001	$patron->delete;
1002	};	1002	};
1003		1003
		1004	subtest 'is_child \| is_adult' => sub {
		1005	plan tests => 8;
		1006	my $category = $builder->build_object(
		1007	{
		1008	class => 'Koha::Patron::Categories',
		1009	value => { category_type => 'A' }
		1010	}
		1011	);
		1012	my $patron_adult = $builder->build_object(
		1013	{
		1014	class => 'Koha::Patrons',
		1015	value => { categorycode => $category->categorycode }
		1016	}
		1017	);
		1018	$category = $builder->build_object(
		1019	{
		1020	class => 'Koha::Patron::Categories',
		1021	value => { category_type => 'I' }
		1022	}
		1023	);
		1024	my $patron_adult_i = $builder->build_object(
		1025	{
		1026	class => 'Koha::Patrons',
		1027	value => { categorycode => $category->categorycode }
		1028	}
		1029	);
		1030	$category = $builder->build_object(
		1031	{
		1032	class => 'Koha::Patron::Categories',
		1033	value => { category_type => 'C' }
		1034	}
		1035	);
		1036	my $patron_child = $builder->build_object(
		1037	{
		1038	class => 'Koha::Patrons',
		1039	value => { categorycode => $category->categorycode }
		1040	}
		1041	);
		1042	$category = $builder->build_object(
		1043	{
		1044	class => 'Koha::Patron::Categories',
		1045	value => { category_type => 'O' }
		1046	}
		1047	);
		1048	my $patron_other = $builder->build_object(
		1049	{
		1050	class => 'Koha::Patrons',
		1051	value => { categorycode => $category->categorycode }
		1052	}
		1053	);
		1054	is( $patron_adult->is_adult, 1, 'Patron from category A should be considered adult' );
		1055	is( $patron_adult_i->is_adult, 1, 'Patron from category I should be considered adult' );
		1056	is( $patron_child->is_adult, 0, 'Patron from category C should not be considered adult' );
		1057	is( $patron_other->is_adult, 0, 'Patron from category O should not be considered adult' );
		1058
		1059	is( $patron_adult->is_child, 0, 'Patron from category A should be considered child' );
		1060	is( $patron_adult_i->is_child, 0, 'Patron from category I should be considered child' );
		1061	is( $patron_child->is_child, 1, 'Patron from category C should not be considered child' );
		1062	is( $patron_other->is_child, 0, 'Patron from category O should not be considered child' );
		1063
		1064	# Clean up
		1065	$patron_adult->delete;
		1066	$patron_adult_i->delete;
		1067	$patron_child->delete;
1068	$patron_other->delete;
1069	};
1070
1004	$retrieved_patron_1->delete;	1071	$retrieved_patron_1->delete;
1005	is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have deleted the patron' );	1072	is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have deleted the patron' );
1006		1073
1007	-