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

(-)a/Koha/ILL/Request.pm (-3 / +2 lines)
Lines 1075-1087 pass it $params, as it does not yet have any other data associated with it. Link Here
1075
=cut
1075
=cut
1076
1076
1077
sub backend_create {
1077
sub backend_create {
1078
    my ( $self, $params ) = @_;
1078
    my ( $self, $params, $loggedin_patron ) = @_;
1079
1079
1080
    # Establish whether we need to do a generic copyright clearance.
1080
    # Establish whether we need to do a generic copyright clearance.
1081
    if ( $params->{opac} ) {
1081
    if ( $params->{opac} ) {
1082
1082
1083
        my $patron = $params->{cardnumber} ? Koha::Patrons->find( { cardnumber => $params->{cardnumber} } ) : undef;
1083
        my $patron_branchcode = $loggedin_patron ? $loggedin_patron->branchcode : undef;
1084
        my $patron_branchcode = $patron    ? $patron->branchcode                                            : undef;
1085
        my $copyright_content = Koha::AdditionalContents->search_for_display(
1084
        my $copyright_content = Koha::AdditionalContents->search_for_display(
1086
            {
1085
            {
1087
                category => 'html_customizations',
1086
                category => 'html_customizations',
(-)a/opac/opac-illrequests.pl (-1 / +1 lines)
Lines 186-192 if ( $op eq 'list' ) { Link Here
186
        $params->{cardnumber} = $patron->cardnumber if $patron;
186
        $params->{cardnumber} = $patron->cardnumber if $patron;
187
        $params->{opac}       = 1;
187
        $params->{opac}       = 1;
188
        $params->{lang}       = C4::Languages::getlanguage($query);
188
        $params->{lang}       = C4::Languages::getlanguage($query);
189
        my $backend_result = $request->backend_create($params);
189
        my $backend_result = $request->backend_create( $params, $patron );
190
190
191
        if ( $backend_result->{stage} eq 'copyrightclearance' ) {
191
        if ( $backend_result->{stage} eq 'copyrightclearance' ) {
192
            $template->param(
192
            $template->param(
(-)a/t/db_dependent/Koha/ILL/Requests.t (-7 / +5 lines)
Lines 1055-1078 subtest 'Backend core methods' => sub { Link Here
1055
    is( $copyright_content->count, 1 );
1055
    is( $copyright_content->count, 1 );
1056
1056
1057
    $backend_create_result =
1057
    $backend_create_result =
1058
        $illrq->backend_create(
1058
        $illrq->backend_create( { opac => 1, branchcode => $illrq->patron->branchcode }, $illrq->patron );
1059
        { opac => 1, branchcode => $illrq->patron->branchcode, cardnumber => $illrq->patron->cardnumber } );
1060
    is(
1059
    is(
1061
        $backend_create_result->{stage}, 'copyrightclearance',
1060
        $backend_create_result->{stage}, 'copyrightclearance',
1062
        'Additional contents found for provided cardnumber\'s library, should be copyrightclearance stage'
1061
        'Additional contents found for logged in user\'s library, should be copyrightclearance stage'
1063
    );
1062
    );
1064
1063
1065
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $illrq->patron->branchcode } );
1064
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $illrq->patron->branchcode } );
1066
    is(
1065
    is(
1067
        $backend_create_result->{stage}, 'commit',
1066
        $backend_create_result->{stage}, 'commit',
1068
        'Cardnumber not supplied and couldnt find additional_contents for all libraries. Dont show copyrightclearance'
1067
        'Logged in patron not supplied and could not find additional_contents for all libraries. Dont show copyrightclearance'
1069
    );
1068
    );
1070
1069
1071
    my $patron_1 = $builder->build_object( { class => 'Koha::Patrons' } );
1070
    my $patron_1 = $builder->build_object( { class => 'Koha::Patrons' } );
1072
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $patron_1->branchcode } );
1071
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $patron_1->branchcode } );
1073
    is(
1072
    is(
1074
        $backend_create_result->{stage}, 'commit',
1073
        $backend_create_result->{stage}, 'commit',
1075
        'Supplied cardnumber\'s branchcode doesnt match any additional_contents of same branchcode. Dont show copyrightclearance'
1074
        'Logged in user\'s branchcode does not match any additional_contents of same branchcode. Dont show copyrightclearance'
1076
    );
1075
    );
1077
1076
1078
    my $all_libraries_copyright_content = Koha::AdditionalContents->search_for_display(
1077
    my $all_libraries_copyright_content = Koha::AdditionalContents->search_for_display(
Lines 1109-1115 subtest 'Backend core methods' => sub { Link Here
1109
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $illrq->patron->branchcode } );
1108
    $backend_create_result = $illrq->backend_create( { opac => 1, branchcode => $illrq->patron->branchcode } );
1110
    is(
1109
    is(
1111
        $backend_create_result->{stage}, 'copyrightclearance',
1110
        $backend_create_result->{stage}, 'copyrightclearance',
1112
        'Cardnumber not supplied, found additional_contents for all libraries. Should show copyrightclearance'
1111
        'Logged in user not supplied, found additional_contents for all libraries. Should show copyrightclearance'
1113
    );
1112
    );
1114
1113
1115
    $all_libraries_copyright_content = Koha::AdditionalContents->search_for_display(
1114
    $all_libraries_copyright_content = Koha::AdditionalContents->search_for_display(
1116
- 

Return to bug 41237