Bugzilla – Attachment 179962 Details for
Bug 31632
Add ability to manually link orders to suggestions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31632: (QA follow-up) Tidy after rebase
Bug-31632-QA-follow-up-Tidy-after-rebase.patch (text/plain), 125.69 KB, created by
Nick Clemens (kidclamp)
on 2025-03-31 09:49:38 UTC
(
hide
)
Description:
Bug 31632: (QA follow-up) Tidy after rebase
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2025-03-31 09:49:38 UTC
Size:
125.69 KB
patch
obsolete
>From f7bea2845970ae033bbf27aaf2705c48c78b896c Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 31 Mar 2025 09:48:26 +0000 >Subject: [PATCH] Bug 31632: (QA follow-up) Tidy after rebase > >--- > .../prog/en/modules/acqui/basket.tt | 1222 +++++++++-------- > 1 file changed, 664 insertions(+), 558 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index 4298a586165..d99663722e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -26,14 +26,17 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% FILTER collapse %] >- [% tx("Basket {basketname} ({basketnumber}) for {vendor}", { basketname = basketname, basketnumber = basketno, vendor = booksellername }) | html %] › >- [% t("Acquisitions") | html %] › >- [% t("Koha") | html %] >-[% END %]</title> >+<title >+ >[% FILTER collapse %] >+ [% tx("Basket {basketname} ({basketnumber}) for {vendor}", { basketname = basketname, basketnumber = basketno, vendor = booksellername }) | html %] >+ › [% t("Acquisitions") | html %] › [% t("Koha") | html %] >+ [% END %]</title >+> > [% INCLUDE 'doc-head-close.inc' %] > <style> >- .sortmsg {font-size: 80%;} >+ .sortmsg { >+ font-size: 80%; >+ } > </style> > </head> > >@@ -83,26 +86,39 @@ > [% UNLESS ( delete_confirmed ) %] > <div id="toolbar" class="btn-toolbar sticky fh-fixedHeader"> > [% IF active %] >- <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> >+ <div class="btn-group" >+ ><a href="#addtoBasket" role="button" class="btn btn-default" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div >+ > > [% END %] >- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default" id="basketheadbutton"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit basket</a></div> >+ <div class="btn-group" >+ ><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default" id="basketheadbutton" >+ ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit basket</a >+ ></div >+ > > [% IF CAN_user_acquisition_delete_baskets %] >- <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default" data-bs-toggle="modal" id="delbasketbutton"><i class="fa fa-trash-can"></i> Delete basket</a></div> >+ <div class="btn-group" >+ ><a href="#deleteBasketModal" role="button" class="btn btn-default" data-bs-toggle="modal" id="delbasketbutton"><i class="fa fa-trash-can"></i> Delete basket</a></div >+ > > [% END %] > [% IF ( unclosable ) %] >+ > [% ELSIF ( uncertainprices ) %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default" id="uncertpricesbutton"><i class="fa-solid fa-dollar-sign"></i> Uncertain prices</a></div> >+ <div class="btn-group" >+ ><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default" id="uncertpricesbutton" >+ ><i class="fa-solid fa-dollar-sign"></i> Uncertain prices</a >+ ></div >+ > > <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group"> > <a href="" class="btn btn-default disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close basket</a> > </div> > [% ELSE %] > <div class="btn-group"> > <form method="post" action="/cgi-bin/koha/acqui/basket.pl"> >- [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="op" value="cud-close"> >- <input type="hidden" name="bookseller" value="[% booksellerid | html %]"> >- <button type="submit" class="btn btn-default" id="close button"><i class="fa fa-times-circle"></i> Close basket</button> >- <input type="hidden" name="basketno" value="[% basketno | html %]"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="op" value="cud-close" /> >+ <input type="hidden" name="bookseller" value="[% booksellerid | html %]" /> >+ <button type="submit" class="btn btn-default" id="close button"><i class="fa fa-times-circle"></i> Close basket</button> >+ <input type="hidden" name="basketno" value="[% basketno | html %]" /> > </form> > </div> > [% END %] >@@ -111,24 +127,42 @@ > > [% IF Koha.Preference('EDIFACT') && ediaccount %] > [% UNLESS eans.size %] >- <div class="btn-group" title="You must define an EAN in Administration -> Library EANs"> >- <button class="btn btn-default btn-xs disabled" disabled="disabled" href="#"><i class="fa fa-download"></i> Create EDIFACT order</button> >- </div> >+ <div class="btn-group" title="You must define an EAN in Administration -> Library EANs"> >+ <button class="btn btn-default btn-xs disabled" disabled="disabled" href="#"><i class="fa fa-download"></i> Create EDIFACT order</button> >+ </div> > [% ELSE %] >- <div class="btn-group"> >- [% IF eans.size == 1 %] >- <a class="btn btn-default btn-xs submit-form-link" href="#" data-ean="[% eans.0 | html %]" data-basketno="[% basketno | html %]" data-action="basket.pl" data-method="post" data-op="cud-ediorder"><i class="fa fa-download"></i> Create EDIFACT order</a> >- [% ELSE %] >- <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</button> >- <ul class="dropdown-menu"> >- [% FOREACH eanacct IN eans %] >- <li> >- <a class="btn btn-default btn-xs submit-form-link" href="#" data-ean="[% eanacct.ean | html %]" data-basketno="[% basketno | html %]" data-action="basket.pl" data-method="post" data-op="cud-ediorder">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct .description %][[% eanacct.description | html %]][% END %]</a> >- </li> >- [% END %] >- </ul> >- [% END %] >- </div> >+ <div class="btn-group"> >+ [% IF eans.size == 1 %] >+ <a >+ class="btn btn-default btn-xs submit-form-link" >+ href="#" >+ data-ean="[% eans.0 | html %]" >+ data-basketno="[% basketno | html %]" >+ data-action="basket.pl" >+ data-method="post" >+ data-op="cud-ediorder" >+ ><i class="fa fa-download"></i> Create EDIFACT order</a >+ > >+ [% ELSE %] >+ <button class="btn btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</button> >+ <ul class="dropdown-menu"> >+ [% FOREACH eanacct IN eans %] >+ <li> >+ <a >+ class="btn btn-default btn-xs submit-form-link" >+ href="#" >+ data-ean="[% eanacct.ean | html %]" >+ data-basketno="[% basketno | html %]" >+ data-action="basket.pl" >+ data-method="post" >+ data-op="cud-ediorder" >+ >[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct .description %][[% eanacct.description | html %]][% END %]</a >+ > >+ </li> >+ [% END %] >+ </ul> >+ [% END %] >+ </div> > [% END %] > [% END %] > >@@ -142,7 +176,8 @@ > </form> > </div> > [% END %] >- </div> <!-- /#toolbar --> >+ </div> >+ <!-- /#toolbar --> > [% END # / UNLESS ( delete_confirmed ) %] > > <!-- Modal for confirm deletion box--> >@@ -195,24 +230,30 @@ > <button type="submit" class="btn btn-default btn-default">Delete basket, orders, and records</button> > </form> > <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button> >- </div> <!-- /.modal-footer --> >+ </div> >+ <!-- /.modal-footer --> > [% END # /UNLESS book_foot_loop %] >- </div> <!-- /.modal-content --> >- </div> <!-- /.modal-dialog --> >- </div> <!-- /.modal#deleteBasketModal --> >+ </div> >+ <!-- /.modal-content --> >+ </div> >+ <!-- /.modal-dialog --> >+ </div> >+ <!-- /.modal#deleteBasketModal --> > <!-- End of Modal--> > [% ELSE # UNLESS ( closedate ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF grouped %] > <div title="Can not reopen baskets that are part of a basket group." class="btn-group"> >- <div class="btn-group"><a href="#" class="btn btn-default disabled" id="reopenbutton"><i class="fa-solid fa-rotate"></i> Reopen basket</a></div> >+ <div class="btn-group" >+ ><a href="#" class="btn btn-default disabled" id="reopenbutton"><i class="fa-solid fa-rotate"></i> Reopen basket</a></div >+ > > </div> > [% ELSE %] > <div class="btn-group"> > <form action="basket.pl" method="post" id="reopenform"> > [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="op" value="cud-reopen"> >- <input type="hidden" name="basketno" value="[% basketno | html %]"> >+ <input type="hidden" name="op" value="cud-reopen" /> >+ <input type="hidden" name="basketno" value="[% basketno | html %]" /> > <button type="submit" class="btn btn-default"><i class="fa-solid fa-rotate"></i> Reopen basket</button> > </form> > </div> >@@ -250,7 +291,8 @@ > </div> > <a href="booksellers.pl">Go back to vendor page</a> > [% ELSE %] >- <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> >+ <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> > [% END # /IF (cannotdelbiblios) %] > [% ELSE # IF ( delete_confirmed ) %] > >@@ -271,227 +313,248 @@ > </div> > [% END # /FOR m %] > >- <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> >+ <h1>[% UNLESS ( basketno ) %]New[% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > > [% IF ( basketno ) %] > <div id="acqui_basket_summary" class="row"> >- <div class="col-md-6 col-sm-12"> >- <div class="page-section rows"> >- <h2>General information</h2> >- <ol> >- [% IF ( basketnote ) %] >- <li><span class="label">Internal note:</span> [% basketnote | html %]</li> >- [% END %] >- [% IF ( basketbooksellernote ) %] >- <li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li> >- [% END %] >- [% IF ( basketcontractno ) %] >- <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | uri %]&booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li> >- [% END %] >- [% IF deliveryplace %] >- <li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li> >- [% END %] >- [% IF billingplace %] >- <li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li> >- [% END %] >- [% IF ( authorisedbyname ) %] >- <li><span class="label">[% tp('basket created by', 'Created by:') | html %]</span> [% authorisedbyname | html %]</li> >- [% END %] >+ <div class="col-md-6 col-sm-12"> >+ <div class="page-section rows"> >+ <h2>General information</h2> >+ <ol> >+ [% IF ( basketnote ) %] >+ <li><span class="label">Internal note:</span> [% basketnote | html %]</li> >+ [% END %] >+ [% IF ( basketbooksellernote ) %] >+ <li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li> >+ [% END %] >+ [% IF ( basketcontractno ) %] >+ <li >+ ><span class="label">Contract name:</span> >+ <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | uri %]&booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li >+ > >+ [% END %] >+ [% IF deliveryplace %] >+ <li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li> >+ [% END %] >+ [% IF billingplace %] >+ <li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li> >+ [% END %] >+ [% IF ( authorisedbyname ) %] >+ <li><span class="label">[% tp('basket created by', 'Created by:') | html %]</span> [% authorisedbyname | html %]</li> >+ [% END %] > >- [% IF ( creationdate ) %] >- <li><span class="label">Opened on:</span> [% creationdate | $KohaDates %]</li> >- [% END %] >- [% IF ( closedate ) %] >- <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li> >- [% END %] >+ [% IF ( creationdate ) %] >+ <li><span class="label">Opened on:</span> [% creationdate | $KohaDates %]</li> >+ [% END %] >+ [% IF ( closedate ) %] >+ <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li> >+ [% END %] > >- [% IF ( ediaccount ) %] >- [%- BLOCK edi_status -%] >- [%- SWITCH edi_order.status -%] >- [%- CASE 'pending' -%]<span>Pending</span> >- [%- CASE 'sent' -%]<span>Sent</span> >- [%- CASE 'processed' -%]<span>Processed</span> >- [%- END -%] >+ [% IF ( ediaccount ) %] >+ [%- BLOCK edi_status -%] >+ [%- SWITCH edi_order.status -%] >+ >+ [%- CASE 'pending' -%] >+ <span>Pending</span> >+ [%- CASE 'sent' -%] >+ <span>Sent</span> >+ [%- CASE 'processed' -%] >+ <span>Processed</span> > [%- END -%] >- [% IF ( edi_order ) %] >- <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li> >- [% ELSE %] >- <li><span class="label">EDI status:</span> Not ordered</li> >- [% END %] >+ [%- END -%] >+ [% IF ( edi_order ) %] >+ <li><span class="label">EDI status:</span> [%- PROCESS edi_status edi_order=edi_order -%] ([% edi_order.transfer_date | $KohaDates %])</li> >+ [% ELSE %] >+ <li><span class="label">EDI status:</span> Not ordered</li> > [% END %] >- [% IF ( estimateddeliverydate ) %] >- <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li> >- [% END %] >- <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li> >+ [% END %] >+ [% IF ( estimateddeliverydate ) %] >+ <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li> >+ [% END %] >+ <li><span class="label">Orders are standing:</span> [% IF is_standing %]Yes[% ELSE %]No[% END %]</li> > >- [% IF basket.create_items %] >- <li> >- <span class="label">Create items when:</span> >- [% SWITCH basket.create_items %] >- [% CASE 'receiving' %]<span>Receiving items</span> >- [% CASE 'cataloguing' %]<span>Cataloguing items</span> >- [% CASE %]<span>Placing orders</span> >- [% END %] >- </li> >- [% END %] >+ [% IF basket.create_items %] >+ <li> >+ <span class="label">Create items when:</span> >+ [% SWITCH basket.create_items %] >+ [% CASE 'receiving' %] >+ <span>Receiving items</span> >+ [% CASE 'cataloguing' %] >+ <span>Cataloguing items</span> >+ [% CASE %] >+ <span>Placing orders</span> >+ [% END %] >+ </li> >+ [% END %] > >- [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >+ [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %] >+ </ol> >+ </div> >+ <!-- /.page-section --> >+ </div> >+ <!-- /.col-sm-6 --> > >- </ol> >- </div> <!-- /.page-section --> >- </div> <!-- /.col-sm-6 --> >+ <div class="col-md-6 col-sm-12"> >+ <div class="page-section rows"> >+ <h2>Settings</h2> > >- <div class="col-md-6 col-sm-12"> >- <div class="page-section rows"> >- <h2>Settings</h2> >+ <ol> >+ <li id="managedby"> >+ <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <span class="label">[% tp('Acquisitions basket managed by user', 'Managed by:') | html %]</span> >+ <div style="display:inline-block"> >+ <ul id="users_names" style="padding-left:0"> >+ [% FOREACH user IN users %] >+ <li id="user_[% user.borrowernumber | html %]"> >+ [% user.firstname | html %] [% user.surname | html %] >+ <a href="#" data-borrowernumber="[% user.borrowernumber | html %]" class="del_user"><i class="fa fa-trash-can"></i> Delete user</a> >+ </li> >+ [% END %] >+ <li> >+ <a href="#patron_search_modal" id="add_user" class="btn btn-default" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add user</a> >+ </li> >+ <li id="add_user_submit" style="display:none;"> >+ <button type="submit" class="btn btn-default btn-xs">Save changes</button> >+ </li> >+ </ul> >+ </div> >+ <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" /> >+ <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" /> >+ <input type="hidden" id="op" name="op" value="cud-mod_users" /> >+ </form> >+ </li> >+ <!-- /#managedby --> >+ <li id="branch"> >+ <span class="label">Managing library:</span> >+ [% IF basketbranchcode %] >+ [% Branches.GetName( basketbranchcode ) | html %] >+ <a href="#" id="set_managing_library"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Change library</a> >+ [% ELSE %] >+ No library >+ <a href="#" id="set_managing_library"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Set library</a> >+ [% END %] >+ </li> >+ <!-- /#branch --> >+ [% IF branches_loop.size %] >+ <li id="managing_library_entry" style="display:none;"> >+ <span class="label"> </span> >+ <div> >+ <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <select id="select_managing_library" name="branch"> >+ <option value="">(no library)</option> >+ [% FOREACH branch IN branches_loop %] >+ [% IF ( basketbranchcode == branch.branchcode ) %] >+ <option selected="selected" value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option> >+ [% ELSE %] >+ <option value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ <a id="library_entry_cancel" href="#" class="cancel">Cancel</a> >+ <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" /> >+ <input type="hidden" id="op" name="op" value="cud-mod_branch" /> >+ </form> >+ </div> >+ </li> >+ <!-- #/managing_library_entry --> >+ [% END # /IF branches_loop.size %] >+ </ol> > >+ [% IF ( closedate ) %] > <ol> >- <li id="managedby"> >- <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> >- [% INCLUDE 'csrf-token.inc' %] >- <span class="label">[% tp('Acquisitions basket managed by user', 'Managed by:') | html %]</span> >- <div style="display:inline-block"> >- <ul id="users_names" style="padding-left:0"> >- [% FOREACH user IN users %] >- <li id="user_[% user.borrowernumber | html %]"> >- [% user.firstname | html %] [% user.surname | html %] >- <a href="#" data-borrowernumber="[% user.borrowernumber | html %]" class="del_user"><i class="fa fa-trash-can"></i> Delete user</a> >- </li> >- [% END %] >- <li> >- <a href="#patron_search_modal" id="add_user" class="btn btn-default" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add user</a> >- </li> >- <li id="add_user_submit" style="display:none;"> >- <button type="submit" class="btn btn-default btn-xs">Save changes</button> >- </li> >- </ul> >- </div> >- <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" /> >- <input type="hidden" id="users_ids" name="users_ids" value="[% users_ids | html %]" /> >- <input type="hidden" id="op" name="op" value="cud-mod_users" /> >- </form> >+ <li> >+ <span class="label">Basket group:</span> >+ [% IF basketgroup.id and not basketgroup.name %] >+ [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] >+ [% END %] > >- </li> <!-- /#managedby --> >- <li id="branch"> >- <span class="label">Managing library:</span> >- [% IF basketbranchcode %] >- [% Branches.GetName( basketbranchcode ) | html %] >- <a href="#" id="set_managing_library"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Change library</a> >+ [% IF basketgroup.closed %] >+ [% IF ( CAN_user_acquisition_group_manage ) %] >+ <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup" >+ >[% basketgroup.name | html %] <span>(closed)</span></a >+ > >+ [% ELSE %] >+ [% basketgroup.name | html %] <span>(closed)</span> >+ [% END %] >+ [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] >+ [%- IF basketgroup.id -%] >+ [% basketgroup.name | html %] >+ [%- ELSE -%] >+ <span>No group</span> >+ [%- END -%] > [% ELSE %] >- No library >- <a href="#" id="set_managing_library"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Set library</a> >+ [% IF ( CAN_user_acquisition_group_manage ) %] >+ [% IF ( basketgroup.id ) %] >+ <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]"> >+ [% basketgroup.name | html %] >+ </a> >+ <a href="#" id="set_basket_group"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Change basket group</a> >+ [% ELSE %] >+ No group >+ <a href="#" id="set_basket_group"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Set basket group</a> >+ [% END %] >+ [% END %] > [% END %] >- </li> <!-- /#branch --> >- [% IF branches_loop.size %] >- <li id="managing_library_entry" style="display:none;"> >+ </li> >+ [% IF ( CAN_user_acquisition_group_manage ) %] >+ <li id="basket_grouping" style="display:none;"> > <span class="label"> </span> >- <div> >- <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> >+ <div style="float:left"> >+ <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post"> > [% INCLUDE 'csrf-token.inc' %] >- <select id="select_managing_library" name="branch"> >- <option value="">(no library)</option> >- [% FOREACH branch IN branches_loop %] >- [% IF ( basketbranchcode == branch.branchcode ) %] >- <option selected="selected" value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option> >+ <select id="basketgroupid" name="basketgroupid"> >+ <option value="">No group</option> >+ [% FOREACH bg IN basketgroups %] >+ [% IF ( bg.default ) %] >+ <option value="[% bg.id | html %]" selected="selected">[% bg.name | html %]</option> > [% ELSE %] >- <option value="[% branch.branchcode | html %]"> [% branch.branchname | html %]</option> >+ [% UNLESS bg.closed %] >+ <option value="[% bg.id | html %]">[% bg.name | html %]</option> >+ [% ELSE %] >+ <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] <span>(closed)</span></option> >+ [% END %] > [% END %] > [% END %] >+ <option value="new">Add new group</option> > </select> >- <a id="library_entry_cancel" href="#" class="cancel">Cancel</a> >- <input type="hidden" id="basketno" name="basketno" value="[% basketno | html %]" /> >- <input type="hidden" id="op" name="op" value="cud-mod_branch" /> >+ <a href="#" id="basket_group_cancel" class="cancel">Cancel</a> >+ <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" /> >+ <input type="hidden" value="cud-mod_basket" name="op" /> >+ <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > </form> > </div> >- </li> <!-- #/managing_library_entry --> >- [% END # /IF branches_loop.size %] >- >- </ol> >- >- [% IF ( closedate ) %] >- <ol> >- <li> >- <span class="label">Basket group:</span> >- [% IF basketgroup.id and not basketgroup.name %] >- [% SET basketgroup.name = "Basket group no. " _ basketgroup.id %] >- [% END %] >- >- [% IF basketgroup.closed %] >- [% IF ( CAN_user_acquisition_group_manage ) %] >- <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] <span>(closed)</span></a> >- [% ELSE %] >- [% basketgroup.name | html %] <span>(closed)</span> >- [% END %] >- [% ELSIF ( ! CAN_user_acquisition_group_manage ) %] >- [%- IF basketgroup.id -%] >- [% basketgroup.name | html %] >- [%- ELSE -%] >- <span>No group</span> >- [%- END -%] >- [% ELSE %] >- [% IF ( CAN_user_acquisition_group_manage ) %] >- [% IF ( basketgroup.id ) %] >- <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]"> >- [% basketgroup.name | html %] >- </a> >- <a href="#" id="set_basket_group"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Change basket group</a> >- [% ELSE %] >- No group >- <a href="#" id="set_basket_group"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Set basket group</a> >- [% END %] >- [% END %] >- [% END %] > </li> >- [% IF ( CAN_user_acquisition_group_manage ) %] >- <li id="basket_grouping" style="display:none;"> >- <span class="label"> </span> >- <div style="float:left"> >- <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="post"> >- [% INCLUDE 'csrf-token.inc' %] >- <select id="basketgroupid" name="basketgroupid"> >- <option value="">No group</option> >- [% FOREACH bg IN basketgroups %] >- [% IF ( bg.default ) %] >- <option value="[% bg.id | html %]" selected="selected">[% bg.name | html %]</option> >- [% ELSE %] >- [% UNLESS bg.closed %] >- <option value="[% bg.id | html %]">[% bg.name | html %]</option> >- [% ELSE %] >- <option value="[% bg.id | html %]" disabled="disabled">[% bg.name | html %] <span>(closed)</span></option> >- [% END %] >- [% END %] >- [% END %] >- <option value="new">Add new group</option> >- </select> >- <a href="#" id="basket_group_cancel" class="cancel">Cancel</a> >- <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" /> >- <input type="hidden" value="cud-mod_basket" name="op" /> >- <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> >- </form> >- </div> >- </li> >- [% END # /IF ( CAN_user_acquisition_group_manage ) %] >- [% IF basketgroup.deliveryplace %] >- <li> >- <span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) | html %] >- </li> >- [% END %] >- [% IF basketgroup.billingplace %] >- <li> >- <span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) | html %] >- </li> >- [% END %] >- </ol> >- [% END # /IF closeddate %] >- </div> <!-- /.page-section --> >- </div> <!-- /.rows --> >- </div> <!-- /#acqui_basket_summary.row --> >+ [% END # /IF ( CAN_user_acquisition_group_manage ) %] >+ [% IF basketgroup.deliveryplace %] >+ <li> <span class="label">Basket group delivery placename:</span> [% Branches.GetName( basketgroup.deliveryplace ) | html %] </li> >+ [% END %] >+ [% IF basketgroup.billingplace %] >+ <li> <span class="label">Basket group billing place:</span> [% Branches.GetName( basketgroup.billingplace ) | html %] </li> >+ [% END %] >+ </ol> >+ [% END # /IF closeddate %] >+ </div> >+ <!-- /.page-section --> >+ </div> >+ <!-- /.rows --> >+ </div> >+ <!-- /#acqui_basket_summary.row --> > [% END # /IF ( basketno ) %] > > [% IF ( duplinbatch ) %] > <div class="alert alert-warning"> > <h4>Duplicate warning</h4> >- <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" style="margin-left:10px"><i class="fa-solid fa-window-restore"></i> Display them</a></p> >+ <p >+ >Some records have not been automatically added because they match an existing record in your catalog:<a >+ href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" >+ title="Open in new window" >+ target="_blank" >+ style="margin-left:10px" >+ ><i class="fa-solid fa-window-restore"></i> Display them</a >+ ></p >+ > > </div> > [% END %] > >@@ -525,7 +588,7 @@ > [% END %] > <th class="NoSort">Place hold</th> > [% IF ( active && !closedate ) %] >- <th class="NoSort">Modify</th> >+ <th class="NoSort">Modify</th> > [% END %] > [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %] > <th class="NoSort">Cancel order</th> >@@ -599,47 +662,85 @@ > </tr> > </tfoot> > <tbody> >- [% FOREACH books_loo IN books_loop %] >- [% IF ( books_loo.order_received ) %] >- [% SET tr_class = "disabled" %] >- [% END %] >- <tr class="[% tr_class | html %]"> >- <td> >- [% books_loo.ordernumber | html %] >- </td> >+ [% FOREACH books_loo IN books_loop %] >+ [% IF ( books_loo.order_received ) %] >+ [% SET tr_class = "disabled" %] >+ [% END %] >+ <tr class="[% tr_class | html %]"> >+ <td> [% books_loo.ordernumber | html %] </td> > <td> > <p> >- [% IF ( books_loo.order_received ) %] <span class="order-received">(received)</span>[% END %] >+ [% IF ( books_loo.order_received ) %]<span class="order-received">(received)</span>[% END %] > [% IF books_loo.title %] >- [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %] >+ [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] >+ [% IF books_loo.author %]by [% books_loo.author | html %][% END %] > [% ELSIF books_loo.deleted_biblio %] > [% INCLUDE 'biblio-title.inc' biblio=books_loo.deleted_biblio %] >- <br/>(Deleted bibliographic record) >+ <br />(Deleted bibliographic record) > [% ELSE %] > <em>Deleted bibliographic record, can't find title</em><br /> > [%- END %] > <br /> >- [%- IF ( books_loo.isbn ) %] - [% books_loo.isbn | html %][% END -%] >- [%- IF ( books_loo.issn ) %] - [% books_loo.issn | html %][% END -%] >+ [%- IF ( books_loo.isbn ) %]- [% books_loo.isbn | html %][% END -%] >+ [%- IF ( books_loo.issn ) %]- [% books_loo.issn | html %][% END -%] > [%- IF ( books_loo.publishercode ) %], [% books_loo.publishercode | html %][% END -%] >- [%- IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear | html -%] >- [%- ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate | html %][% END -%] >+ [%- IF ( books_loo.publicationyear ) %] >+ , [% books_loo.publicationyear | html -%] >+ [%- ELSIF ( books_loo.copyrightdate ) %] >+ [% books_loo.copyrightdate | html %] >+ [% END -%] > [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%] > [%- IF ( books_loo.suggestionid ) %] >- <br/> >- Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %] >- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&op=show">suggestion #[% books_loo.suggestionid | html %]</a>) >+ <br /> >+ Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %][% END %] (<a >+ href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&op=show" >+ >suggestion #[% books_loo.suggestionid | html %]</a >+ >) > [% END %] > </p> > [% IF ( books_loo.order_internalnote ) %] >- <p class="ordernote"><strong>Internal note: </strong><span id="internal-note-[% books_loo.ordernumber | html %]">[% books_loo.order_internalnote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Edit internal note"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit internal note</a></p> >+ <p class="ordernote" >+ ><strong>Internal note: </strong><span id="internal-note-[% books_loo.ordernumber | html %]">[% books_loo.order_internalnote | html %]</span> >+ <a >+ class="edit_note noExport" >+ data-ordernumber="[% books_loo.ordernumber | html %]" >+ data-note_type="internal" >+ href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" >+ title="Edit internal note" >+ ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit internal note</a >+ ></p >+ > > [% ELSE %] >- <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="internal" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" title="Add internal note"><i class="fa fa-plus"></i> Add internal note</a> >+ <a >+ class="edit_note noExport" >+ data-ordernumber="[% books_loo.ordernumber | html %]" >+ data-note_type="internal" >+ href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=internal" >+ title="Add internal note" >+ ><i class="fa fa-plus"></i> Add internal note</a >+ > > [% END %] > [% IF ( books_loo.order_vendornote ) %] >- <p class="ordernote"><strong>Vendor note: </strong> <span id="vendor-note-[% books_loo.ordernumber | html %]">[% books_loo.order_vendornote | html %]</span> <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Edit vendor note"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor note</a></p> >+ <p class="ordernote" >+ ><strong>Vendor note: </strong> <span id="vendor-note-[% books_loo.ordernumber | html %]">[% books_loo.order_vendornote | html %]</span> >+ <a >+ class="edit_note noExport" >+ data-ordernumber="[% books_loo.ordernumber | html %]" >+ data-note_type="vendor" >+ href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" >+ title="Edit vendor note" >+ ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit vendor note</a >+ ></p >+ > > [% ELSE %] >- <a class="edit_note noExport" data-ordernumber="[% books_loo.ordernumber | html %]" data-note_type="vendor" href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" title="Add vendor note"><i class="fa fa-plus"></i> Add vendor note</a> >+ <a >+ class="edit_note noExport" >+ data-ordernumber="[% books_loo.ordernumber | html %]" >+ data-note_type="vendor" >+ href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% books_loo.ordernumber | html %]&type=vendor" >+ title="Add vendor note" >+ ><i class="fa fa-plus"></i> Add vendor note</a >+ > > [% END %] > [% IF (books_loo.transferred_from) %] > [% basket = books_loo.transferred_from.basket %] >@@ -648,65 +749,45 @@ > <p> > Transferred from basket: > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) >- on <span title="[% timestamp | $KohaDates with_hours = 1 %]"> >- [% timestamp | $KohaDates %] >- </span> >+ (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on >+ <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span> > </p> > [% END %] > [% SET claims = books_loo.order_object.claims %] > [% IF claims.count %] >- <p> >- This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %], [% END %][% END %] >- </p> >+ <p> This order has been claimed [% claims.count | html %] times. On [% FOR c IN claims %][% c.claimed_on | $KohaDates %][% UNLESS loop.last %],[% END %][% END %] </p> > [% END %] > </td> > [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] > [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] > <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]"> >- [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] <span>(Uncertain)</span> [% END %] >- </td> >- <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]"> >- [% books_loo.unitprice_tax_excluded | $Price %] >- </td> >- <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]"> >- [% books_loo.ecost_tax_excluded | $Price %] >- </td> >- <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]"> >- [% books_loo.rrp_tax_included | $Price %] >- </td> >- <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]"> >- [% books_loo.unitprice_tax_included | $Price %] >- </td> >- <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]"> >- [% books_loo.ecost_tax_included | $Price %] >- </td> >- <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]"> >- [% books_loo.replacementprice | $Price %] >- </td> >- <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]"> >- [% books_loo.quantity | html %] >- </td> >- <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]"> >- [% books_loo.total_tax_excluded | $Price %] >- </td> >- <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]"> >- [% books_loo.total_tax_included | $Price %] >- </td> >- <td class="number"> >- [% books_loo.tax_rate * 100 | html %] >- </td> >- <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]"> >- [% books_loo.tax_value | $Price %] >- </td> >- <td> >- [% books_loo.budget_name | html %] >+ [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %]<span>(Uncertain)</span>[% END %] > </td> >+ <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]"> [% books_loo.unitprice_tax_excluded | $Price %] </td> >+ <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]"> [% books_loo.ecost_tax_excluded | $Price %] </td> >+ <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]"> [% books_loo.rrp_tax_included | $Price %] </td> >+ <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]"> [% books_loo.unitprice_tax_included | $Price %] </td> >+ <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]"> [% books_loo.ecost_tax_included | $Price %] </td> >+ <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]"> [% books_loo.replacementprice | $Price %] </td> >+ <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]"> [% books_loo.quantity | html %] </td> >+ <td class="number [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]"> [% books_loo.total_tax_excluded | $Price %] </td> >+ <td class="number [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]"> [% books_loo.total_tax_included | $Price %] </td> >+ <td class="number"> [% books_loo.tax_rate * 100 | html %] </td> >+ <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]"> [% books_loo.tax_value | $Price %] </td> >+ <td> [% books_loo.budget_name | html %] </td> > <td data-order="[% books_loo.estimated_delivery_date | html %]" class="actions"> > [% books_loo.estimated_delivery_date | $KohaDates %] > [% IF CAN_user_acquisition_order_manage %] >- <a class="edit_delivery_date" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" title="Edit delivery date" data-ordernumber="[% books_loo.ordernumber | html %]" id="delivery_date_[% books_loo.ordernumber | html %]" data-delivery_date="[% books_loo.estimated_delivery_date | html %]"> >- <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a> >+ <a >+ class="edit_delivery_date" >+ href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% books_loo.ordernumber | html %]" >+ title="Edit delivery date" >+ data-ordernumber="[% books_loo.ordernumber | html %]" >+ id="delivery_date_[% books_loo.ordernumber | html %]" >+ data-delivery_date="[% books_loo.estimated_delivery_date | html %]" >+ > >+ <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a >+ > > [% END %] > </td> > <td>[% AuthorisedValues.GetByCode( books_loo.sort1_authcat, books_loo.sort1 ) | html %]</td> >@@ -724,9 +805,7 @@ > [% END %] > <td> > [% IF ( books_loo.biblionumber && CAN_user_reserveforothers_place_holds ) %] >- <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% books_loo.biblionumber | uri %]"> >- Place hold >- </a> >+ <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% books_loo.biblionumber | uri %]"> Place hold </a> > [% END %] > </td> > [% IF ( active && !closedate ) %] >@@ -738,7 +817,16 @@ > <br /> > [% END %] > [% UNLESS ( books_loo.suggestionid ) %] >- <a data-action="/cgi-bin/koha/acqui/newordersuggestion.pl" data-booksellerid="[% booksellerid | uri %]" data-basketno="[% basketno | uri %]" data-link_order="[% books_loo.ordernumber | uri %]" data-method="get" class="submit-form-link" href="#">[% tp('verb', 'Link suggestion') | html %]</a> >+ <a >+ data-action="/cgi-bin/koha/acqui/newordersuggestion.pl" >+ data-booksellerid="[% booksellerid | uri %]" >+ data-basketno="[% basketno | uri %]" >+ data-link_order="[% books_loo.ordernumber | uri %]" >+ data-method="get" >+ class="submit-form-link" >+ href="#" >+ >[% tp('verb', 'Link suggestion') | html %]</a >+ > > [% END %] > </td> > [% END %] >@@ -746,23 +834,32 @@ > <td> > [% IF ( books_loo.orderstatus != "complete") %] > [% IF ( books_loo.left_holds_on_order ) %] >- <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order. Cancel holds first">Can't cancel order</span><br> >+ <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order. Cancel holds first">Can't cancel order</span >+ ><br /> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a><br> >+ <a >+ href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" >+ class="button" >+ >Cancel order</a >+ ><br /> > [% END %] > [% IF ( books_loo.can_del_bib ) %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a><br> >+ <a >+ href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" >+ class="button" >+ >Cancel order and delete catalog record</a >+ ><br /> > [% ELSE %] >- <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br> >+ <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br /> > [% END %] > [% IF ( books_loo.left_item ) %] >- <strong title="Can't delete catalog record, because of [% books_loo.items | html %] existing hold(s)" >[% books_loo.items | html %] item(s) left</strong><br> >+ <strong title="Can't delete catalog record, because of [% books_loo.items | html %] existing hold(s)">[% books_loo.items | html %] item(s) left</strong><br /> > [% END %] > [% IF ( books_loo.left_biblio ) %] >- <strong title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios | html %] order(s) left</strong><br> >+ <strong title="Can't delete catalog record, delete other orders linked to it first">[% books_loo.biblios | html %] order(s) left</strong><br /> > [% END %] > [% IF ( books_loo.left_subscription ) %] >- <strong title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions | html %] subscription(s) left</strong><br> >+ <strong title="Can't delete catalog record, delete subscriptions first">[% books_loo.subscriptions | html %] subscription(s) left</strong><br /> > [% END %] > [% IF ( books_loo.left_holds ) %] > <strong title="Can't delete catalog record or order, cancel holds first">[% books_loo.holds | html %] hold(s) left</strong> >@@ -773,9 +870,11 @@ > </tr> > [% END %] > </tbody> >- </table> <!-- /#orders --> >+ </table> >+ <!-- /#orders --> > [% IF ( listincgst ) %]<small class="highlight">** Vendor's listings already include tax.</small>[% END %] >- </div> <!-- /#acqui_basket_content --> >+ </div> >+ <!-- /#acqui_basket_content --> > [% END # / IF ( books_loop ) %] > > [% IF (cancelledorders_loop) %] >@@ -803,24 +902,22 @@ > <tbody> > [% FOREACH order IN cancelledorders_loop %] > <tr style="color:grey"> >- <td> >- [% order.ordernumber | html %] >- </td> >+ <td> [% order.ordernumber | html %] </td> > <td> > <p> >- [% IF ( order.order_received ) %] <span class="order-received">(received)</span>[% END %] >+ [% IF ( order.order_received ) %]<span class="order-received">(received)</span>[% END %] > [% IF (order.title) %] >- [% order.title | html %][% IF order.author %] by [% order.author | html %][% END %] >+ [% order.title | html %][% IF order.author %]by [% order.author | html %][% END %] > [% ELSIF order.deleted_biblio %] > [% INCLUDE 'biblio-title.inc' biblio=order.deleted_biblio %] >- <br/>(Deleted bibliographic record) >+ <br />(Deleted bibliographic record) > [% ELSE %] > <em>Deleted bibliographic record, can't find title</em> > [% END %] > <br /> >- [% IF ( order.order_internalnote ) %] [% order.order_internalnote | html %][% END %] >- [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] >- [% IF ( order.issn ) %] - [% order.issn | html %][% END %] >+ [% IF ( order.order_internalnote ) %][% order.order_internalnote | html %][% END %] >+ [% IF ( order.isbn ) %]- [% order.isbn | html %][% END %] >+ [% IF ( order.issn ) %]- [% order.issn | html %][% END %] > [% IF ( order.publishercode ) %], [% order.publishercode | html %][% END %] > [% IF ( order.publicationyear ) %] > , [% order.publicationyear | html %] >@@ -837,12 +934,11 @@ > [% basket = order.transferred_to.basket %] > [% bookseller = order.transferred_to.bookseller %] > [% timestamp = order.transferred_to.timestamp %] >- <p>Transferred to basket: >+ <p >+ >Transferred to basket: > <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) >- on <span title="[% timestamp | $KohaDates with_hours = 1 %]"> >- [% timestamp | $KohaDates %] >- </span> >+ (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) on >+ <span title="[% timestamp | $KohaDates with_hours = 1 %]"> [% timestamp | $KohaDates %] </span> > </p> > [% END %] > </td> >@@ -868,14 +964,16 @@ > </tr> > [% END # /FOREACH order %] > </tbody> >- </table> <!-- /#cancelledorderst --> >+ </table> >+ <!-- /#cancelledorderst --> > <form id="delete_order_form" method="post"> > [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="op" value="cud-delete-order"/> >- <input type="hidden" name="ordernumber" value=""/> >- <input type="hidden" name="basketno" value="[% basketno | html %]"/> >+ <input type="hidden" name="op" value="cud-delete-order" /> >+ <input type="hidden" name="ordernumber" value="" /> >+ <input type="hidden" name="basketno" value="[% basketno | html %]" /> > </form> >- </div> <!-- /#cancelledorders --> >+ </div> >+ <!-- /#cancelledorders --> > [% END # /IF (cancelledorders_loop) %] > <br /> > >@@ -895,28 +993,26 @@ > </div> > <div class="modal-footer"> > <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button> >- </div> >- </div><!-- /.modal-content --> >- </div><!-- /.modal-dialog --> >- </div><!-- /.modal#addtoBasket --> >+ </div> </div >+ ><!-- /.modal-content --> </div >+ ><!-- /.modal-dialog --> </div >+ ><!-- /.modal#addtoBasket --> > [% END # /UNLESS ( closedate ) %] >- > [% END # /IF ( delete_confirmed ) %] > [% END # /IF ( NO_BOOKSELLER ) %] > [% ELSE %] > <!-- if we want just to select a basketgroup for a closed basket --> >- [% END #/IF !confirm_close && !edi_confirm %] >+ [% END #/IF !confirm_close && !edi_confirm %] > > [% IF ( confirm_close ) %] > <div id="closebasket_needsconfirmation" class="alert alert-warning"> >- > <form method="post" action="/cgi-bin/koha/acqui/basket.pl"> > [% INCLUDE 'csrf-token.inc' %] > <h1>Are you sure you want to close basket [% basketname | html %]?</h1> > [% IF ( CAN_user_acquisition_group_manage ) %] > <p> > <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label> >- <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/> >+ <input type="checkbox" id="createbasketgroup" name="createbasketgroup" /> > </p> > [% END %] > <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" /> >@@ -941,7 +1037,7 @@ > [% IF CAN_user_acquisition_group_manage %] > <p> > <label for="createbasketgroup">Attach this basket to a new basket group with the same name</label> >- <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/> >+ <input type="checkbox" id="createbasketgroup" name="createbasketgroup" /> > </p> > [% END %] > <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" /> >@@ -956,20 +1052,23 @@ > <input type="hidden" name="basketno" value="[% basketno | html %]" /> > <button type="submit" class="btn btn-default deny" accesskey="N"><i class="fa fa-fw fa-times"></i> No, don't close (N)</button> > </form> >- </div> <!-- /#closebasket_needsconfirmation --> >+ </div> >+ <!-- /#closebasket_needsconfirmation --> > [% END # /IF edi_confirm %] > [% END # /IF (cannot_manage_basket) %] > </main> >- </div> <!-- /.col-md-10 order-md-2 order-sm-2 --> >+ </div> >+ <!-- /.col-md-10 order-md-2 order-sm-2 --> > > <div class="col-md-2 order-sm-2 order-md-1"> > <aside> > [% INCLUDE 'vendor-menu.inc' %] > [% INCLUDE 'acquisitions-menu.inc' %] > </aside> >- </div> <!-- /.col-md-2 order-sm-2 order-md-1 --> >- </div> <!-- /.row --> >- >+ </div> >+ <!-- /.col-md-2 order-sm-2 order-md-1 --> >+ </div> >+ <!-- /.row --> > > <!-- Modal for editing vendor and internal notes --> > <div class="modal" id="noteEditor" tabindex="-1" role="dialog" aria-labelledby="noteEditorLabel"> >@@ -991,10 +1090,14 @@ > <button type="submit" class="btn btn-primary">Save</button> > <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button> > </div> >- </div> <!-- /.modal-content --> >- </form> <!-- /#modify_order_notes --> >- </div> <!-- /.modal-dialog --> >- </div> <!-- /.modal#noteEditor --> >+ </div> >+ <!-- /.modal-content --> >+ </form> >+ <!-- /#modify_order_notes --> >+ </div> >+ <!-- /.modal-dialog --> >+ </div> >+ <!-- /.modal#noteEditor --> > > <!-- Modal for editing estimated delivery date --> > <div class="modal" id="dateEditor" tabindex="-1" role="dialog" aria-labelledby="dateEditorLabel"> >@@ -1007,7 +1110,7 @@ > <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> > </div> > <div class="modal-body"> >- <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]"/> >+ <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% books_loo.estimated_delivery_date | html %]" /> > <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > <input type="hidden" id="date_ordernumber" name="ordernumber" value="" /> > <input type="hidden" name="op" value="cud-save" /> >@@ -1016,239 +1119,242 @@ > <button type="submit" class="btn btn-primary">Save</button> > <button type="button" class="btn btn-default" data-bs-dismiss="modal">Cancel</button> > </div> >- </div> <!-- /.modal-content --> >- </form> <!-- /#modify_estimated_delivery_date --> >- </div> <!-- /.modal-dialog --> >- </div> <!-- /.modal#dateEditor --> >+ </div> >+ <!-- /.modal-content --> >+ </form> >+ <!-- /#modify_estimated_delivery_date --> >+ </div> >+ <!-- /.modal-dialog --> >+ </div> >+ <!-- /.modal#dateEditor --> > >-[% MACRO jsinclude BLOCK %] >- [% Asset.js("js/acquisitions-menu.js") | $raw %] >- [% Asset.js("js/form-submit.js") | $raw %] >- [% INCLUDE 'datatables.inc' %] >- [% Asset.js("js/acq.js") | $raw %] >- [% INCLUDE 'calendar.inc' %] >- <script> >- function updateColumnsVisibility(visible) { >- if ( visible ) { >- $("table .tax_excluded, .tax_included").show(); >- } else { >- [% IF ( listincgst ) %] >- $("table .tax_excluded").hide(); >- [% ELSE %] >- $("table .tax_included").hide(); >- [% END %] >+ [% MACRO jsinclude BLOCK %] >+ [% Asset.js("js/acquisitions-menu.js") | $raw %] >+ [% Asset.js("js/form-submit.js") | $raw %] >+ [% INCLUDE 'datatables.inc' %] >+ [% Asset.js("js/acq.js") | $raw %] >+ [% INCLUDE 'calendar.inc' %] >+ <script> >+ function updateColumnsVisibility(visible) { >+ if ( visible ) { >+ $("table .tax_excluded, .tax_included").show(); >+ } else { >+ [% IF ( listincgst ) %] >+ $("table .tax_excluded").hide(); >+ [% ELSE %] >+ $("table .tax_included").hide(); >+ [% END %] >+ } > } >- } > >- $(document).ready(function() { >+ $(document).ready(function() { > >- [% UNLESS ( closedate ) %] >- $('#addtoBasket').on('show', function () { >- $(this).find(".modal-body").html($(".acqui_basket_add")[0].outerHTML); >- }); >- [% END %] >+ [% UNLESS ( closedate ) %] >+ $('#addtoBasket').on('show', function () { >+ $(this).find(".modal-body").html($(".acqui_basket_add")[0].outerHTML); >+ }); >+ [% END %] > >- $("body").on("click", ".del_user", function(e){ >- e.preventDefault(); >- del_user( $(this).data("borrowernumber") ); >- }); >+ $("body").on("click", ".del_user", function(e){ >+ e.preventDefault(); >+ del_user( $(this).data("borrowernumber") ); >+ }); > >- $(".transfer_order").on("click",function(e){ >- e.preventDefault(); >- transfer_order_popup( $(this).data("ordernumber")); >- }); >+ $(".transfer_order").on("click",function(e){ >+ e.preventDefault(); >+ transfer_order_popup( $(this).data("ordernumber")); >+ }); > >- $(".edit_note").on("click", function(e) { >- e.preventDefault(); >- var ordernumber = $(this).data("ordernumber"); >- var note_type = $(this).data("note_type"); >- var order_number_text = _("(order number %s)").format(ordernumber); >- var modalTitle = $(this).attr("title") + " " + order_number_text; >- var note_text = $( "#" + note_type + "-note-" + ordernumber ).html(); >- $("#noteEditor .modal-title").text(modalTitle); >- $("#ordernumber").val( ordernumber ); >- $("#ordernotes").html( note_text ); >- $("#type").val( note_type ); >- $("#noteEditor").modal("show"); >- $("#ordernotes").focus(); >- }); >+ $(".edit_note").on("click", function(e) { >+ e.preventDefault(); >+ var ordernumber = $(this).data("ordernumber"); >+ var note_type = $(this).data("note_type"); >+ var order_number_text = _("(order number %s)").format(ordernumber); >+ var modalTitle = $(this).attr("title") + " " + order_number_text; >+ var note_text = $( "#" + note_type + "-note-" + ordernumber ).html(); >+ $("#noteEditor .modal-title").text(modalTitle); >+ $("#ordernumber").val( ordernumber ); >+ $("#ordernotes").html( note_text ); >+ $("#type").val( note_type ); >+ $("#noteEditor").modal("show"); >+ $("#ordernotes").focus(); >+ }); > >- $("#noteEditor").on('hidden.bs.modal', function (e) { >- $("#noteEditorLabel").html(""); >- $("#noteEditor .modal-title").text(""); >- $("#ordernotes").html( "" ); >- $("#ordernumber").val(""); >- $("#type").val(""); >- }); >+ $("#noteEditor").on('hidden.bs.modal', function (e) { >+ $("#noteEditorLabel").html(""); >+ $("#noteEditor .modal-title").text(""); >+ $("#ordernotes").html( "" ); >+ $("#ordernumber").val(""); >+ $("#type").val(""); >+ }); > >- $("#set_managing_library").on("click", function(e){ >- e.preventDefault(); >- $(this).hide(); >- $("#managing_library_entry").show(); >- }); >+ $("#set_managing_library").on("click", function(e){ >+ e.preventDefault(); >+ $(this).hide(); >+ $("#managing_library_entry").show(); >+ }); > >- $("#library_entry_cancel").on("click", function(e){ >- e.preventDefault(); >- $("#managing_library_entry").hide(); >- $("#set_managing_library").show(); >- }); >+ $("#library_entry_cancel").on("click", function(e){ >+ e.preventDefault(); >+ $("#managing_library_entry").hide(); >+ $("#set_managing_library").show(); >+ }); > >- $("#set_basket_group").on("click", function(e){ >- e.preventDefault(); >- $(this).hide(); >- $("#basket_grouping").show(); >- }); >+ $("#set_basket_group").on("click", function(e){ >+ e.preventDefault(); >+ $(this).hide(); >+ $("#basket_grouping").show(); >+ }); > >- $("#basket_group_cancel").on("click", function(e){ >- e.preventDefault(); >- $("#basket_grouping").hide(); >- $("#set_basket_group").show(); >- }); >+ $("#basket_group_cancel").on("click", function(e){ >+ e.preventDefault(); >+ $("#basket_grouping").hide(); >+ $("#set_basket_group").show(); >+ }); > >- $("#addtoBasket").on("shown.bs.modal", function(){ >- var basket = $(this).data("basketno"); >- var legend = _("Add order to basket %s").format(basket); >- $(this).find("h4").text( legend ); >- $(this).find("legend").html(legend); >- $(this).find("input:text").focus(); >+ $("#addtoBasket").on("shown.bs.modal", function(){ >+ var basket = $(this).data("basketno"); >+ var legend = _("Add order to basket %s").format(basket); >+ $(this).find("h4").text( legend ); >+ $(this).find("legend").html(legend); >+ $(this).find("input:text").focus(); >+ }); > }); >- }); >- </script> >- >- [% UNLESS ( closedate ) %] >- <script> >- function transfer_order_popup(ordernumber) { >- var url = "/cgi-bin/koha/acqui/transferorder.pl?" >- + "ordernumber=" + ordernumber >- window.open(url, 'TransferOrder','width=600,height=400,toolbar=false,scrollbars=yes'); >- } >- >- function confirm_ediorder() { >- var is_confirmed = confirm(_("Are you sure you want to close this basket and generate an EDIFACT order?")); >- if (is_confirmed) { >- window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno | html %]"; >+ </script> >+ [% UNLESS ( closedate ) %] >+ <script> >+ function transfer_order_popup(ordernumber) { >+ var url = "/cgi-bin/koha/acqui/transferorder.pl?" >+ + "ordernumber=" + ordernumber >+ window.open(url, 'TransferOrder','width=600,height=400,toolbar=false,scrollbars=yes'); > } >- } > >- $(document).ready(function() { >- $(".delete_order").on('click', function(e) { >- e.preventDefault(); >- if( $(this).data('biblionumber') ) { >- alert( _("Please delete the linked bibliographic record first.") ); >- return false; >- } else if( !confirm(_("Are you sure you want to delete this order line?")) ) { >- return false; >+ function confirm_ediorder() { >+ var is_confirmed = confirm(_("Are you sure you want to close this basket and generate an EDIFACT order?")); >+ if (is_confirmed) { >+ window.location = "/cgi-bin/koha/acqui/basket.pl?op=edi_confirm&basketno=[% basketno | html %]"; > } >- $('#delete_order_form input[name="ordernumber"]').val( $(this).data('ordernumber') ); >- $('#delete_order_form').submit(); >+ } >+ >+ $(document).ready(function() { >+ $(".delete_order").on('click', function(e) { >+ e.preventDefault(); >+ if( $(this).data('biblionumber') ) { >+ alert( _("Please delete the linked bibliographic record first.") ); >+ return false; >+ } else if( !confirm(_("Are you sure you want to delete this order line?")) ) { >+ return false; >+ } >+ $('#delete_order_form input[name="ordernumber"]').val( $(this).data('ordernumber') ); >+ $('#delete_order_form').submit(); >+ }); > }); >- }); >- </script> >- [% ELSE %] >+ </script> >+ [% ELSE %] >+ <script> >+ $(document).ready(function(){ >+ $("#basketgroupid").change(function(){ >+ if($(this).val() == "new"){ >+ location.href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | html %]"; >+ } else { >+ $(this).parent().submit(); >+ } >+ }); >+ }); >+ </script> >+ [% END # /UNLESS (closedate) %] > <script> >- $(document).ready(function(){ >- $("#basketgroupid").change(function(){ >- if($(this).val() == "new"){ >- location.href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | html %]"; >- } else { >- $(this).parent().submit(); >+ $(document).ready(function() { >+ var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; >+ [% IF !(Koha.Preference('EDIFACT') && ediaccount) %] >+ // FIXME This cannot work correctly without bKohaColumnsUseNames >+ table_settings['columns'].splice(18, 1); >+ [% END %] >+ $("#orders").kohaTable({ >+ pagingType: "full", >+ autoWidth: false, >+ }, table_settings); >+ >+ $("#cancelledorderst").kohaTable({ >+ pagingType: "full" >+ }); >+ $("#reopenform").on("submit",function(e){ >+ var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %]; >+ var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?")); >+ if( is_confirmed ){ return true; } >+ else{ return false } >+ }); >+ // Generates a dynamic link for exporting the selections data as CSV >+ $("#exportbutton, #export-csv-menu a").click(function() { >+ // Building the url from currently checked boxes >+ var url = '/cgi-bin/koha/acqui/basket.pl'; >+ url += $('#exportbutton').attr('href'); >+ if($(this).attr("data-value")) { >+ url += '&csv_profile=' + $(this).attr("data-value"); > } >+ // And redirecting to the CSV page >+ location.href = url; >+ return false; >+ }); >+ $("#select_managing_library").on("change", function(){ >+ $(this).parent().submit(); > }); >- }); >- </script> >- [% END # /UNLESS (closedate) %] >- <script> >- $(document).ready(function() { >- var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; >- [% IF !(Koha.Preference('EDIFACT') && ediaccount) %] >- // FIXME This cannot work correctly without bKohaColumnsUseNames >- table_settings['columns'].splice(18, 1); >- [% END %] >- $("#orders").kohaTable({ >- pagingType: "full", >- autoWidth: false, >- }, table_settings); >- >- $("#cancelledorderst").kohaTable({ >- pagingType: "full" >- }); >- $("#reopenform").on("submit",function(e){ >- var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %]; >- var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?")); >- if( is_confirmed ){ return true; } >- else{ return false } >- }); >- // Generates a dynamic link for exporting the selections data as CSV >- $("#exportbutton, #export-csv-menu a").click(function() { >- // Building the url from currently checked boxes >- var url = '/cgi-bin/koha/acqui/basket.pl'; >- url += $('#exportbutton').attr('href'); >- if($(this).attr("data-value")) { >- url += '&csv_profile=' + $(this).attr("data-value"); >- } >- // And redirecting to the CSV page >- location.href = url; >- return false; >- }); >- $("#select_managing_library").on("change", function(){ >- $(this).parent().submit(); >- }); > >- $(".edit_delivery_date").on("click", function(e) { >- e.preventDefault(); >- var ordernumber = $(this).data("ordernumber"); >- var order_number_text = _("(order number %s)").format(ordernumber); >- var modalTitle = $(this).attr("title") + " " + order_number_text; >- var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date"); >- const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr; >- estimated_delivery_date.setDate( delivery_date ); >- $("#dateEditor .modal-title").text(modalTitle); >- $("#date_ordernumber").val(ordernumber); >- $("#dateEditor").modal("show"); >- }); >+ $(".edit_delivery_date").on("click", function(e) { >+ e.preventDefault(); >+ var ordernumber = $(this).data("ordernumber"); >+ var order_number_text = _("(order number %s)").format(ordernumber); >+ var modalTitle = $(this).attr("title") + " " + order_number_text; >+ var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date"); >+ const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr; >+ estimated_delivery_date.setDate( delivery_date ); >+ $("#dateEditor .modal-title").text(modalTitle); >+ $("#date_ordernumber").val(ordernumber); >+ $("#dateEditor").modal("show"); >+ }); > >- $("#dateEditor").on('hidden.bs.modal', function (e) { >- $("#dateEditorLabel").html(""); >- $("#dateEditor .modal-title").text(""); >- $("#estimated_delivery_date").html( "" ); >- $("#date_ordernumber").val(""); >+ $("#dateEditor").on('hidden.bs.modal', function (e) { >+ $("#dateEditorLabel").html(""); >+ $("#dateEditor .modal-title").text(""); >+ $("#estimated_delivery_date").html( "" ); >+ $("#date_ordernumber").val(""); >+ }); > }); >- }); > >- function add_user(borrowernumber, borrowername) { >- var ids = $("#users_ids").val(); >- if(ids.length > 0) { >- ids = ids.split(':'); >- } else { >- ids = new Array; >+ function add_user(borrowernumber, borrowername) { >+ var ids = $("#users_ids").val(); >+ if(ids.length > 0) { >+ ids = ids.split(':'); >+ } else { >+ ids = new Array; >+ } >+ if (ids.indexOf(borrowernumber.toString()) < 0) { >+ ids.push(borrowernumber); >+ $("#users_ids").val(ids.join(':')); >+ var li = '<li id="user_'+borrowernumber+'">'+borrowername >+ + ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> ' >+ + _("Delete user") + '</a></li>'; >+ $("#users_names").prepend(li); >+ $("#add_user_submit").show(); >+ return 0; >+ } >+ return -1; > } >- if (ids.indexOf(borrowernumber.toString()) < 0) { >- ids.push(borrowernumber); >+ >+ function del_user(borrowernumber) { >+ $("#user_"+borrowernumber).remove(); >+ var ids = $("#users_ids").val().split(':'); >+ ids.splice(ids.indexOf(borrowernumber.toString()), 1); > $("#users_ids").val(ids.join(':')); >- var li = '<li id="user_'+borrowernumber+'">'+borrowername >- + ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> ' >- + _("Delete user") + '</a></li>'; >- $("#users_names").prepend(li); > $("#add_user_submit").show(); >- return 0; > } >- return -1; >- } >- >- function del_user(borrowernumber) { >- $("#user_"+borrowernumber).remove(); >- var ids = $("#users_ids").val().split(':'); >- ids.splice(ids.indexOf(borrowernumber.toString()), 1); >- $("#users_ids").val(ids.join(':')); >- $("#add_user_submit").show(); >- } >- </script> >- >- [% INCLUDE 'select2.inc' %] >- [% SET columns = ['cardnumber','name','category','branch','action'] %] >- [% SET filter = 'baskets_managers' %] >- [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %] >- [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %] >-[% END %] >+ </script> >+ [% INCLUDE 'select2.inc' %] >+ [% SET columns = ['cardnumber','name','category','branch','action'] %] >+ [% SET filter = 'baskets_managers' %] >+ [% PROCESS patron_search_modal columns => columns, modal_title => t("Add user") %] >+ [% PROCESS patron_search_js columns => columns, actions => ["add"], preview_on_name_click => 1 %] >+ [% END %] > >-[% INCLUDE 'intranet-bottom.inc' %] >+ [% INCLUDE 'intranet-bottom.inc' %] >+</div> >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31632
:
141028
|
141029
|
141030
|
169391
|
170147
|
170148
|
170953
|
174393
|
174394
|
174395
|
174415
|
174416
|
174417
|
175620
|
175621
|
175622
|
175623
|
175624
|
176281
|
176282
|
179957
|
179958
|
179959
|
179960
|
179961
| 179962