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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-59 / +36 lines)
Lines 78-84 Link Here
78
[% UNLESS ( grouped ) %]
78
[% UNLESS ( grouped ) %]
79
<script type="text/javascript">
79
<script type="text/javascript">
80
//<![CDATA[
80
//<![CDATA[
81
            function confirm_reopen(skip) {
81
            function confirm_reopen() {
82
                var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %];
82
                var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?"));
83
                var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?"));
83
                if (is_confirmed) {
84
                if (is_confirmed) {
84
                    window.location = "[% script_name %]?op=reopen&basketno=[% basketno %]";
85
                    window.location = "[% script_name %]?op=reopen&basketno=[% basketno %]";
Lines 104-110 Link Here
104
        var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
105
        var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, {
105
            "sPaginationType": "four_button"
106
            "sPaginationType": "four_button"
106
        } ) );
107
        } ) );
107
    } );
108
        $("#delbasketbutton").on("click",function(e){
109
            e.preventDefault();
110
            confirm_deletion();
111
        });
112
        $("#reopenbutton").on("click",function(e){
113
            e.preventDefault();
114
            confirm_reopen();
115
        });
116
    });
108
//]]>
117
//]]>
109
</script>
118
</script>
110
119
Lines 127-188 Link Here
127
        [% UNLESS ( confirm_close ) %]
136
        [% UNLESS ( confirm_close ) %]
128
        [% UNLESS ( selectbasketg ) %]
137
        [% UNLESS ( selectbasketg ) %]
129
            [% UNLESS ( closedate ) %]
138
            [% UNLESS ( closedate ) %]
130
                <div id="toolbar">
139
                <div id="toolbar" class="btn-toolbar">
131
                    <script type="text/javascript">
140
                    <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>
132
                        //<![CDATA[
141
                    <div class="btn-group"><a href="#" class="btn btn-small" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>
133
                        // prepare DOM for YUI Toolbar
134
                        $(document).ready(function() {
135
                            yuiToolbar();
136
                        });
137
                        // YUI Toolbar Functions
138
                        function yuiToolbar() {
139
                            [% IF ( unclosable ) %]
140
                                new YAHOO.widget.Button("closebutton", {disabled:true});
141
                            [% ELSIF ( uncertainprices ) %]
142
                                new YAHOO.widget.Button("uncertpricesbutton");
143
                            [% ELSE %]
144
                                new YAHOO.widget.Button("closebutton");
145
                            [% END %]
146
                            new YAHOO.widget.Button("basketheadbutton");
147
                            new YAHOO.widget.Button("exportbutton");
148
                            new YAHOO.widget.Button("delbasketbutton");
149
                        }
150
                        //]]>
151
                    </script>
152
153
                    <ul id="toolbar-list" class="toolbar">
154
                    <li><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="button" id="basketheadbutton">Edit basket</a></li>
155
                    <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
156
                    [% IF ( unclosable ) %]
142
                    [% IF ( unclosable ) %]
157
                    [% ELSIF ( uncertainprices ) %]
143
                    [% ELSIF ( uncertainprices ) %]
158
                        <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
144
                        <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid %]&amp;owner=1" class="btn btn-small" id="uncertpricesbutton">Uncertain prices</a></div>
159
                    [% ELSE %]
145
                    [% ELSE %]
160
                        <li><a href="[% script_name %]?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="closebutton">Close this basket</a></li>
146
                        <div class="btn-group">
147
                            <a href="[% script_name %]?op=close&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="closebutton"><i class="icon-remove-sign"></i> Close this basket</a>
148
                        </div>
161
                    [% END %]
149
                    [% END %]
162
                        <li><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="exportbutton">Export this basket as CSV</a></li>
150
                        <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
163
                    </ul>
164
151
165
                </div>
152
                </div>
166
            [% ELSE %]
153
            [% ELSE %]
167
                [% UNLESS ( grouped ) %]
154
                [% UNLESS ( grouped ) %]
168
                <div id="toolbar">
155
                <div id="toolbar" class="btn-toolbar">
169
                    <script type="text/javascript">
156
                    <div class="btn-group"><a href="#" class="btn btn-small" id="reopenbutton"><i class="icon-refresh"></i> Reopen this basket</a></div>
170
                        //<![CDATA[
157
                    <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket as CSV</a></div>
171
                        // prepare DOM for YUI Toolbar
172
                        $(document).ready(function() {
173
                            yuiToolbar();
174
                        });
175
                        // YUI Toolbar Functions
176
                        function yuiToolbar() {
177
                            new YAHOO.widget.Button("reopenbutton");
178
                            new YAHOO.widget.Button("exportbutton");
179
                        }
180
                        //]]>
181
                    </script>
182
                        <ul id="toolbar-list" class="toolbar">
183
                            <li><a href="javascript:confirm_reopen([% skip_confirm_reopen %]);" class="button" id="reopenbutton">Reopen this basket</a></li>
184
                            <li><a href="[% script_name %]?op=export&amp;basketno=[% basketno %]&amp;booksellerid=[% booksellerid %]" class="button" id="exportbutton">Export this basket as CSV</a></li>
185
                        </ul>
186
                </div>
158
                </div>
187
                [% END %]
159
                [% END %]
188
            [% END %]
160
            [% END %]
Lines 307-319 Link Here
307
                [% FOREACH foot_loo IN book_foot_loop %]
279
                [% FOREACH foot_loo IN book_foot_loop %]
308
                    <tr>
280
                    <tr>
309
                        <th>Total (GST [% foot_loo.gstgsti %])</th>
281
                        <th>Total (GST [% foot_loo.gstgsti %])</th>
310
                        <th class="gste"/><th class="gste"/><th class="gsti"/><th class="gsti"/>
282
                        <th class="gste">&nbsp;</th>
283
                        <th class="gste">&nbsp;</th>
284
                        <th class="gsti">&nbsp;</th>
285
                        <th class="gsti">&nbsp;</th>
311
                        <th>[% foot_loo.quantity %]</th>
286
                        <th>[% foot_loo.quantity %]</th>
312
                        <th class="gste">[% foot_loo.totalgste %]</th>
287
                        <th class="gste">[% foot_loo.totalgste %]</th>
313
                        <th class="gsti">[% foot_loo.totalgsti %]</th>
288
                        <th class="gsti">[% foot_loo.totalgsti %]</th>
314
                        <th/>
289
                        <th>&nbsp;</th>
315
                        <th>[% foot_loo.gstvalue %]</th>
290
                        <th>[% foot_loo.gstvalue %]</th>
316
                        <th/>
291
                        <th>&nbsp;</th>
317
                        [% IF ( active ) %]
292
                        [% IF ( active ) %]
318
                            [% UNLESS ( closedate ) %]
293
                            [% UNLESS ( closedate ) %]
319
                                <th>&nbsp;</th>
294
                                <th>&nbsp;</th>
Lines 324-336 Link Here
324
                [% END %]
299
                [% END %]
325
                <tr>
300
                <tr>
326
                    <th>Total ([% currency %])</th>
301
                    <th>Total ([% currency %])</th>
327
                    <th class="gste"/><th class="gste"/><th class="gsti"/><th class="gsti"/>
302
                    <th class="gste">&nbsp;</th>
303
                    <th class="gste">&nbsp;</th>
304
                    <th class="gsti">&nbsp;</th>
305
                    <th class="gsti">&nbsp;</th>
328
                    <th>[% total_quantity %]</th>
306
                    <th>[% total_quantity %]</th>
329
                    <th class="gste">[% total_gste %]</th>
307
                    <th class="gste">[% total_gste %]</th>
330
                    <th class="gsti">[% total_gsti %]</th>
308
                    <th class="gsti">[% total_gsti %]</th>
331
                    <th/>
309
                    <th>&nbsp;</th>
332
                    <th>[% total_gstvalue %]</th>
310
                    <th>[% total_gstvalue %]</th>
333
                    <th/>
311
                    <th>&nbsp;</th>
334
                    [% IF ( active ) %]
312
                    [% IF ( active ) %]
335
                        [% UNLESS ( closedate ) %]
313
                        [% UNLESS ( closedate ) %]
336
                            <th>&nbsp;</th>
314
                            <th>&nbsp;</th>
Lines 356-367 Link Here
356
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
334
                                    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %]
357
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
335
                                    (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid %]&amp;op=show">suggestion #[% books_loo.suggestionid %]</a>)
358
                                [% END %]
336
                                [% END %]
337
                            </p>
359
                                [% IF ( books_loo.notes ) %]
338
                                [% IF ( books_loo.notes ) %]
360
                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
339
                                    <p class="ordernote"><strong>Note: </strong>[% books_loo.notes|html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Change note</a>]</p>
361
                                [% ELSE %]
340
                                [% ELSE %]
362
                                    [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]
341
                                    <p>[<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber %]">Add note</a>]</p>
363
                                [% END %]
342
                                [% END %]
364
                            </p>
365
                        </td>
343
                        </td>
366
                        <td class="number gste [% IF books_loo.rrpgste.search('^0') %]error[% END %]">[% books_loo.rrpgste %]</td>
344
                        <td class="number gste [% IF books_loo.rrpgste.search('^0') %]error[% END %]">[% books_loo.rrpgste %]</td>
367
                        <td class="number gste [% IF books_loo.ecostgste.search('^0') %]error[% END %]">[% books_loo.ecostgste %]</td>
345
                        <td class="number gste [% IF books_loo.ecostgste.search('^0') %]error[% END %]">[% books_loo.ecostgste %]</td>
368
- 

Return to bug 9769