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

(-)a/acqui/basketgroup.pl (-1 lines)
Lines 355-361 if ($op eq 'mod_basket') { Link Here
355
# template will know if basketgroup must be displayed or edited, depending on
355
# template will know if basketgroup must be displayed or edited, depending on
356
# the value of closed key
356
# the value of closed key
357
357
358
my $bookseller = Koha::Acquisition::Booksellers->find($booksellerid);
359
my $basketgroupid = $input->param('basketgroupid');
358
my $basketgroupid = $input->param('basketgroupid');
360
my $billingplace;
359
my $billingplace;
361
my $deliveryplace;
360
my $deliveryplace;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroups.tt (-25 / +25 lines)
Lines 1-6 Link Here
1
[% USE Asset %]
1
[% USE Asset %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE raw %]
4
5
5
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
Lines 10-16 Link Here
10
        <title>Koha &rsaquo; Basket groups</title>
11
        <title>Koha &rsaquo; Basket groups</title>
11
    [% END %]
12
    [% END %]
12
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
13
[% Asset.css('css/datatables.css') %]
14
[% Asset.css('css/datatables.css') | $raw %]
14
</head>
15
</head>
15
<body id="acq_basketgroup" class="acq">
16
<body id="acq_basketgroup" class="acq">
16
    [% INCLUDE 'header.inc' %]
17
    [% INCLUDE 'header.inc' %]
Lines 22-28 Link Here
22
        <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
23
        <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
23
        &rsaquo;
24
        &rsaquo;
24
        [% IF (bookseller) %]
25
        [% IF (bookseller) %]
25
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name |html %]</a>
26
            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a>
26
            &rsaquo;
27
            &rsaquo;
27
        [% END %]
28
        [% END %]
28
        Basket groups
29
        Basket groups
Lines 35-45 Link Here
35
                    [% IF bookseller %]
36
                    [% IF bookseller %]
36
                        <div id="toolbar" class="btn-toolbar">
37
                        <div id="toolbar" class="btn-toolbar">
37
                            <div class="btn-group">
38
                            <div class="btn-group">
38
                                <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% bookseller.id %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
39
                                <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% bookseller.id | $raw %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a>
39
                            </div>
40
                            </div>
40
                        </div>
41
                        </div>
41
42
42
                        <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id %]">[% bookseller.name %]</a></h1>
43
                        <h1>Basket groups for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | $raw %]">[% bookseller.name | html %]</a></h1>
43
                    [% END %]
44
                    [% END %]
44
45
45
                    [% IF basketgroups.size > 0 %]
46
                    [% IF basketgroups.size > 0 %]
Lines 62-100 Link Here
62
                                    <tr>
63
                                    <tr>
63
                                        <td>
64
                                        <td>
64
                                            [% IF ( basketgroup.name ) %]
65
                                            [% IF ( basketgroup.name ) %]
65
                                                [% basketgroup.name %]
66
                                                [% basketgroup.name | html %]
66
                                            [% ELSE %]
67
                                            [% ELSE %]
67
                                                Basket group no. [% basketgroup.id %]
68
                                                Basket group no. [% basketgroup.id | $raw %]
68
                                            [% END %]
69
                                            [% END %]
69
                                        </td>
70
                                        </td>
70
                                        <td>[% basketgroup.vendor.name %]</td>
71
                                        <td>[% basketgroup.vendor.name | html %]</td>
71
                                        <td>[% Branches.GetName(basketgroup.billingplace) %]</td>
72
                                        <td>[% Branches.GetName(basketgroup.billingplace) | html %]</td>
72
                                        <td>
73
                                        <td>
73
                                            [% IF (basketgroup.freedeliveryplace) %]
74
                                            [% IF (basketgroup.freedeliveryplace) %]
74
                                                [% basketgroup.freedeliveryplace %]
75
                                                [% basketgroup.freedeliveryplace | html %]
75
                                            [% ELSE %]
76
                                            [% ELSE %]
76
                                                [% Branches.GetName(basketgroup.deliveryplace) %]
77
                                                [% Branches.GetName(basketgroup.deliveryplace) | html %]
77
                                            [% END %]
78
                                            [% END %]
78
                                        </td>
79
                                        </td>
79
                                        <td>[% basketgroup.baskets_count %]</td>
80
                                        <td>[% basketgroup.baskets_count | $raw %]</td>
80
                                        <td>[% basketgroup.ordered_titles_count %]</td>
81
                                        <td>[% basketgroup.ordered_titles_count | $raw %]</td>
81
                                        <td>[% basketgroup.received_titles_count %]</td>
82
                                        <td>[% basketgroup.received_titles_count | $raw %]</td>
82
                                        <td>[% basketgroup.closeddate | $KohaDates %]</td>
83
                                        <td>[% basketgroup.closeddate | $KohaDates %]</td>
83
                                        <td>
84
                                        <td>
84
                                            <div class="dropdown">
85
                                            <div class="dropdown">
85
                                            <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
86
                                            <a class="btn btn-default btn-xs dropdown-toggle" id="actions-[% basketgroup.id | $raw %]" role="button" data-toggle="dropdown">Actions <b class="caret"></b></a>
86
                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id %]">
87
                                            <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="actions-[% basketgroup.id | $raw %]">
87
                                            [% IF basketgroup.closeddate %]
88
                                            [% IF basketgroup.closeddate %]
88
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-eye"></i> View</a></li>
89
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-eye"></i> View</a></li>
89
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
90
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=reopen&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-folder-open"></i> Reopen</a></li>
90
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Export as PDF</a></li>
91
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=print&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Export as PDF</a></li>
91
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
92
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=export&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-file-text"></i> Export as CSV</a></li>
92
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id %]">Generate EDIFACT order</a></li>
93
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=ediprint&baskegroupid=[% basketgroup.id | $raw %]">Generate EDIFACT order</a></li>
93
                                            [% ELSE %]
94
                                            [% ELSE %]
94
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-pencil"></i> Edit</a></li>
95
                                                <li><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-pencil"></i> Edit</a></li>
95
                                                <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
96
                                                <li><a class="closeandprint" href="/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-print"></i> Close and export as PDF</a></li>
96
                                                [% UNLESS basketgroup.baskets_count %]
97
                                                [% UNLESS basketgroup.baskets_count %]
97
                                                    <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid %]&basketgroupid=[% basketgroup.id %]"><i class="fa fa-trash"></i> Delete</a></li>
98
                                                    <li><a class="delete" href="/cgi-bin/koha/acqui/basketgroup.pl?op=delete&booksellerid=[% basketgroup.booksellerid | $raw %]&basketgroupid=[% basketgroup.id | $raw %]"><i class="fa fa-trash"></i> Delete</a></li>
98
                                                [% END %]
99
                                                [% END %]
99
                                            [% END %]
100
                                            [% END %]
100
                                            </ul>
101
                                            </ul>
Lines 117-123 Link Here
117
118
118
        [% MACRO jsinclude BLOCK %]
119
        [% MACRO jsinclude BLOCK %]
119
            [% INCLUDE 'datatables.inc' %]
120
            [% INCLUDE 'datatables.inc' %]
120
            [% Asset.js('lib/jquery/plugins/jquery.dataTables.columnFilter.js') %]
121
            [% Asset.js('lib/jquery/plugins/jquery.dataTables.columnFilter.js') | $raw %]
121
            <script type="text/javascript">
122
            <script type="text/javascript">
122
                $(document).ready(function() {
123
                $(document).ready(function() {
123
                    var options = {
124
                    var options = {
124
- 

Return to bug 11708