Bugzilla – Attachment 155467 Details for
Bug 34618
Add sort 1 and 2 fields to basket in acquisitions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34618: Add sort 1 and 2 fields to basket in acquisitions
Bug-34618-Add-sort-1-and-2-fields-to-basket-in-acq.patch (text/plain), 6.28 KB, created by
Martin Renvoize (ashimema)
on 2023-09-08 20:17:54 UTC
(
hide
)
Description:
Bug 34618: Add sort 1 and 2 fields to basket in acquisitions
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-09-08 20:17:54 UTC
Size:
6.28 KB
patch
obsolete
>From edaa1e71dd8938709ac05e8a2188b97367100ae1 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 29 Aug 2023 14:53:03 +0000 >Subject: [PATCH] Bug 34618: Add sort 1 and 2 fields to basket in acquisitions > >This patch adds the option to display sort1 and sort2 columns in the >view of the contents of a basket in acquisitions. The columns are >labeled "Statistic 1" and "Statistic 2" to match the labels in the >order creation/edit form. > >The fields are hidden by default in the updated table configuration. > >To test, apply the patch and restart services. > >- Go to acquisitions and create a basket if necessary: > - Search for a vendor and click New -> Basket from the vendor > toolbar on the vendor search results screen. > - Create a basket, then click "Add to basket" from the basket details > page. > - Add an order to the basket. >- With at least one order in the basket, check the table of orders in > the basket. >- The columns should be unchanged. >- The table configuration button should show the two statistics fields > as hidden. Test that they can be displayed. > >- Go to Administration -> Table settings. > - Under Acquisitions -> basket, try changing the settings for the > Statistic 1 and Statistic 2 fields, and check that your changes are > reflected in the basket view. > >- Test with a vendor which has an EDI account: > - Enable the EDIFACT system preference. > - Go to Administration -> EDI accounts and create an account for your > vendor. > - Confirm that the table of orders in your basket still displays > correctly now that the "Supplier report" column is present. > >Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> >Signed-off-by: Ray Delahunty <r.delahunty@arts.ac.uk> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > admin/columns_settings.yml | 6 ++++++ > .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 ++++++++++-- > 2 files changed, 16 insertions(+), 2 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index 90fb535472..9bd0580766 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -152,6 +152,12 @@ modules: > columnname: fund > - > columnname: estimated_delivery_date >+ - >+ columnname: statistic1 >+ is_hidden: 1 >+ - >+ columnname: statistic2 >+ is_hidden: 1 > - > columnname: supplier_report > - >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 69acd9f1cc..3e30015fd4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -476,6 +476,8 @@ > <th>GST</th> > <th>Fund</th> > <th>Estimated delivery date</th> >+ <th>Statistic 1</th> >+ <th>Statistic 2</th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th>Supplier report</th> > [% END %] >@@ -506,6 +508,8 @@ > <th>[% foot_loo.tax_value | $Price %]</th> > <th> </th> > <th> </th> >+ <th> </th> >+ <th> </th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th> </th> > [% END %] >@@ -534,6 +538,8 @@ > <th>[% total_tax_value | $Price %]</th> > <th> </th> > <th> </th> >+ <th> </th> >+ <th> </th> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <th> </th> > [% END %] >@@ -654,6 +660,8 @@ > <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a> > [% END %] > </td> >+ <td>[% books_loo.sort1 | html %]</td> >+ <td>[% books_loo.sort2 | html %]</td> > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <td>[% books_loo.suppliers_report | html %]</td> > [% END %] >@@ -1079,12 +1087,12 @@ > $(document).ready(function() { > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; > [% IF !(Koha.Preference('EDIFACT') && ediaccount) %] >- table_settings['columns'].splice(16, 1); >+ table_settings['columns'].splice(18, 1); > [% END %] > KohaTable("orders", { > "sPaginationType": "full", > "autoWidth": false, >- "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15[% IF (Koha.Preference('EDIFACT') && ediaccount) %],16[% END %]], >+ "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17[% IF (Koha.Preference('EDIFACT') && ediaccount) %],18[% END %]], > }, table_settings); > > var cancelledorderst = $("#cancelledorderst").dataTable($.extend(true, {}, dataTablesDefaults, { >-- >2.41.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=155467">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34618
:
154902
|
154935
|
154938
| 155467