From 8922fb1863b6f6edc1cd657e2387bcc3e5869cc6 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Ray Delahunty Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi --- 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 e528b76298..acbda87349 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 f79f8896f7..fe662a8ab2 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 @@ GST Fund Estimated delivery date + Statistic 1 + Statistic 2 [% IF Koha.Preference('EDIFACT') && ediaccount %] Supplier report [% END %] @@ -506,6 +508,8 @@ [% foot_loo.tax_value | $Price %]     +   +   [% IF Koha.Preference('EDIFACT') && ediaccount %]   [% END %] @@ -534,6 +538,8 @@ [% total_tax_value | $Price %]     +   +   [% IF Koha.Preference('EDIFACT') && ediaccount %]   [% END %] @@ -654,6 +660,8 @@ Edit [% END %] + [% books_loo.sort1 | html %] + [% books_loo.sort2 | html %] [% IF Koha.Preference('EDIFACT') && ediaccount %] [% books_loo.suppliers_report | html %] [% 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.39.5