From da4dc4a66d2f865fdc39e2261b49cb28826b6a40 Mon Sep 17 00:00:00 2001
From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk>
Date: Wed, 2 Jul 2025 11:44:00 +0100
Subject: [PATCH] Bug 38201: Restore dropdown buttons to vendor show

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../js/vue/components/DropdownButtons.vue     | 10 +--
 .../prog/js/vue/components/Link.vue           |  2 +-
 .../prog/js/vue/components/Toolbar.vue        |  9 +-
 .../vue/components/Vendors/VendorResource.vue | 83 ++++++++++++++++++-
 .../prog/js/vue/composables/base-resource.js  | 12 ++-
 5 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/DropdownButtons.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/DropdownButtons.vue
index d90d31b1ec..009ce57db7 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/DropdownButtons.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/DropdownButtons.vue
@@ -7,11 +7,11 @@
             ><i class="fa fa-plus"></i> {{ title }}</a
         >
         <ul class="dropdown-menu">
-            <li v-for="(item, index) in items" :key="index">
+            <li v-for="(button, index) in dropdownButtons" :key="index">
                 <ToolbarButton
-                    :to="item.to"
-                    :title="$__(item.title)"
-                    :callback="item.callback"
+                    :to="button.to"
+                    :title="$__(button.title)"
+                    :callback="button.callback"
                     :cssClass="'dropdown-item'"
                 />
             </li>
@@ -24,7 +24,7 @@ import ToolbarButton from "./ToolbarButton.vue";
 
 export default {
     components: { ToolbarButton },
-    props: ["items", "title"],
+    props: ["dropdownButtons", "title"],
 };
 </script>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Link.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Link.vue
index b50b023429..b1a8fb6487 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Link.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Link.vue
@@ -85,7 +85,7 @@ export default {
                     : redirectParams
             );
         };
-        return { redirect };
+        return { redirect, handleQuery, formatUrl };
     },
     emits: ["go-to-add-resource", "delete-resource", "go-to-edit-resource"],
     name: "Link",
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue
index 8f967166fa..4a4b0bfea6 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Toolbar.vue
@@ -13,7 +13,11 @@
                     componentPropData
                 )"
             >
-                <ToolbarButton v-bind="{ ...button }" />
+                <DropdownButtons
+                    v-if="button.dropdownButtons"
+                    v-bind="{ ...button }"
+                />
+                <ToolbarButton v-else v-bind="{ ...button }" />
             </template>
         </template>
         <slot></slot>
@@ -23,6 +27,7 @@
 <script>
 import { computed, useTemplateRef, watch } from "vue";
 import ToolbarButton from "./ToolbarButton.vue";
+import DropdownButtons from "./DropdownButtons.vue";
 export default {
     props: {
         toolbarButtons: Function,
@@ -34,7 +39,7 @@ export default {
             default: false,
         },
     },
-    components: { ToolbarButton },
+    components: { ToolbarButton, DropdownButtons },
     name: "Toolbar",
     setup(props) {
         const toolbar = computed(() => {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue
index 7388c32bc6..a5887a8c44 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue
@@ -30,7 +30,7 @@ export default {
 
         const additionalToolbarButtons = (resource, componentData) => {
             const { instancedResource } = componentData;
-            return {
+            const buttons = {
                 form: [
                     {
                         title: $__("Save"),
@@ -46,6 +46,86 @@ export default {
                         cssClass: "btn btn-link",
                     },
                 ],
+                show: [
+                    {
+                        dropdownButtons: [
+                            {
+                                to: {
+                                    path: "/cgi-bin/koha/acqui/basketheader.pl",
+                                    query: {
+                                        booksellerid: resource.id,
+                                        op: "add_form",
+                                    },
+                                },
+                                title: "Basket",
+                                callback: toolbarComponent => {
+                                    const url = toolbarComponent.handleQuery(
+                                        toolbarComponent.to
+                                    );
+                                    toolbarComponent.redirect(url);
+                                },
+                            },
+                            {
+                                to: {
+                                    path: "/cgi-bin/koha/admin/aqcontract.pl",
+                                    query: {
+                                        booksellerid: resource.id,
+                                        op: "add_form",
+                                    },
+                                },
+                                title: "Contract",
+                                callback: toolbarComponent => {
+                                    const url = toolbarComponent.handleQuery(
+                                        toolbarComponent.to
+                                    );
+                                    toolbarComponent.redirect(url);
+                                },
+                            },
+                            {
+                                to: { name: "VendorFormAdd" },
+                                title: "Vendor",
+                            },
+                        ],
+                        title: $__("New"),
+                        index: -1,
+                    },
+                ],
+            };
+            if (
+                resource.active &&
+                resource.baskets_count > 0 &&
+                instancedResource.isUserPermitted(
+                    "CAN_user_acquisition_order_receive"
+                )
+            ) {
+                buttons.show.push({
+                    to: {
+                        path: "/cgi-bin/koha/acqui/parcels.pl",
+                        query: { booksellerid: resource.id },
+                    },
+                    title: $__("Receive shipments"),
+                    callback: toolbarComponent => {
+                        const url = toolbarComponent.handleQuery(
+                            toolbarComponent.to
+                        );
+                        toolbarComponent.redirect(url);
+                    },
+                    icon: "inbox",
+                });
+            }
+            return buttons;
+        };
+        const defaultToolbarButtons = (defaultButtons, resource) => {
+            return {
+                list: defaultButtons.list,
+                show: defaultButtons.show.filter(
+                    button =>
+                        button.action === "edit" ||
+                        (resource.baskets_count === 0 &&
+                            resource.subscriptions_count === 0 &&
+                            resource.invoices_count === 0 &&
+                            button.action === "delete")
+                ),
             };
         };
 
@@ -74,6 +154,7 @@ export default {
             moduleStore: "vendorStore",
             formGroupsDisplayMode: "accordion",
             additionalToolbarButtons,
+            defaultToolbarButtons,
             stickyToolbar: ["Form"],
             resourceAttrs: [
                 {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js b/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js
index da5b46b3bf..4983a7c4d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/composables/base-resource.js
@@ -516,16 +516,20 @@ export function useBaseResource(instancedResource) {
      */
     const toolbarButtons = computed(() => {
         return (resource, component, componentData) => {
-            const defaultButtons = instancedResource.hasOwnProperty(
+            let defaultButtons = defaultToolbarButtons(resource);
+            defaultButtons = instancedResource.hasOwnProperty(
                 "defaultToolbarButtons"
             )
-                ? instancedResource.defaultToolbarButtons(resource)
-                : defaultToolbarButtons(resource);
+                ? instancedResource.defaultToolbarButtons(
+                      defaultButtons,
+                      resource || {}
+                  )
+                : defaultButtons;
             const additionalButtons = instancedResource.hasOwnProperty(
                 "additionalToolbarButtons"
             )
                 ? instancedResource.additionalToolbarButtons(
-                      resource,
+                      resource || {},
                       componentData
                   )
                 : additionalToolbarButtons(resource, componentData);