View | Details | Raw Unified | Return to bug 38010
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue (+10 lines)
Lines 17-22 export default { Link Here
17
        const permissionsStore = inject("permissionsStore")
17
        const permissionsStore = inject("permissionsStore")
18
        const { isUserPermitted } = permissionsStore
18
        const { isUserPermitted } = permissionsStore
19
19
20
        const format_date = $date
21
20
        const table_id = "vendor_contracts_table"
22
        const table_id = "vendor_contracts_table"
21
        useDataTable(table_id)
23
        useDataTable(table_id)
22
24
Lines 24-29 export default { Link Here
24
            isUserPermitted,
26
            isUserPermitted,
25
            table_id,
27
            table_id,
26
            escape_str,
28
            escape_str,
29
            format_date,
27
        }
30
        }
28
    },
31
    },
29
    methods: {
32
    methods: {
Lines 31-36 export default { Link Here
31
            let contracts = this.vendor.contracts
34
            let contracts = this.vendor.contracts
32
            let table_id = this.table_id
35
            let table_id = this.table_id
33
            let isUserPermitted = this.isUserPermitted
36
            let isUserPermitted = this.isUserPermitted
37
            let format_date = this.format_date
34
38
35
            $.fn.dataTable.ext.search = $.fn.dataTable.ext.search.filter(
39
            $.fn.dataTable.ext.search = $.fn.dataTable.ext.search.filter(
36
                search => search.name != "apply_filter"
40
                search => search.name != "apply_filter"
Lines 71-82 export default { Link Here
71
                            data: "contractstartdate",
75
                            data: "contractstartdate",
72
                            searchable: false,
76
                            searchable: false,
73
                            orderable: false,
77
                            orderable: false,
78
                            render: function (data, type, row, meta) {
79
                                return format_date(row.contractstartdate)
80
                            },
74
                        },
81
                        },
75
                        {
82
                        {
76
                            title: __("End date"),
83
                            title: __("End date"),
77
                            data: "contractenddate",
84
                            data: "contractenddate",
78
                            searchable: false,
85
                            searchable: false,
79
                            orderable: false,
86
                            orderable: false,
87
                            render: function (data, type, row, meta) {
88
                                return format_date(row.contractenddate)
89
                            },
80
                        },
90
                        },
81
                        ...(isUserPermitted(
91
                        ...(isUserPermitted(
82
                            "CAN_user_acquisition_contracts_manage"
92
                            "CAN_user_acquisition_contracts_manage"
(-)a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue (-3 / +2 lines)
Lines 52-62 Link Here
52
            </li>
52
            </li>
53
            <li v-if="vendor.deliverytime">
53
            <li v-if="vendor.deliverytime">
54
                <label>{{ $__("Delivery time") }}:</label>
54
                <label>{{ $__("Delivery time") }}:</label>
55
                <span> {{ vendor.deliverytime }} days </span>
55
                <span> {{ vendor.deliverytime + " " + $__("days") }}</span>
56
            </li>
56
            </li>
57
            <li v-if="vendor.notes">
57
            <li v-if="vendor.notes">
58
                <label>{{ $__("Notes") }}:</label>
58
                <label>{{ $__("Notes") }}:</label>
59
                <span> {{ vendor.notes }} days </span>
59
                <span> {{ vendor.notes }}</span>
60
            </li>
60
            </li>
61
        </ol>
61
        </ol>
62
    </fieldset>
62
    </fieldset>
63
- 

Return to bug 38010