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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-45 / +44 lines)
Lines 115-122 Link Here
115
                                                </form>
115
                                                </form>
116
                                            </div>
116
                                            </div>
117
                                        [% END %]
117
                                        [% END %]
118
                                    </div>
118
                                    </div> <!-- /#toolbar -->
119
                                [% END %]
119
                                [% END # / UNLESS ( delete_confirmed ) %]
120
120
121
                                <!-- Modal for confirm deletion box-->
121
                                <!-- Modal for confirm deletion box-->
122
                                <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
122
                                <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true">
Lines 165-177 Link Here
165
                                                        <input type="hidden" name="delbiblio" value="1" />
165
                                                        <input type="hidden" name="delbiblio" value="1" />
166
                                                        <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button>
166
                                                        <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button>
167
                                                    </form>
167
                                                    </form>
168
                                                </div>
168
                                                </div> <!-- /.modal-footer -->
169
                                            [% END %]
169
                                            [% END # /UNLESS book_foot_loop %]
170
                                        </div>
170
                                        </div> <!-- /.modal-content -->
171
                                    </div>
171
                                    </div> <!-- /.modal-dialog -->
172
                                </div>
172
                                </div> <!-- /.modal#deleteBasketModal -->
173
                                <!-- End of Modal-->
173
                                <!-- End of Modal-->
174
                            [% ELSE %]
174
                            [% ELSE # UNLESS ( closedate ) %]
175
                                <div id="toolbar" class="btn-toolbar">
175
                                <div id="toolbar" class="btn-toolbar">
176
                                    [% IF grouped %]
176
                                    [% IF grouped %]
177
                                        <div title="Can not reopen baskets that are part of a basket group." class="btn-group">
177
                                        <div title="Can not reopen baskets that are part of a basket group." class="btn-group">
Lines 183-190 Link Here
183
                                        [% PROCESS csv_export %]
183
                                        [% PROCESS csv_export %]
184
                                    [% END %]
184
                                    [% END %]
185
                                </div>
185
                                </div>
186
                            [% END %]
186
                            [% END # /UNLESS ( closedate ) %]
187
                        [% END %]
187
                        [% END # /UNLESS ( selectbasketg ) %]
188
188
189
                        [% IF ( NO_BOOKSELLER ) %]
189
                        [% IF ( NO_BOOKSELLER ) %]
190
                            <h1>Vendor not found</h1>
190
                            <h1>Vendor not found</h1>
Lines 214-221 Link Here
214
                                    <a href="booksellers.pl">Go back to vendor page</a>
214
                                    <a href="booksellers.pl">Go back to vendor page</a>
215
                                [% ELSE %]
215
                                [% ELSE %]
216
                                    <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
216
                                    <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
217
                                [% END %]
217
                                [% END # /IF (cannotdelbiblios) %]
218
                            [% ELSE %]
218
                            [% ELSE # IF ( delete_confirmed ) %]
219
219
220
                                [% FOR m IN messages %]
220
                                [% FOR m IN messages %]
221
                                    <div class="dialog [% m.type | html %]">
221
                                    <div class="dialog [% m.type | html %]">
Lines 232-238 Link Here
232
                                            <span>ERROR! - [% m.code | html %]</span>
232
                                            <span>ERROR! - [% m.code | html %]</span>
233
                                        [% END %]
233
                                        [% END %]
234
                                    </div>
234
                                    </div>
235
                                [% END %]
235
                                [% END # /FOR m %]
236
236
237
                                <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
237
                                <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
238
238
Lines 283-289 Link Here
283
                                                            <input type="hidden" id="op" name="op" value="mod_users" />
283
                                                            <input type="hidden" id="op" name="op" value="mod_users" />
284
                                                        </form>
284
                                                        </form>
285
285
286
                                                    </li>
286
                                                    </li> <!-- /#managedby -->
287
                                                    <li id="branch">
287
                                                    <li id="branch">
288
                                                        <span class="label">Managing library:</span>
288
                                                        <span class="label">Managing library:</span>
289
                                                        [% IF basketbranchcode %]
289
                                                        [% IF basketbranchcode %]
Lines 293-299 Link Here
293
                                                            No library
293
                                                            No library
294
                                                            <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Set library</a>
294
                                                            <a href="#" id="set_managing_library"><i class="fa fa-pencil"></i> Set library</a>
295
                                                        [% END %]
295
                                                        [% END %]
296
                                                    </li>
296
                                                    </li> <!-- /#branch -->
297
                                                    [% IF branches_loop.size %]
297
                                                    [% IF branches_loop.size %]
298
                                                        <li id="managing_library_entry" style="display:none;">
298
                                                        <li id="managing_library_entry" style="display:none;">
299
                                                            <span class="label">&nbsp;</span>
299
                                                            <span class="label">&nbsp;</span>
Lines 314-321 Link Here
314
                                                                    <input type="hidden" id="op" name="op" value="mod_branch" />
314
                                                                    <input type="hidden" id="op" name="op" value="mod_branch" />
315
                                                                </form>
315
                                                                </form>
316
                                                            </div>
316
                                                            </div>
317
                                                        </li>
317
                                                        </li> <!-- #/managing_library_entry -->
318
                                                    [% END %]
318
                                                    [% END # /IF branches_loop.size %]
319
319
320
                                                    [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
320
                                                    [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
321
321
Lines 436-442 Link Here
436
                                            </div> <!-- /.rows -->
436
                                            </div> <!-- /.rows -->
437
                                        </div> <!-- /.col-sm-6 -->
437
                                        </div> <!-- /.col-sm-6 -->
438
                                    </div> <!-- /#acqui_basket_summary.row -->
438
                                    </div> <!-- /#acqui_basket_summary.row -->
439
                                [% END %]
439
                                [% END # /IF ( basketno ) %]
440
440
441
                                [% IF ( duplinbatch ) %]
441
                                [% IF ( duplinbatch ) %]
442
                                    <div class="dialog alert">
442
                                    <div class="dialog alert">
Lines 688-695 Link Here
688
                                                    </tr>
688
                                                    </tr>
689
                                                [% END %]
689
                                                [% END %]
690
                                            </tbody>
690
                                            </tbody>
691
                                        </table>
691
                                        </table> <!-- /#orders -->
692
                                    [% END %]
692
                                    [% END # / IF ( books_loop ) %]
693
                                    [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
693
                                    [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %]
694
                                </div> <!-- /#acqui_basket_content -->
694
                                </div> <!-- /#acqui_basket_content -->
695
695
Lines 774-784 Link Here
774
                                                        <td class="number">[% order.tax_value | $Price %]</td>
774
                                                        <td class="number">[% order.tax_value | $Price %]</td>
775
                                                        <td>[% order.budget_name | html %]
775
                                                        <td>[% order.budget_name | html %]
776
                                                    </tr>
776
                                                    </tr>
777
                                                [% END %]
777
                                                [% END # /FOREACH order %]
778
                                            </tbody>
778
                                            </tbody>
779
                                        </table>
779
                                        </table> <!-- /#cancelledorderst -->
780
                                    </div> <!-- /#cancelledorders -->
780
                                    </div> <!-- /#cancelledorders -->
781
                                [% END %]
781
                                [% END # /IF (cancelledorders_loop) %]
782
                                <br />
782
                                <br />
783
783
784
                                [% UNLESS ( closedate ) %]
784
                                [% UNLESS ( closedate ) %]
Lines 800-813 Link Here
800
                                                </div>
800
                                                </div>
801
                                            </div><!-- /.modal-content -->
801
                                            </div><!-- /.modal-content -->
802
                                        </div><!-- /.modal-dialog -->
802
                                        </div><!-- /.modal-dialog -->
803
                                    </div><!-- /.modal -->
803
                                    </div><!-- /.modal#addtoBasket -->
804
                                [% END %]
804
                                [% END # /UNLESS ( closedate ) %]
805
805
806
                            [% END %]
806
                            [% END # /IF ( delete_confirmed ) %]
807
                        [% END %]
807
                        [% END # /IF ( NO_BOOKSELLER ) %]
808
                    [% ELSE %]
808
                    [% ELSE %]
809
                        <!-- if we want just to select a basketgroup for a closed basket -->
809
                        <!-- if we want just to select a basketgroup for a closed basket -->
810
                    [% END %]
810
                    [% END #/IF !confirm_close && !edi_confirm  %]
811
811
812
                    [% IF ( confirm_close ) %]
812
                    [% IF ( confirm_close ) %]
813
                        <div id="closebasket_needsconfirmation" class="dialog alert">
813
                        <div id="closebasket_needsconfirmation" class="dialog alert">
Lines 816-823 Link Here
816
                                <h1>Are you sure you want to close basket [% basketname | html %]?</h1>
816
                                <h1>Are you sure you want to close basket [% basketname | html %]?</h1>
817
                                [% IF ( CAN_user_acquisition_group_manage ) %]
817
                                [% IF ( CAN_user_acquisition_group_manage ) %]
818
                                    <p>
818
                                    <p>
819
                                    <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
819
                                        <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
820
                                    <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
820
                                        <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/>
821
                                    </p>
821
                                    </p>
822
                                [% END %]
822
                                [% END %]
823
                                <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
823
                                <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
Lines 832-838 Link Here
832
                                <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
832
                                <button type="submit" class="deny" accesskey="n"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
833
                            </form>
833
                            </form>
834
                        </div>
834
                        </div>
835
                    [% END %]
835
                    [% END # /IF ( confirm_close ) %]
836
836
837
                    [% IF edi_confirm %]
837
                    [% IF edi_confirm %]
838
                        <div id="closebasket_needsconfirmation" class="dialog alert">
838
                        <div id="closebasket_needsconfirmation" class="dialog alert">
Lines 856-864 Link Here
856
                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
856
                                <input type="hidden" name="basketno" value="[% basketno | html %]" />
857
                                <button type="submit" class="deny" accesskey="N"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
857
                                <button type="submit" class="deny" accesskey="N"><i class="fa fa-fw fa-remove"></i> No, don't close (N)</button>
858
                            </form>
858
                            </form>
859
                        </div>
859
                        </div> <!-- /#closebasket_needsconfirmation -->
860
                    [% END %]
860
                    [% END # /IF edi_confirm %]
861
                [% END %][%# IF (cannot_manage_basket) %]
861
                [% END # /IF (cannot_manage_basket) %]
862
            </main>
862
            </main>
863
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
863
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
864
864
Lines 890-899 Link Here
890
                        <button type="submit" class="btn btn-default">Save</button>
890
                        <button type="submit" class="btn btn-default">Save</button>
891
                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
891
                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
892
                    </div>
892
                    </div>
893
                </div>
893
                </div> <!-- /.modal-content -->
894
            </form>
894
            </form> <!-- /#modify_order_notes -->
895
        </div>
895
        </div> <!-- /.modal-dialog -->
896
    </div>
896
    </div> <!-- /.modal#noteEditor -->
897
897
898
    <!-- Modal for editing estimated delivery date -->
898
    <!-- Modal for editing estimated delivery date -->
899
    <div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
899
    <div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel">
Lines 914-923 Link Here
914
                        <button type="submit" class="btn btn-default">Save</button>
914
                        <button type="submit" class="btn btn-default">Save</button>
915
                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
915
                        <button type="button" class="btn btn-link cancel" data-dismiss="modal">Cancel</button>
916
                    </div>
916
                    </div>
917
                </div>
917
                </div> <!-- /.modal-content -->
918
            </form>
918
            </form> <!-- /#modify_estimated_delivery_date -->
919
        </div>
919
        </div> <!-- /.modal-dialog -->
920
    </div>
920
    </div> <!-- /.modal#dateEditor -->
921
921
922
[% MACRO jsinclude BLOCK %]
922
[% MACRO jsinclude BLOCK %]
923
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
923
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
Lines 1064-1071 Link Here
1064
                    }
1064
                    }
1065
                }
1065
                }
1066
            </script>
1066
            </script>
1067
        [% END %]
1067
        [% END # /UNLESS grouped %]
1068
    [% END %]
1068
    [% END # /UNLESS (closedate) %]
1069
    <script>
1069
    <script>
1070
        $(document).ready(function() {
1070
        $(document).ready(function() {
1071
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1071
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1072
- 

Return to bug 31932