From 781178bcd09bb174f985ad1131c2be48c1c6dae2 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Fri, 6 Dec 2024 15:40:49 +0000 Subject: [PATCH] Bug 38010: Apply format_date to vendor contracts --- .../prog/js/vue/components/Vendors/VendorContracts.vue | 10 ++++++++++ .../components/Vendors/VendorOrderingInformation.vue | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue index dcac399e8b8..ce1916db5c8 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue @@ -17,6 +17,8 @@ export default { const permissionsStore = inject("permissionsStore"); const { isUserPermitted } = permissionsStore; + const format_date = $date; + const table_id = "vendor_contracts_table"; useDataTable(table_id); @@ -24,6 +26,7 @@ export default { isUserPermitted, table_id, escape_str, + format_date, }; }, methods: { @@ -31,6 +34,7 @@ export default { let contracts = this.vendor.contracts; let table_id = this.table_id; let isUserPermitted = this.isUserPermitted; + let format_date = this.format_date; $.fn.dataTable.ext.search = $.fn.dataTable.ext.search.filter( search => search.name != "apply_filter" @@ -71,12 +75,18 @@ export default { data: "contractstartdate", searchable: false, orderable: false, + render: function (data, type, row, meta) { + return format_date(row.contractstartdate); + }, }, { title: __("End date"), data: "contractenddate", searchable: false, orderable: false, + render: function (data, type, row, meta) { + return format_date(row.contractenddate); + }, }, ...(isUserPermitted( "CAN_user_acquisition_contracts_manage" diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue index 74c2630ffda..d24b353e6a4 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue @@ -52,11 +52,11 @@
  • - {{ vendor.deliverytime }} days + {{ vendor.deliverytime + " " + $__("days") }}
  • - {{ vendor.notes }} days + {{ vendor.notes }}
  • -- 2.48.1