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

(-)a/C4/Serials.pm (-1 / +3 lines)
Lines 772-779 sub GetLatestSerials { Link Here
772
    my $dbh = C4::Context->dbh;
772
    my $dbh = C4::Context->dbh;
773
773
774
    my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );
774
    my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );
775
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
775
    my $strsth = "SELECT   serial.serialid,serialseq, status, planneddate, publisheddate, notes, price
776
                        FROM     serial
776
                        FROM     serial
777
                        INNER JOIN serialitems ON (serial.serialid=serialitems.serialid)
778
                        INNER JOIN items ON (serialitems.itemnumber=items.itemnumber)
777
                        WHERE    subscriptionid = ?
779
                        WHERE    subscriptionid = ?
778
                        AND      status IN ($statuses)
780
                        AND      status IN ($statuses)
779
                        ORDER BY publisheddate DESC LIMIT 0,$limit
781
                        ORDER BY publisheddate DESC LIMIT 0,$limit
(-)a/catalogue/detail.pl (+20 lines)
Lines 36-41 use C4::Search; # enabled_staff_search_views Link Here
36
use C4::Tags qw(get_tags);
36
use C4::Tags qw(get_tags);
37
use C4::XSLT;
37
use C4::XSLT;
38
use C4::Images;
38
use C4::Images;
39
use C4::Acquisition;
39
use Koha::DateUtils;
40
use Koha::DateUtils;
40
use C4::HTML5Media;
41
use C4::HTML5Media;
41
use C4::CourseReserves qw(GetItemCourseReservesInfo);
42
use C4::CourseReserves qw(GetItemCourseReservesInfo);
Lines 172-177 my @subscriptions = SearchSubscriptions({ biblionumber => $biblionumber, o Link Here
172
my @subs;
173
my @subs;
173
174
174
foreach my $subscription (@subscriptions) {
175
foreach my $subscription (@subscriptions) {
176
177
    #Get the order associated with this subscription to calculate and display subscription cost
178
    my $lastOrder;
179
    if ( subscriptionCurrentlyOnOrder $subscription->{subscriptionid}  ) {
180
        $lastOrder = GetLastOrderNotReceivedFromSubscriptionid( $subscription->{subscriptionid} );
181
    } else {
182
        $lastOrder = GetLastOrderReceivedFromSubscriptionid( $subscription->{subscriptionid} );
183
    }
184
    my $subscriptioncost = sprintf( "%.2f", ($lastOrder->{ecost} || 0) * ($lastOrder->{quantity} || 0) );
185
175
    my %cell;
186
    my %cell;
176
    my $serials_to_display;
187
    my $serials_to_display;
177
    $cell{subscriptionid}    = $subscription->{subscriptionid};
188
    $cell{subscriptionid}    = $subscription->{subscriptionid};
Lines 183-194 foreach my $subscription (@subscriptions) { Link Here
183
    $cell{callnumber}        = $subscription->{callnumber};
194
    $cell{callnumber}        = $subscription->{callnumber};
184
    $cell{location}          = $subscription->{location};
195
    $cell{location}          = $subscription->{location};
185
    $cell{closed}            = $subscription->{closed};
196
    $cell{closed}            = $subscription->{closed};
197
    $cell{subscriptioncost}  = $subscriptioncost;
186
    #get the three latest serials.
198
    #get the three latest serials.
187
    $serials_to_display = $subscription->{staffdisplaycount};
199
    $serials_to_display = $subscription->{staffdisplaycount};
188
    $serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
200
    $serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
189
    $cell{staffdisplaycount} = $serials_to_display;
201
    $cell{staffdisplaycount} = $serials_to_display;
190
    $cell{latestserials} =
202
    $cell{latestserials} =
191
      GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
203
      GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
204
205
    #Add the subscription cost to each of the latest serials for display
206
    my $i = 0;
207
    while ( $cell{latestserials}[$i] ) {
208
        $cell{latestserials}[$i]{total} = $subscriptioncost;
209
        $i++;
210
    }
211
192
    push @subs, \%cell;
212
    push @subs, \%cell;
193
}
213
}
194
214
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +5 lines)
Lines 505-510 Link Here
505
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
505
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
506
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
506
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
507
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
507
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
508
            [% IF ( subscription.subscriptioncost ) %]<p>Total cost of the subscription is: [% subscription.subscriptioncost | html %]</p>[% END %]
508
            [% IF ( subscription.latestserials ) %]
509
            [% IF ( subscription.latestserials ) %]
509
            <p> The [% subscription.staffdisplaycount | html %] latest issues related to this subscription:</p>
510
            <p> The [% subscription.staffdisplaycount | html %] latest issues related to this subscription:</p>
510
            <table>
511
            <table>
Lines 513-518 Link Here
513
                    <th>Date arrived</th>
514
                    <th>Date arrived</th>
514
                    <th>Date published</th>
515
                    <th>Date published</th>
515
                    <th>Status</th>
516
                    <th>Status</th>
517
                    <th>Issue price</th>
518
                    <th>Subscription cost</th>
516
                    <th>Note</th>
519
                    <th>Note</th>
517
                </tr>
520
                </tr>
518
            [% FOREACH latestserial IN subscription.latestserials %]
521
            [% FOREACH latestserial IN subscription.latestserials %]
Lines 534-539 Link Here
534
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
537
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
535
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
538
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
536
                    </td>
539
                    </td>
540
                    <td>[% latestserial.price | html %]</td>
541
                    <td>[% latestserial.total | html %]</th>
537
                    <td>[% latestserial.notes | html %]</td>
542
                    <td>[% latestserial.notes | html %]</td>
538
                </tr>
543
                </tr>
539
            [% END %]
544
            [% END %]
540
- 

Return to bug 23450