From cf964849ce6091707cb5c68feba6fe7f39c00431 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 17 Sep 2024 12:29:33 +0000 Subject: [PATCH] Bug 38010: Add authorised values Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- .../prog/js/vue/components/Vendors/Main.vue | 59 +------------------ .../vue/components/Vendors/VendorDetails.vue | 12 +++- .../components/Vendors/VendorInterfaces.vue | 4 +- .../js/vue/components/Vendors/VendorShow.vue | 4 -- .../prog/js/vue/modules/vendors.ts | 2 +- 5 files changed, 18 insertions(+), 63 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue index 81bbbb7f035..c26cfead33c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue @@ -37,19 +37,17 @@ import { APIClient } from "../../fetch/api-client"; export default { setup() { const vendorStore = inject("vendorStore"); - - const AVStore = inject("AVStore"); + const { config } = storeToRefs(vendorStore); const mainStore = inject("mainStore"); - const { loading, loaded, setError } = mainStore; + const AVStore = inject("AVStore"); const permissionsStore = inject("permissionsStore"); const { userPermissions } = storeToRefs(permissionsStore); return { vendorStore, - AVStore, setError, loading, loaded, @@ -99,61 +97,10 @@ export default { this.initialized = true; }); }, - beforeCreate() { - this.loading(); - - const fetchConfig = () => { - let promises = []; - - const av_client = APIClient.authorised_values; - const authorised_values = { - vendor_types: "VENDOR_TYPE", - vendor_interface_types: "VENDOR_INTERFACE_TYPE", - vendor_payment_methods: "VENDOR_PAYMENT_METHOD", - lang: "LANG", - }; - - let av_cat_array = Object.keys(authorised_values).map( - function (av_cat) { - return '"' + authorised_values[av_cat] + '"'; - } - ); - - promises.push( - av_client.values - .getCategoriesWithValues(av_cat_array) - .then(av_categories => { - Object.entries(authorised_values).forEach( - ([av_var, av_cat]) => { - const av_match = av_categories.find( - element => element.category_name == av_cat - ); - this.AVStore[av_var] = - av_match.authorised_values; - } - ); - }) - ); - - return Promise.all(promises); - }; - - fetchConfig().then(() => { - this.vendorStore.currencies = currencies; - this.vendorStore.gstValues = gstValues.map(gv => { - return { - label: `${(gv.option * 100).toFixed(2)}%`, - value: gv.option, - }; - }); - this.loaded(); - this.initialized = true; - }); - }, data() { this.userPermissions = userPermissions; return { - initialized: true, + initialized: false, }; }, methods: {}, diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue index 042c7465e66..710f5f4f4d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue @@ -7,7 +7,7 @@
  • - {{ vendor.type }} + {{ get_lib_from_av("vendor_types", vendor.type) }}
  • @@ -68,10 +68,20 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue index 4bfa8043fc2..957ef73ba35 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue @@ -7,7 +7,9 @@ {{ vi.name }}
  • - NEED AUTHORISED VALUES + + {{ get_lib_from_av("vendor_interface_types", vi.type) }} +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue index 56046c19e56..3458e8e2db7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue @@ -67,13 +67,9 @@ export default { const { setConfirmationDialog, setMessage } = inject("mainStore"); - // const AVStore = inject("AVStore") - // const { get_lib_from_av } = AVStore - return { format_date, patron_to_html, - // get_lib_from_av, setConfirmationDialog, setMessage, }; diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/vendors.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/vendors.ts index 9424ae0b00c..99edd35a198 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/vendors.ts +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/vendors.ts @@ -21,7 +21,7 @@ import { routes as routesDef } from "../routes/vendors"; import { useMainStore } from "../stores/main"; import { useVendorStore } from "../stores/vendors"; -import { useAVStore } from "../stores/authorised-values"; +import { useAVStore } from "../stores/authorisedValues/authorised-values"; import { useNavigationStore } from "../stores/navigation"; import { usePermissionsStore } from "../stores/permissions"; import i18n from "../i18n"; -- 2.34.1