From 0a94b02139e35a03b3a0b16e273f1db756d5b9d8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 5 May 2025 10:33:34 +0200 Subject: [PATCH] Bug 38010: Embed invoices_count - fix patron deletion from show view Signed-off-by: Jonathan Druart --- api/v1/swagger/paths/acquisitions_vendors.yaml | 1 + .../intranet-tmpl/prog/js/fetch/acquisition-api-client.js | 2 +- t/db_dependent/api/v1/acquisitions_vendors.t | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/v1/swagger/paths/acquisitions_vendors.yaml b/api/v1/swagger/paths/acquisitions_vendors.yaml index 7290fba1e9b..a7ba8450f62 100644 --- a/api/v1/swagger/paths/acquisitions_vendors.yaml +++ b/api/v1/swagger/paths/acquisitions_vendors.yaml @@ -151,6 +151,7 @@ - aliases - baskets+count - subscriptions+count + - invoices+count - interfaces - contacts - contracts diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js index fad44c00a75..7c33723e04c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js +++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js @@ -21,7 +21,7 @@ export class AcquisitionAPIClient { endpoint: "vendors/" + id, headers: { "x-koha-embed": - "aliases,subscriptions+count,interfaces,contacts,contracts,baskets+count", + "aliases,subscriptions+count,interfaces,contacts,contracts,baskets+count,invoices+count", }, }), getAll: (query, params) => diff --git a/t/db_dependent/api/v1/acquisitions_vendors.t b/t/db_dependent/api/v1/acquisitions_vendors.t index 9be30b29c4c..8574bbd7d9b 100755 --- a/t/db_dependent/api/v1/acquisitions_vendors.t +++ b/t/db_dependent/api/v1/acquisitions_vendors.t @@ -124,7 +124,7 @@ subtest 'list() and delete() tests | authorized user' => sub { subtest 'get() test' => sub { - plan tests => 9; + plan tests => 14; $schema->storage->txn_begin; @@ -146,6 +146,12 @@ subtest 'get() test' => sub { $t->get_ok( "//$userid:$password@/api/v1/acquisitions/vendors/" . $vendor->id )->status_is(200) ->json_is( $vendor->to_api ); + $t->get_ok( "//$userid:$password@/api/v1/acquisitions/vendors/" + . $vendor->id => { 'x-koha-embed' => 'subscriptions+count,baskets+count,invoices+count' } )->status_is(200) + ->json_has( '/subscriptions_count', 'subscriptions_count is embedded' ) + ->json_has( '/baskets_count', 'baskets_count is embedded' ) + ->json_has( '/invoices_count', 'invoices_count is embedded' ); + $t->get_ok( "//$userid:$password@/api/v1/acquisitions/vendors/" . $non_existent_id )->status_is(404) ->json_is( '/error' => 'Vendor not found' ); -- 2.34.1