Owen Leonard
411f49a9b9
This patch updates the "Transfer order" pop-up window so that it has a fixed footer consistent with other similar pop-up windows. In order to make navigation between pages within the pop-up window easier I've added a button in the footer which can take the user back to the previous step, including any necessary parameters. To test, apply the patch and go to Acquisitions. - Locate a vendor with a basket, and a basket with one or more orders. - On the basket detail page, click the "Transfer" link in the "Modify" column. - In the pop-up window, test each step: - Vendor search - Vendor selection - Basket selection - Confirm that at any step you can use the new button to go back to the previous step. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
183 lines
8.7 KiB
Text
183 lines
8.7 KiB
Text
[% USE raw %]
|
|
[% PROCESS 'i18n.inc' %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% FILTER collapse %]
|
|
[% t("Transfer order") | html %] ›
|
|
[% t("Acquisitions") | html %] ›
|
|
[% t("Koha") | html %]
|
|
[% END %]</title>
|
|
[%- USE KohaDates -%]
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="acq_transferorder" class="acq">
|
|
<div class="container-fluid">
|
|
<h1>Transfer order</h1>
|
|
|
|
[% IF ( show_baskets ) %]
|
|
[% IF ( basketsloop ) %]
|
|
<div class="page-section">
|
|
<h3>Baskets for [% booksellertoname | html %]</h3>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Basket (#)</th>
|
|
<th>[% tp('basket created by', 'Created by') | html %]</th>
|
|
<th>Date</th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH basket IN basketsloop %]
|
|
<tr>
|
|
<td>[% basket.basketname | html %] (#[% basket.basketno | html %])</td>
|
|
<td>[% basket.createdby | html %]</td>
|
|
<td>[% basket.creationdate | $KohaDates %]</td>
|
|
<td><a class="btn btn-default btn-xs confirm_transfer" href="transferorder.pl?basketno=[% basket.basketno | html %]&ordernumber=[% ordernumber | html %]">Choose</a>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
[% ELSE %]
|
|
<p>There are no open baskets for this vendor.</p>
|
|
[% END %]
|
|
[% ELSIF ( ordersloop ) %]
|
|
<h3>Orders for [% booksellerfromname | html %]</h3>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>[% tp('noun', 'Order') | html %]</th>
|
|
<th>Summary</th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH ordersloo IN ordersloop %]
|
|
<tr>
|
|
<td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber | uri %]">[% ordersloo.ordernumber | html %]</a></td>
|
|
<td>
|
|
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]">[% ordersloo.title | html %]</a>
|
|
[% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %]
|
|
[% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn | html %][% END %]
|
|
[% IF ( ordersloo.publishercode ) %]
|
|
<br /><span>Publisher: [% ordersloo.publishercode | html %]</span>
|
|
[%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear | html %]
|
|
[%- ELSIF ( ordersloo.copyrightdate > 0) -%] [% ordersloo.copyrightdate | html %]
|
|
[% END %]
|
|
[% END %]
|
|
</td>
|
|
<td><a class="btn btn-default btn-xs" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom | html %]&ordernumber=[% ordersloo.ordernumber | html %]">Transfer</a></td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSIF ( do_search ) %]
|
|
[% IF booksellers.count %]
|
|
[% IF ( bookselleridfrom ) %]
|
|
<h3>Choose a vendor to transfer to</h3>
|
|
[% ELSE %]
|
|
<h3>Choose a vendor to transfer from</h3>
|
|
[% END %]
|
|
<div class="page-section">
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Name</th>
|
|
<th> </th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH bookseller IN booksellers %]
|
|
<tr>
|
|
<td>[% bookseller.name | html %]</td>
|
|
<td><a class="btn btn-default btn-xs" href="transferorder.pl?[% IF (bookselleridfrom) %]bookselleridto[% ELSE %]bookselleridfrom[% END %]=[% bookseller.id | html %][% IF (ordernumber) %]&ordernumber=[% ordernumber | html %][% END %][% IF (query) %]&query=[% query | html %][% END %]">Choose</a></td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
[% ELSE %]
|
|
<p>No results found.</p>
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( bookselleridfrom ) %]
|
|
<h3>Search for a vendor to transfer to</h3>
|
|
<div class="transferinfo">
|
|
<ul>
|
|
<li><span class="label">From vendor: </span>[% booksellerfromname | html %]</li>
|
|
<li><span class="label">Basket: </span>[% basketfromname | html %]</li>
|
|
<li><span class="label">[% tp('noun', 'Order') | html %]: </span>[% ordernumber | html %]</li>
|
|
</ul>
|
|
</div>
|
|
[% ELSE %]
|
|
<h3>Search for a vendor to transfer from</h3>
|
|
[% END %]
|
|
<form method="get" id="vendor_search_form" action="transferorder.pl">
|
|
<fieldset class="brief">
|
|
<input type="hidden" name="op" value="do_search" />
|
|
[% IF ( ordernumber ) %]
|
|
<input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
|
|
[% END %]
|
|
[% IF ( bookselleridfrom ) %]
|
|
<input type="hidden" name="bookselleridfrom" value="[% bookselleridfrom | html %]" />
|
|
[% END %]
|
|
<ol>
|
|
<li>
|
|
<label for="query">Vendor:</label>
|
|
<input type="text" id="query" name="query" autofocus="autofocus" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
<nav class="navbar navbar-default navbar-fixed-bottom">
|
|
<div class="container-fluid">
|
|
<fieldset class="action">
|
|
[% IF ( show_baskets ) %]
|
|
<form action="/cgi-bin/koha/acqui/transferorder.pl">
|
|
<input type="hidden" name="op" value="do_search" />
|
|
<input type="hidden" name="query" value="[% query | html %]" />
|
|
<input type="hidden" name="bookselleridfrom" value="[% bookselleridfrom | html %]" />
|
|
<input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
|
|
<button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Select a different vendor</button>
|
|
</form>
|
|
[% ELSIF ( do_search ) %]
|
|
<form action="/cgi-bin/koha/acqui/transferorder.pl">
|
|
<input type="hidden" name="ordernumber" value="[% ordernumber | html %]" />
|
|
<button class="btn btn-default" type="submit"><i class="fa fa-arrow-left"></i> Search again</button>
|
|
</form>
|
|
[% ELSE %]
|
|
<input type="submit" id="vendor_search_submit" class="btn btn-primary" value="Search" />
|
|
[% END %]
|
|
<button type="button" class="btn btn-default close_window">Close window</button>
|
|
</fieldset>
|
|
</div>
|
|
</nav>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% IF transferred %]
|
|
<script>
|
|
opener.location.reload();
|
|
window.close();
|
|
</script>
|
|
[% END %]
|
|
|
|
[% IF ( bookselleridfrom ) %]
|
|
<script>
|
|
$(document).ready(function(){
|
|
$(".confirm_transfer").on("click",function(){
|
|
return confirm( _("Transfer order to this basket?") );
|
|
});
|
|
$("#vendor_search_submit").on("click", function(e){
|
|
e.preventDefault();
|
|
$("#vendor_search_form").submit();
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
|