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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-1 / +3 lines)
Lines 502-508 Link Here
502
[% MACRO jsinclude BLOCK %]
502
[% MACRO jsinclude BLOCK %]
503
    [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
503
    [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
504
    [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
504
    [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
505
    [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %]
505
    <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
506
    <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
507
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
506
    [% INCLUDE 'calendar.inc' %]
508
    [% INCLUDE 'calendar.inc' %]
507
    <script>
509
    <script>
508
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
510
        let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
Lines 538-544 Link Here
538
540
539
                var currentDate = $(this).val();
541
                var currentDate = $(this).val();
540
542
541
                let selectedDate = dayjs(currentDate);
543
                let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase());
542
544
543
                let pickupSlots = [];
545
                let pickupSlots = [];
544
                let available_count = 0;
546
                let available_count = 0;
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc (+14 lines)
Lines 32-37 Link Here
32
        default:
32
        default:
33
            flatpickr_dateformat_string = "Y-m-d";
33
            flatpickr_dateformat_string = "Y-m-d";
34
    }
34
    }
35
36
    function get_dateformat_str(dateformat) {
37
        var dateformat_str;
38
        if (dateformat == 'us') {
39
            dateformat_str = 'mm/dd/yyyy';
40
        } else if (dateformat == 'metric') {
41
            dateformat_str = 'dd/mm/yyyy';
42
        } else if (dateformat == 'iso') {
43
            dateformat_str = 'yyyy-mm-dd';
44
        } else if (dateformat == 'dmydot') {
45
            dateformat_str = 'dd.mm.yyyy';
46
        }
47
        return dateformat_str;
48
    }
35
</script>
49
</script>
36
[% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %]
50
[% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %]
37
<script>
51
<script>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt (-2 / +3 lines)
Lines 218-224 Link Here
218
[% BLOCK jsinclude %]
218
[% BLOCK jsinclude %]
219
    [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
219
    [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
220
    [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
220
    [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
221
    [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %]
221
    <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
222
    <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
223
    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
222
    [% INCLUDE 'calendar.inc' %]
224
    [% INCLUDE 'calendar.inc' %]
223
    <script>
225
    <script>
224
        [% SET pickup_exists_in = [] %]
226
        [% SET pickup_exists_in = [] %]
Lines 298-304 Link Here
298
            let branchcode = $("#pickup-branch").val();
300
            let branchcode = $("#pickup-branch").val();
299
            let policy = policies[branchcode];
301
            let policy = policies[branchcode];
300
302
301
            let selectedDate = dayjs(currentDate);
303
            let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase());
302
304
303
            let pickupSlots = [];
305
            let pickupSlots = [];
304
            let available_count = 0;
306
            let available_count = 0;
305
- 

Return to bug 30650