Bug 13962: Add vendor to acq details tab in staff
Implementing some feedback from our user meeting: The acquisition details tab on the detail page in staff should also show the vendor of the order. To test: - Make sure AcquisitionDetails is active. - Create an order or look up an order in the acqusition module. - Go to the ordered record and check the 'Acquisition details' tab - Verify the vendor shows up there as first column now - Check that sorting and display of the other columns are still working correctly Note: Also fixes a </th> that should be a </td> Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
198e6669ee
commit
55103ad860
1 changed files with 9 additions and 3 deletions
|
@ -295,9 +295,9 @@ function verify_images() {
|
||||||
'sDom': 't',
|
'sDom': 't',
|
||||||
'bPaginate': false,
|
'bPaginate': false,
|
||||||
'bAutoWidth': false,
|
'bAutoWidth': false,
|
||||||
"aaSorting": [[ 3, "desc" ]],
|
"aaSorting": [[ 4, "desc" ]],
|
||||||
"aoColumnDefs": [
|
"aoColumnDefs": [
|
||||||
{ "aTargets": [ 3, 4 ], "sType": "title-string" }
|
{ "aTargets": [ 4, 5 ], "sType": "title-string" }
|
||||||
]
|
]
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
@ -932,6 +932,7 @@ function verify_images() {
|
||||||
<table id="orders">
|
<table id="orders">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
<th>Vendor</th>
|
||||||
<th>Basket group</th>
|
<th>Basket group</th>
|
||||||
<th>Basket</th>
|
<th>Basket</th>
|
||||||
<th>Order number</th>
|
<th>Order number</th>
|
||||||
|
@ -944,6 +945,11 @@ function verify_images() {
|
||||||
<tbody>
|
<tbody>
|
||||||
[% FOR order IN orders %]
|
[% FOR order IN orders %]
|
||||||
<tr>
|
<tr>
|
||||||
|
<td>
|
||||||
|
[% IF (order.id) %]
|
||||||
|
[% order.name %]
|
||||||
|
[% END %]
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
[% IF (order.basketgroupid) %]
|
[% IF (order.basketgroupid) %]
|
||||||
[% IF CAN_user_acquisition_group_manage %]
|
[% IF CAN_user_acquisition_group_manage %]
|
||||||
|
@ -970,7 +976,7 @@ function verify_images() {
|
||||||
[% CASE 'cancelled' %]Cancelled
|
[% CASE 'cancelled' %]Cancelled
|
||||||
[% END %]
|
[% END %]
|
||||||
</td>
|
</td>
|
||||||
<td>[% order.quantity %]</th>
|
<td>[% order.quantity %]</td>
|
||||||
</tr>
|
</tr>
|
||||||
[% END %]
|
[% END %]
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
Loading…
Reference in a new issue