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

(-)a/acqui/booksellers.pl (+11 lines)
Lines 156-166 for my $vendor (@suppliers) { Link Here
156
      };
156
      };
157
157
158
}
158
}
159
160
my $sessionID = $query->cookie('CGISESSID');
161
my $session = C4::Auth::get_session($sessionID);
162
my $view = $query->param('view');
163
if ( $view ) {
164
    $session->param('bookseller_default_view', $view);
165
} else {
166
    $view = $session->param('bookseller_default_view');
167
}
168
159
$template->param(
169
$template->param(
160
    loop_suppliers => $loop_suppliers,
170
    loop_suppliers => $loop_suppliers,
161
    supplier       => ( $booksellerid || $supplier ),
171
    supplier       => ( $booksellerid || $supplier ),
162
    count          => $supplier_count,
172
    count          => $supplier_count,
163
    has_budgets          => $has_budgets,
173
    has_budgets          => $has_budgets,
174
    view           => $view,
164
);
175
);
165
$template->{VARS}->{'allbaskets'} = $allbaskets;
176
$template->{VARS}->{'allbaskets'} = $allbaskets;
166
177
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-105 / +135 lines)
Lines 133-256 $(document).ready(function() { Link Here
133
            <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
133
            <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
134
        </span>
134
        </span>
135
    [% END %]
135
    [% END %]
136
[% END %]
136
    [% IF view == "complete" %]
137
[% IF ( loop_suppliers.size ) %]
137
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&view=simple">Switch to the simple view</a></p>
138
    [% IF allbaskets %]
139
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]">Show active baskets only</a>
140
    [% ELSE %]
138
    [% ELSE %]
141
        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]&amp;allbaskets=1">Show active and inactive baskets</a>
139
        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&view=complete">Switch to the complete view</a></p>
142
    [% END %]
140
    [% END %]
143
     | <a href="#" id="toggle_closed_baskets">Show opened baskets only</a>
141
[% END %]
144
    <div id="acqui_order_basketlist">
142
[% IF ( loop_suppliers.size ) %]
145
    <table id="baskets" class="group">
143
    [% IF view == "complete" %]
146
        <thead>
144
        [% IF allbaskets %]
147
            <tr>
145
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]">Show active baskets only</a>
148
                <th class='NoVisible'>bookseller</th>
146
        [% ELSE %]
149
                <th>No.</th>
147
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]&amp;allbaskets=1">Show active and inactive baskets</a>
150
                <th>Name</th>
148
        [% END %]
151
                <th>Item count</th>
149
         | <a href="#" id="toggle_closed_baskets">Show opened baskets only</a>
152
                <th>Biblio count</th>
150
        <div id="acqui_order_basketlist">
153
                <th>Items expected</th>
151
        <table id="baskets" class="group">
154
                <th>Created by</th>
152
            <thead>
155
                <th class="title-string">Date</th>
156
                <th>Basket group</th>
157
                <th class="title-string">Closed</th>
158
                <th>&nbsp;</th>
159
            </tr>
160
        </thead>
161
        <tbody>
162
        [% FOREACH supplier IN loop_suppliers %]
163
            [% IF supplier.loop_basket.size == 0 %]
164
                <tr>
153
                <tr>
165
                    <td>
154
                    <th class='NoVisible'>bookseller</th>
166
                        <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
155
                    <th>No.</th>
167
                        ([% supplier.booksellerid %])
156
                    <th>Name</th>
168
                        [% PROCESS action supplier = supplier %]
157
                    <th>Item count</th>
169
                    </td>
158
                    <th>Biblio count</th>
170
                    <td>
159
                    <th>Items expected</th>
171
                        [% IF allbaskets %]
160
                    <th>Created by</th>
172
                            No basket.
161
                    <th class="title-string">Date</th>
173
                        [% ELSE %]
162
                    <th>Basket group</th>
174
                            No active basket.
163
                    <th class="title-string">Closed</th>
175
                        [% END %]
164
                    <th>&nbsp;</th>
176
                    </td>
177
                    <td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
178
                </tr>
165
                </tr>
179
            [% END %]
166
            </thead>
180
            [% FOREACH basket IN supplier.loop_basket %]
167
            <tbody>
181
                [% IF ( basket.uncertainprices ) %]
168
            [% FOREACH supplier IN loop_suppliers %]
182
                    <tr class="problem">
169
                [% IF supplier.loop_basket.size == 0 %]
183
                [% ELSE %]
184
                    <tr>
170
                    <tr>
171
                        <td>
172
                            <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
173
                            ([% supplier.booksellerid %])
174
                            [% PROCESS action supplier = supplier %]
175
                        </td>
176
                        <td>
177
                            [% IF allbaskets %]
178
                                No basket.
179
                            [% ELSE %]
180
                                No active basket.
181
                            [% END %]
182
                        </td>
183
                        <td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
184
                    </tr>
185
                [% END %]
185
                [% END %]
186
                    <td>
186
                [% FOREACH basket IN supplier.loop_basket %]
187
                        <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
187
                    [% IF ( basket.uncertainprices ) %]
188
                        ([% supplier.booksellerid %])
188
                        <tr class="problem">
189
                        [% PROCESS action supplier = supplier %]
189
                    [% ELSE %]
190
                    </td>
190
                        <tr>
191
                    <td>[% basket.basketno %]</td>
191
                    [% END %]
192
                    <td>[% basket.basketname %]</td>
192
                        <td>
193
                    <td>
193
                            <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
194
                        [% basket.total_items %]
194
                            ([% supplier.booksellerid %])
195
                        [% IF basket.total_items_cancelled %]
195
                            [% PROCESS action supplier = supplier %]
196
                            ([% basket.total_items_cancelled %] cancelled)
196
                        </td>
197
                        [% END %]
197
                        <td>[% basket.basketno %]</td>
198
                    </td>
198
                        <td>[% basket.basketname %]</td>
199
                    <td>
199
                        <td>
200
                        [% basket.total_biblios %]
200
                            [% basket.total_items %]
201
                        [% IF basket.total_biblios_cancelled %]
201
                            [% IF basket.total_items_cancelled %]
202
                            ([% basket.total_biblios_cancelled %] cancelled)
202
                                ([% basket.total_items_cancelled %] cancelled)
203
                        [% END %]
203
                            [% END %]
204
                    </td>
204
                        </td>
205
                    <td>[% basket.expected_items %]</td>
205
                        <td>
206
                    <td>
206
                            [% basket.total_biblios %]
207
                        [% basket.authorisedby_firstname %] [% basket.authorisedby_surname %]
207
                            [% IF basket.total_biblios_cancelled %]
208
                    </td>
208
                                ([% basket.total_biblios_cancelled %] cancelled)
209
                    <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
209
                            [% END %]
210
                    <td>
210
                        </td>
211
                      [% IF basket.basketgroup %]
211
                        <td>[% basket.expected_items %]</td>
212
                        [% basketgroup = basket.basketgroup %]
212
                        <td>
213
                        [% IF basketgroup.closed %]
213
                            [% basket.authorisedby_firstname %] [% basket.authorisedby_surname %]
214
                          [% basketgroup.name %] (closed)
214
                        </td>
215
                        [% ELSE %]
215
                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
216
                          <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
216
                        <td>
217
                        [% END %]
217
                          [% IF basket.basketgroup %]
218
                      [% END %]
218
                            [% basketgroup = basket.basketgroup %]
219
                    </td>
219
                            [% IF basketgroup.closed %]
220
                    <td>
220
                              [% basketgroup.name %] (closed)
221
                        [% IF ( basket.closedate ) %]
221
                            [% ELSE %]
222
                            <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
222
                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
223
                        [% ELSE %]
223
                            [% END %]
224
                            <span title="9999-99-99"></span>
224
                          [% END %]
225
                        [% END %]
225
                        </td>
226
                    </td>
226
                        <td>
227
                    <td class="actions">
227
                            [% IF ( basket.closedate ) %]
228
                        <a class="btn btn-mini" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]"><i class="fa fa-eye"></i> View</a>
228
                                <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
229
                            [% ELSE %]
230
                                <span title="9999-99-99"></span>
231
                            [% END %]
232
                        </td>
233
                        <td class="actions">
234
                            <a class="btn btn-mini" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]"><i class="fa fa-eye"></i> View</a>
229
235
230
                        [% IF not basket.closedate and supplier.active %]
236
                            [% IF not basket.closedate and supplier.active %]
231
                            <a class="btn btn-mini" id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
237
                                <a class="btn btn-mini" id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a>
232
                            <!-- Modal -->
238
                                <!-- Modal -->
233
                            <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
239
                                <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true" data-basketno="[% basket.basketname %]">
234
                                <div class="modal-body">
240
                                    <div class="modal-body">
235
                                    [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
241
                                        [% INCLUDE 'acquisitions-add-to-basket.inc' booksellerid=supplier.booksellerid basketno=basket.basketno %]
236
                                </div>
242
                                    </div>
237
                                <div class="modal-footer">
243
                                    <div class="modal-footer">
238
                                    <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
244
                                        <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
245
                                    </div>
239
                                </div>
246
                                </div>
240
                            </div>
247
                            [% END %]
248
                        </td>
249
                    </tr>
250
                [% END %][%# FOREACH basket IN supplier.loop_basket %]
251
                [% END %]
252
            </tbody>
253
        </table>
254
        </div>
255
    [% ELSE %]
256
        <div id="acqui_order_supplierlist">
257
            [% FOREACH supplier IN loop_suppliers %]
258
                <div class="supplier">
259
                    <span class="suppliername">
260
                        [% IF (supplier.name) %]
261
                            <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">[% supplier.name %]</a>
262
                        [% ELSE %]
263
                            <a name="[% supplier.booksellerid %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid %]">NO NAME</a>
241
                        [% END %]
264
                        [% END %]
242
                    </td>
265
                    </span>
243
                </tr>
266
                    <span class="action">
244
            [% END %][%# FOREACH basket IN supplier.loop_basket %]
267
                        [% IF ( CAN_user_acquisition_order_manage ) %]
245
        [% END %]
268
                            [% IF ( supplier.active ) %]
246
        </tbody>
269
                                <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
247
    </table>
270
                            [% ELSE %]
271
                                (inactive)
272
                            [% END %]
273
                        [% END %]
274
                        <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
275
                    </span>
276
                </div>
277
            [% END %]
278
        </div>
279
    [% END %]
248
[% ELSE %]
280
[% ELSE %]
249
    <p>No pending baskets</p>
281
    <p>No pending baskets</p>
250
[% END %][%# IF ( loop_suppliers.size ) %]
282
[% END %][%# IF ( loop_suppliers.size ) %]
251
</div>
283
</div>
252
</div>
284
</div>
253
</div>
254
<div class="yui-b">
285
<div class="yui-b">
255
[% IF ( booksellerid ) %]
286
[% IF ( booksellerid ) %]
256
[% INCLUDE 'vendor-menu.inc' %]
287
[% INCLUDE 'vendor-menu.inc' %]
257
- 

Return to bug 13371