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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt (-3 / +7 lines)
Lines 82-94 Link Here
82
            $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + _("Loading...") );
82
            $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + _("Loading...") );
83
83
84
            KOHA.OverDrive.Get(
84
            KOHA.OverDrive.Get(
85
                prod.links.availability.href,
85
                prod.links.availabilityV2.href,
86
                {},
86
                { version: 2},
87
                function ( data ) {
87
                function ( data ) {
88
                    if ( data.error ) return;
88
                    if ( data.error ) return;
89
89
90
                    if( data.availabilityType == 'AlwaysAvailable' ){
90
                    if( data.availabilityType == 'AlwaysAvailable' ){
91
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="available"><b>' + _("Always available") + '</b></span>' );
91
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="available"><b>' + _("Always available") + '</b></span>' );
92
                     } else if ( data.availabilityType == 'LimitedAvailability' && data.available ) {
93
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="available"><b>' + _("Currently available") + '</b></span>' );
94
                     } else if ( !data.available ) {
95
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="unavailable"><b>' + _("Currently unavailable") + '</b></span>' );
92
                     } else {
96
                     } else {
93
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="available"><b>' + _("Items available:") + ' </b>' +  data.copiesAvailable + " " + _("out of") + ' ' + data.copiesOwned + '</span>' );
97
                        $availability_summary.html( '<span class="label">' + _("Availability:") + ' </span> ' + '<span class="available"><b>' + _("Items available:") + ' </b>' +  data.copiesAvailable + " " + _("out of") + ' ' + data.copiesOwned + '</span>' );
94
                    }
98
                    }
Lines 98-104 Link Here
98
                    }
102
                    }
99
103
100
                    $tr.find( '.info' ).each(function() {
104
                    $tr.find( '.info' ).each(function() {
101
                        KOHA.OverDriveCirculation.add_actions(this, data.id, data.copiesAvailable);
105
                        KOHA.OverDriveCirculation.add_actions(this, data.reserveId, data.copiesAvailable);
102
                    });
106
                    });
103
                }
107
                }
104
            );
108
            );
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js (-1 / +1 lines)
Lines 11-17 KOHA.OverDrive = ( function() { Link Here
11
        Get: function( url, params, callback ) {
11
        Get: function( url, params, callback ) {
12
            $.ajax( {
12
            $.ajax( {
13
                type: 'GET',
13
                type: 'GET',
14
                url: url.replace( /https?:\/\/api.overdrive.com\/v1/, proxy_base_url ),
14
                url: url.replace( /https?:\/\/api.overdrive.com\/v[1|2]/, proxy_base_url ),
15
                dataType: 'json',
15
                dataType: 'json',
16
                data: params,
16
                data: params,
17
                error: function( xhr, error ) {
17
                error: function( xhr, error ) {
(-)a/opac/svc/overdrive_proxy (-2 / +2 lines)
Lines 59-68 if ( !(C4::Context->preference('OverDriveClientKey') && C4::Context->preference( Link Here
59
59
60
    exit;
60
    exit;
61
}
61
}
62
my $version = $query->param('version') // 1;
62
my $fixed_query = $query->query_string;
63
my $fixed_query = $query->query_string;
63
$fixed_query =~ tr/;/&/;
64
$fixed_query =~ tr/;/&/;
64
65
65
my $request = HTTP::Request::Common::GET( "https://api.overdrive.com/v1" . $query->path_info . '?' . $fixed_query );
66
my $request = HTTP::Request::Common::GET( "https://api.overdrive.com/v$version" . $query->path_info . '?' . $fixed_query );
66
$request->header( Authorization => $token );
67
$request->header( Authorization => $token );
67
68
68
my $ua = LWP::UserAgent->new( "Koha " . Koha::version() );
69
my $ua = LWP::UserAgent->new( "Koha " . Koha::version() );
69
- 

Return to bug 29320