Bug 31823: Add page-section to uncertain prices page (acq)
This patch adds a "page-section" wrapping div to the uncertain prices page in Acquisitions Note: This patch contains indentation changes. To test, apply the patch and go to Acquisitions. - Locate a vendor and view its details - In the left-hand sidebar, click "Uncertain prices." - The page should have two sections: Details about the vendor, and a list of orders with uncertain prices. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
823b362f51
commit
edf5f72f1b
GPG key ID:
0A272EA1B2F3C15F
1 changed files with 104 additions and 98 deletions
|
|
@ -54,108 +54,114 @@
|
|||
[% ELSE %]
|
||||
[% IF ( booksellername ) %]
|
||||
<h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
|
||||
<h2>Contact information</h2>
|
||||
<p><strong>Address: </strong>
|
||||
[% booksellerpostal | html %]
|
||||
[% bookselleraddress1 | html %]
|
||||
[% bookselleraddress2 | html %]
|
||||
[% bookselleraddress3 | html %]
|
||||
[% bookselleraddress4 | html %]
|
||||
</p>
|
||||
<p><strong>Phone: </strong>
|
||||
[% booksellerphone | html %] / Fax:
|
||||
<dl>
|
||||
[% FOREACH contact IN contacts %]
|
||||
<dt><strong>Contact: </strong></dt>
|
||||
<dd>[% contact.name | html %]
|
||||
[% contact.position | html %]
|
||||
[% contact.phone | html %]
|
||||
[% contact.altphone | html %]
|
||||
[% contact.email | html %]
|
||||
[% contact.notes | html %]
|
||||
</dd>
|
||||
|
||||
<div class="page-section">
|
||||
<h2>Contact information</h2>
|
||||
<p><strong>Address: </strong>
|
||||
[% booksellerpostal | html %]
|
||||
[% bookselleraddress1 | html %]
|
||||
[% bookselleraddress2 | html %]
|
||||
[% bookselleraddress3 | html %]
|
||||
[% bookselleraddress4 | html %]
|
||||
</p>
|
||||
<p><strong>Phone: </strong>
|
||||
[% booksellerphone | html %] / Fax:
|
||||
<dl>
|
||||
[% FOREACH contact IN contacts %]
|
||||
<dt><strong>Contact: </strong></dt>
|
||||
<dd>[% contact.name | html %]
|
||||
[% contact.position | html %]
|
||||
[% contact.phone | html %]
|
||||
[% contact.altphone | html %]
|
||||
[% contact.email | html %]
|
||||
[% contact.notes | html %]
|
||||
</dd>
|
||||
[% END %]
|
||||
</dl>
|
||||
[% IF ( booksellernotes ) %]
|
||||
<p><strong>Notes: </strong>
|
||||
[% booksellernotes | html %]</p>
|
||||
[% END %]
|
||||
</dl>
|
||||
[% IF ( booksellernotes ) %]
|
||||
<p><strong>Notes: </strong>
|
||||
[% booksellernotes | html %]</p>
|
||||
[% END %]
|
||||
</div> <!-- /.page-section -->
|
||||
[% END %]
|
||||
|
||||
<h1>Orders with uncertain prices</h1>
|
||||
<form action="[% scriptname | html %]" method="post">
|
||||
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
||||
<label for="owner">Orders from:</label>
|
||||
<select id="owner" name="owner">
|
||||
[% IF ( owner ) %]
|
||||
<option value="0">Everyone</option>
|
||||
<option value="1" selected="selected">me</option>
|
||||
[% ELSE %]
|
||||
<option value="0" selected="selected">Everyone</option>
|
||||
<option value="1">me</option>
|
||||
[% END %]
|
||||
</select>
|
||||
<input type="submit" class="btn btn-primary" value="Filter" />
|
||||
</form>
|
||||
<form action="[% scriptname | html %]" method="post" id="uncertainprices">
|
||||
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
||||
<input type="hidden" name="op" value="validate" />
|
||||
<table id="uncertainpricet">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Basket</th>
|
||||
<th>[% tp('noun', 'Order') | html %]</th>
|
||||
<th>By</th>
|
||||
<th class="NoSort">Uncertain</th>
|
||||
<th class="NoSort">Price</th>
|
||||
<th class="NoSort">Quantity</th>
|
||||
<th class="NoSort">Edit</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH uncertainpriceorder IN uncertainpriceorders %]
|
||||
<tr>
|
||||
<td>
|
||||
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% uncertainpriceorder.basketno | uri %]">[% uncertainpriceorder.basketname | html %]</a>
|
||||
</td>
|
||||
<td>
|
||||
[% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %]
|
||||
[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
|
||||
[% IF ( uncertainpriceorder.publishercode ) %]
|
||||
<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]
|
||||
[%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %]
|
||||
[%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
|
||||
<br />
|
||||
</td>
|
||||
<td>
|
||||
[% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %]
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber | html %]" value="1" checked="checked" />
|
||||
</td>
|
||||
<td>
|
||||
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.listprice | html %]" />
|
||||
</td>
|
||||
<td>
|
||||
[% IF basket.effective_create_items == 'ordering' %]
|
||||
[% uncertainpriceorder.quantity | html %]
|
||||
<input type="hidden" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
||||
[% ELSE %]
|
||||
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
||||
[% END %]
|
||||
</td>
|
||||
<td class="actions">
|
||||
<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% uncertainpriceorder.basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
|
||||
</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
|
||||
</form>
|
||||
|
||||
<div class="page-section">
|
||||
<form action="[% scriptname | html %]" method="post">
|
||||
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
||||
<label for="owner">Orders from:</label>
|
||||
<select id="owner" name="owner">
|
||||
[% IF ( owner ) %]
|
||||
<option value="0">Everyone</option>
|
||||
<option value="1" selected="selected">me</option>
|
||||
[% ELSE %]
|
||||
<option value="0" selected="selected">Everyone</option>
|
||||
<option value="1">me</option>
|
||||
[% END %]
|
||||
</select>
|
||||
<input type="submit" class="btn btn-primary" value="Filter" />
|
||||
</form>
|
||||
<form action="[% scriptname | html %]" method="post" id="uncertainprices">
|
||||
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
|
||||
<input type="hidden" name="op" value="validate" />
|
||||
<table id="uncertainpricet">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Basket</th>
|
||||
<th>[% tp('noun', 'Order') | html %]</th>
|
||||
<th>By</th>
|
||||
<th class="NoSort">Uncertain</th>
|
||||
<th class="NoSort">Price</th>
|
||||
<th class="NoSort">Quantity</th>
|
||||
<th class="NoSort">Edit</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH uncertainpriceorder IN uncertainpriceorders %]
|
||||
<tr>
|
||||
<td>
|
||||
<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% uncertainpriceorder.basketno | uri %]">[% uncertainpriceorder.basketname | html %]</a>
|
||||
</td>
|
||||
<td>
|
||||
[% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %]
|
||||
[% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %]
|
||||
[% IF ( uncertainpriceorder.publishercode ) %]
|
||||
<br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %]
|
||||
[%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %]
|
||||
[%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %]
|
||||
<br />
|
||||
</td>
|
||||
<td>
|
||||
[% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %]
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" name="uncertainprice[% uncertainpriceorder.ordernumber | html %]" value="1" checked="checked" />
|
||||
</td>
|
||||
<td>
|
||||
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="price[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.listprice | html %]" />
|
||||
</td>
|
||||
<td>
|
||||
[% IF basket.effective_create_items == 'ordering' %]
|
||||
[% uncertainpriceorder.quantity | html %]
|
||||
<input type="hidden" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
||||
[% ELSE %]
|
||||
<input class="check_uncertain" data-ordernumber="[% uncertainpriceorder.ordernumber | html %]" type="text" size="10" name="qty[% uncertainpriceorder.ordernumber | html %]" value="[% uncertainpriceorder.quantity | html %]" />
|
||||
[% END %]
|
||||
</td>
|
||||
<td class="actions">
|
||||
<a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% uncertainpriceorder.basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
|
||||
</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Save" /></fieldset>
|
||||
</form>
|
||||
</div> <!-- /.page-section -->
|
||||
[% END %]
|
||||
|
||||
</main>
|
||||
|
|
|
|||
Loading…
Reference in a new issue