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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-12 / +36 lines)
Lines 333-339 Link Here
333
    </div>
333
    </div>
334
    </div>
334
    </div>
335
335
336
    [% IF orders %]
336
    [% IF orders_grouped %]
337
        <div id="acquisition_details">
337
        <div id="acquisition_details">
338
            <h2>Acquisition details</h2>
338
            <h2>Acquisition details</h2>
339
            <table id="orders">
339
            <table id="orders">
Lines 360-371 Link Here
360
                    </tr>
360
                    </tr>
361
                </thead>
361
                </thead>
362
                <tbody>
362
                <tbody>
363
                [% FOR order IN orders %]
363
                [% FOR ordernumber IN orders_grouped.keys %]
364
                    [% IF order.parent_ordernumber != order.ordernumber %]
364
                    [% SET parent_tree_id = loop.count %]
365
                        <tr data-tt-id="[% order.ordernumber | html %]" data-tt-parent-id="[% order.parent_ordernumber | html %]">
365
                    [% SET parent_order = orders_grouped.$ordernumber %]
366
                    [% ELSE %]
366
                    <tr data-tt-id="[% parent_tree_id | html %]" class="highlighted-row">
367
                        <tr data-tt-id="[% order.parent_ordernumber | html %]">
367
                        <td></td> [%# invoice %]
368
                    [% END %]
368
                        <td>
369
                            [% IF CAN_user_acquisition_order_manage %]
370
                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basket.basketno | uri %]">[% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %])</a>
371
                            [% ELSE %]
372
                                [% parent_order.basket.basketname | html %] ([% parent_order.basket.basketno | html %])
373
                            [% END %]
374
                        </td>
375
                        <td></td> [%# ordernumber %]
376
                        <td>[% parent_order.basket.creationdate | $KohaDates %]</td>
377
                        <td>[% parent_order.datereceived | $KohaDates %]</td>
378
                        <td>
379
                          [% SWITCH parent_order.orderstatus %]
380
                            [% CASE 'new' %]<span title="status_1">New</span>
381
                            [% CASE 'ordered' %]<span title="status_2">Ordered</span>
382
                            [% CASE 'partial' %]<span title="status_3">Partial</span>
383
                            [% CASE 'complete' %]<span title="status_4">Complete</span>
384
                            [% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
385
                          [% END %]
386
                        </td>
387
                        <td></td> [%# internalnote %]
388
                        <td></td> [%# vendornote %]
389
                        <td></td> [%# fund %]
390
                        <td>[% parent_order.quantity | html %]</td>
391
                        <td>[% parent_order.ecost_tax_excluded | $Price %] / [% parent_order.ecost_tax_included | $Price %]</td>
392
                        <td>[% parent_order.unitprice_tax_excluded | $Price %] / [% parent_order.unitprice_tax_included | $Price %]</td>
393
                    </tr>
394
                    [% FOR order IN parent_order.orders %]
395
                        <tr data-tt-id="0" data-tt-parent-id="[% parent_tree_id | html %]">
369
                        <td>
396
                        <td>
370
                        [% IF order.invoice %]
397
                        [% IF order.invoice %]
371
                            [% IF CAN_user_acquisition %]
398
                            [% IF CAN_user_acquisition %]
Lines 376-386 Link Here
376
                            [% END %]
403
                            [% END %]
377
                        [% END %]
404
                        [% END %]
378
                        </td>
405
                        </td>
379
                        <td>[% IF CAN_user_acquisition_order_manage %]
406
                        <td></td> [%# basket %]
380
                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | uri %]">[% order.basket.basketname | html %] ([% order.basketno | html %])</a>
381
                        [% ELSE %]
382
                            [% order.basket.basketname | html %] ([% order.basketno | html %])
383
                        [% END %]</td>
384
                        <td>[% order.ordernumber | html %]</td>
407
                        <td>[% order.ordernumber | html %]</td>
385
                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td>
408
                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td>
386
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
409
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
Lines 409-414 Link Here
409
                            [% END %]
432
                            [% END %]
410
                        </td>
433
                        </td>
411
                    </tr>
434
                    </tr>
435
                    [% END %]
412
                [% END %]
436
                [% END %]
413
                </tbody>
437
                </tbody>
414
            </table>
438
            </table>
(-)a/serials/subscription-detail.pl (-3 / +16 lines)
Lines 125-131 for my $field ( @$additional_fields ) { Link Here
125
$template->param( additional_fields_for_subscription => $additional_fields );
125
$template->param( additional_fields_for_subscription => $additional_fields );
126
126
127
# FIXME Do we want to hide canceled orders?
127
# FIXME Do we want to hide canceled orders?
128
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => { -desc => 'parent_ordernumber' } } );
128
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid }, { order_by => [ { -desc => 'timestamp' }, \[ "field(orderstatus, 'ordered', 'partial', 'complete')" ] ] } );
129
my $orders_grouped;
130
while ( my $o = $orders->next ) {
131
    if ( $o->ordernumber == $o->parent_ordernumber ) {
132
        $orders_grouped->{$o->parent_ordernumber}->{datereceived} = $o->datereceived;
133
        $orders_grouped->{$o->parent_ordernumber}->{orderstatus} = $o->orderstatus;
134
        $orders_grouped->{$o->parent_ordernumber}->{basket} = $o->basket;
135
    }
136
    $orders_grouped->{$o->parent_ordernumber}->{quantity} += $o->quantity;
137
    $orders_grouped->{$o->parent_ordernumber}->{ecost_tax_excluded} += sprintf('%.2f', $o->ecost_tax_excluded * $o->quantity);
138
    $orders_grouped->{$o->parent_ordernumber}->{ecost_tax_included} += sprintf('%.2f', $o->ecost_tax_included * $o->quantity);
139
    $orders_grouped->{$o->parent_ordernumber}->{unitprice_tax_excluded} += sprintf('%.2f', $o->unitprice_tax_excluded * $o->quantity);
140
    $orders_grouped->{$o->parent_ordernumber}->{unitprice_tax_included} += sprintf('%.2f', $o->unitprice_tax_included * $o->quantity);
141
    push @{$orders_grouped->{$o->parent_ordernumber}->{orders}}, $o;
142
}
129
143
130
$template->param(
144
$template->param(
131
    subscriptionid => $subscriptionid,
145
    subscriptionid => $subscriptionid,
Lines 143-149 $template->param( Link Here
143
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
157
    intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'),
144
    irregular_issues => scalar @irregular_issues,
158
    irregular_issues => scalar @irregular_issues,
145
    default_bib_view => $default_bib_view,
159
    default_bib_view => $default_bib_view,
146
    orders => $orders,
160
    orders_grouped => $orders_grouped,
147
    (uc(C4::Context->preference("marcflavour"))) => 1,
161
    (uc(C4::Context->preference("marcflavour"))) => 1,
148
);
162
);
149
163
150
- 

Return to bug 21467