Attachment 173450 Details for Bug 33484 – Bug 33484: Add table settings to pending orders

[patch] Bug 33484: Add table settings to pending orders

Bug-33484-Add-table-settings-to-pending-orders.patch (text/plain), 2.86 KB, created by Jonathan Druart on 2024-10-28 09:44:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2024-10-28 09:44:44 UTC

Size: 2.86 KB

patch

obsolete

>From 51cf160d1562135bbafe9387ea8ecb3a2411934f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 3 Oct 2024 10:50:57 +0200
>Subject: [PATCH] Bug 33484: Add table settings to pending orders
>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> admin/columns_settings.yml                    | 36 +++++++++++++++++++
> .../prog/en/modules/acqui/parcel.tt           |  5 ++-
> 2 files changed, 40 insertions(+), 1 deletion(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index 59fe8cd22b2..5b441fbb1e5 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -114,6 +114,42 @@ modules:
>             -
>               columnname: isbn
> 
>+    parcel:
>+      pending_orders:
>+        columns:
>+            -
>+              columnname: checkbox
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+            -
>+              columnname: basket
>+            -
>+              columnname: basket_group
>+            -
>+              columnname: order_line
>+            -
>+              columnname: summary
>+            -
>+              columnname: view
>+            -
>+              columnname: replacement_price
>+            -
>+              columnname: quantity
>+            -
>+              columnname: unit_cost
>+            -
>+              columnname: order_cost
>+            -
>+              columnname: fund
>+            -
>+              columnname: actions_1
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+            -
>+              columnname: actions_2
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+
>     basket:
>       orders:
>         default_display_length: 20
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index e9f4f5fc7a4..ee605f66d63 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -2,6 +2,7 @@
> [% USE Asset %]
> [% USE Koha %]
> [% USE KohaDates %]
>+[% USE TablesSettings %]
> [% USE Price %]
> [% PROCESS 'i18n.inc' %]
> [% SET footerjs = 1 %]
>@@ -669,7 +670,9 @@
>                 "orderable": false
>             });
> 
>-            var pending_orders_table = $("#pending_orders").kohaTable(options, {}, 1, { "basket.vendor_id": [% booksellerid | html %] });
>+            let table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'parcel', 'pending_orders', 'json' ) | $raw %];
>+
>+            var pending_orders_table = $("#pending_orders").kohaTable(options, table_settings, 1, { "basket.vendor_id": [% booksellerid | html %] });
> 
>             var api = pending_orders_table.api();
>             api.on('draw', function () {
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33484: 149444 | 149445 | 149447 | 149448 | 149449 | 149925 | 149926 | 149927 | 149928 | 149929 | 149930 | 149974 | 149975 | 149976 | 149977 | 149978 | 149979 | 173443 | 173444 | 173445 | 173446 | 173447 | 173448 | 173449 | 173450 | 173451 | 173452 | 173453 | 173454 | 173455 | 173456 | 173457 | 173458 | 173459 | 173460 | 173461 | 173462 | 173463 | 173464 | 173465 | 173466 | 173467 | 173468 | 173469 | 173470 | 173471 | 173472 | 173473 | 173474 | 173475 | 173476 | 173477 | 173478 | 173479 | 173480 | 173481 | 173482 | 173483 | 173484 | 173485 | 173486 | 173546 | 173606 | 173607 | 173985 | 174219