Attachment #71682 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




    $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 806-811 sub has_permission { Link Here

(-)a/Koha/Patron.pm (+10 lines)
806	return C4::Auth::haspermission( $self->userid, $flagsrequired );	806	return C4::Auth::haspermission( $self->userid, $flagsrequired );
807	}	807	}
808		808
		809	sub is_adult {
		810	my ( $self ) = @_;
		811	return $self->category->category_type =~ /^(A\|I)$/ ? 1 : 0;
		812	}
		813
		814	sub is_child {
		815	my( $self ) = @_;
		816	return $self->category->category_type eq 'C' ? 1 : 0;
		817	}
		818
809	=head3 type	819	=head3 type
810		820
811	=cut	821	=cut

Lines 1055-1060 subtest 'account_locked' => sub { Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-1 / +67 lines)
1055	$patron->delete;	1055	$patron->delete;
1056	};	1056	};
1057		1057
		1058	subtest 'is_child \| is_adult' => sub {
		1059	plan tests => 8;
		1060	my $category = $builder->build_object(
		1061	{
		1062	class => 'Koha::Patron::Categories',
		1063	value => { category_type => 'A' }
		1064	}
		1065	);
		1066	my $patron_adult = $builder->build_object(
		1067	{
		1068	class => 'Koha::Patrons',
		1069	value => { categorycode => $category->categorycode }
		1070	}
		1071	);
		1072	$category = $builder->build_object(
		1073	{
		1074	class => 'Koha::Patron::Categories',
		1075	value => { category_type => 'I' }
		1076	}
		1077	);
		1078	my $patron_adult_i = $builder->build_object(
		1079	{
		1080	class => 'Koha::Patrons',
		1081	value => { categorycode => $category->categorycode }
		1082	}
		1083	);
		1084	$category = $builder->build_object(
		1085	{
		1086	class => 'Koha::Patron::Categories',
		1087	value => { category_type => 'C' }
		1088	}
		1089	);
		1090	my $patron_child = $builder->build_object(
		1091	{
		1092	class => 'Koha::Patrons',
		1093	value => { categorycode => $category->categorycode }
		1094	}
		1095	);
		1096	$category = $builder->build_object(
		1097	{
		1098	class => 'Koha::Patron::Categories',
		1099	value => { category_type => 'O' }
		1100	}
		1101	);
		1102	my $patron_other = $builder->build_object(
		1103	{
		1104	class => 'Koha::Patrons',
		1105	value => { categorycode => $category->categorycode }
		1106	}
		1107	);
		1108	is( $patron_adult->is_adult, 1, 'Patron from category A should be considered adult' );
		1109	is( $patron_adult_i->is_adult, 1, 'Patron from category I should be considered adult' );
		1110	is( $patron_child->is_adult, 0, 'Patron from category C should not be considered adult' );
		1111	is( $patron_other->is_adult, 0, 'Patron from category O should not be considered adult' );
		1112
		1113	is( $patron_adult->is_child, 0, 'Patron from category A should be considered child' );
		1114	is( $patron_adult_i->is_child, 0, 'Patron from category I should be considered child' );
		1115	is( $patron_child->is_child, 1, 'Patron from category C should not be considered child' );
		1116	is( $patron_other->is_child, 0, 'Patron from category O should not be considered child' );
		1117
		1118	# Clean up
		1119	$patron_adult->delete;
		1120	$patron_adult_i->delete;
		1121	$patron_child->delete;
1122	$patron_other->delete;
1123	};
1124
1058	$retrieved_patron_1->delete;	1125	$retrieved_patron_1->delete;
1059	is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have deleted the patron' );	1126	is( Koha::Patrons->search->count, $nb_of_patrons + 1, 'Delete should have deleted the patron' );
1060		1127
1061	-