gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 38010: Apply format_date to vendor contracts 

Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Matt Blenkinsop 2024-12-06 15:40:49 +00:00 committed by Katrin Fischer
parent 251bf0cc10
commit fa6fbd9a89
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue
View File

@ -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"

4
koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue
View File

@ -52,11 +52,11 @@
</li>
<li v-if="vendor.deliverytime">
<label>{{ $__("Delivery time") }}:</label>
<span> {{ vendor.deliverytime }} days </span>
<span> {{ vendor.deliverytime + " " + $__("days") }}</span>
</li>
<li v-if="vendor.notes">
<label>{{ $__("Notes") }}:</label>
<span> {{ vendor.notes }} days </span>
<span> {{ vendor.notes }}</span>
</li>
</ol>
</fieldset>