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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-3 / +12 lines)
Lines 127-133 Link Here
127
            let refresh_max_date = 0;
127
            let refresh_max_date = 0;
128
            let disable_buttons = [];
128
            let disable_buttons = [];
129
129
130
            if( $(this).data("flatpickr-futuredate") === true ) {
130
            if( $(this).data("flatpickr-futureinclusive") === true
131
             || $(this).data("flatpickr-futuredate") === true ) {
131
                let original_date = $(this).val();
132
                let original_date = $(this).val();
132
                if ( original_date ) {
133
                if ( original_date ) {
133
                    original_date = Date_from_syspref( original_date ).getTime();
134
                    original_date = Date_from_syspref( original_date ).getTime();
Lines 140-149 Link Here
140
                    }];
141
                    }];
141
                }
142
                }
142
                else {
143
                else {
143
                    options['minDate'] = new Date().fp_incr(1);
144
                    if( $(this).data("flatpickr-futureinclusive") === true ) {
145
                        options['minDate'] = new Date().setHours(00, 00, 00, 00);
146
                    } else {
147
                        options['minDate'] = new Date().fp_incr(1);
148
                    }
144
                }
149
                }
150
145
                disable_buttons.push(0); /* Yesterday */
151
                disable_buttons.push(0); /* Yesterday */
146
                disable_buttons.push(1); /* Today */
152
153
                if ( $(this).data("flatpickr-futuredate") === true ) {
154
                    disable_buttons.push(1); /* Today */
155
                }
147
            }
156
            }
148
            if( $(this).data("flatpickr-pastinclusive") === true ) {
157
            if( $(this).data("flatpickr-pastinclusive") === true ) {
149
                options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
158
                options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-1 / +1 lines)
Lines 476-482 Link Here
476
476
477
                                            <li>
477
                                            <li>
478
                                                <label for="pickup_date">Pickup date: </label>
478
                                                <label for="pickup_date">Pickup date: </label>
479
                                                <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futuredate="true" />
479
                                                <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futureinclusive="true" />
480
                                            </li>
480
                                            </li>
481
481
482
                                            <li id="pickup-times" class="radio"></li>
482
                                            <li id="pickup-times" class="radio"></li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc (-3 / +12 lines)
Lines 141-147 Link Here
141
                let refresh_max_date = 0;
141
                let refresh_max_date = 0;
142
                let disable_buttons = [];
142
                let disable_buttons = [];
143
143
144
                if( $(this).data("flatpickr-futuredate") === true ) {
144
                if( $(this).data("flatpickr-futureinclusive") === true
145
                 || $(this).data("flatpickr-futuredate") === true ) {
145
                    let original_date = $(this).val();
146
                    let original_date = $(this).val();
146
                    if ( original_date ) {
147
                    if ( original_date ) {
147
                        original_date = Date_from_syspref( original_date ).getTime();
148
                        original_date = Date_from_syspref( original_date ).getTime();
Lines 154-163 Link Here
154
                        }];
155
                        }];
155
                    }
156
                    }
156
                    else {
157
                    else {
157
                        options['minDate'] = new Date().fp_incr(1);
158
                        if( $(this).data("flatpickr-futureinclusive") === true ) {
159
                            options['minDate'] = new Date().setHours(00, 00, 00, 00);
160
                        } else {
161
                            options['minDate'] = new Date().fp_incr(1);
162
                        }
158
                    }
163
                    }
164
159
                    disable_buttons.push(0); /* Yesterday */
165
                    disable_buttons.push(0); /* Yesterday */
160
                    disable_buttons.push(1); /* Today */
166
167
                    if ( $(this).data("flatpickr-futuredate") === true ) {
168
                        disable_buttons.push(1); /* Today */
169
                    }
161
                }
170
                }
162
                if( $(this).data("flatpickr-pastinclusive") === true ) {
171
                if( $(this).data("flatpickr-pastinclusive") === true ) {
163
                    options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
172
                    options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt (-4 / +3 lines)
Lines 242-250 Link Here
242
                                                    <div class="required_label required">Required</div>
242
                                                    <div class="required_label required">Required</div>
243
                                                </li>
243
                                                </li>
244
                                                <li id="pickup_date_item">
244
                                                <li id="pickup_date_item">
245
                                                    <label for="pickup-date">Pickup date:</label>
245
                                                    <label for="pickup_date">Pickup date:</label>
246
                                                    <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futuredate="true" />
246
                                                    <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futureinclusive="true" />
247
                                                    <div class="required_label required">Required</div>
247
                                                    <span class="required">Required</span>
248
                                                </li>
248
                                                </li>
249
249
250
                                                <li id="pickup-times"></li>
250
                                                <li id="pickup-times"></li>
251
- 

Return to bug 31261