Add pre and post service buffer time, so that availability gets generated with the required "gaps" depending on the selected service

application/controllers/Services.php

@@ -34,6 +34,8 @@ class Services extends EA_Controller
         'is_private',
         'id_service_categories',
         'providers',
+        'buffer_before',
+        'buffer_after',
     ];
     public array $optional_service_fields = [
         'id_service_categories' => null,

application/libraries/Availability.php

@@ -556,6 +556,12 @@ protected function generate_available_hours(string $date, array $service, array
 
             $current_hour = $start_hour;
 
+            $buffer_before = new DateInterval('PT' . (int) $service['buffer_before'] . 'M');
+            $current_hour->add($buffer_before);
+
+            $buffer_after = new DateInterval('PT' . (int) $service['buffer_after'] . 'M');
+            $end_hour->sub($buffer_after);
+
             $diff = $current_hour->diff($end_hour);
 
             while ($diff->h * 60 + $diff->i >= (int) $service['duration'] && $diff->invert === 0) {

application/migrations/061_add_buffer_columns_to_service_table.php

@@ -0,0 +1,55 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+/* ----------------------------------------------------------------------------
+ * Easy!Appointments - Online Appointment Scheduler
+ *
+ * @package     EasyAppointments
+ * @author      A.Tselegidis <alextselegidis@gmail.com>
+ * @copyright   Copyright (c) Alex Tselegidis
+ * @license     https://opensource.org/licenses/GPL-3.0 - GPLv3
+ * @link        https://easyappointments.org
+ * @since       v1.5.0
+ * ---------------------------------------------------------------------------- */
+
+class Migration_Add_buffer_columns_to_service_table extends EA_Migration
+{
+    /**
+     * Upgrade method.
+     */
+    public function up(): void
+    {
+        if (!$this->db->field_exists('buffer_before', 'services')) {
+            $this->dbforge->add_column('services', [
+                'buffer_before' => [
+                    'type'       => 'INT',
+                    'constraint' => 11,
+                    'null'       => true,
+                ],
+            ]);
+        }
+
+        if (!$this->db->field_exists('buffer_after', 'services')) {
+            $this->dbforge->add_column('services', [
+                'buffer_after' => [
+                    'type'       => 'INT',
+                    'constraint' => 11,
+                    'null'       => true,
+                ],
+            ]);
+        }
+    }
+
+    /**
+     * Downgrade method.
+     */
+    public function down(): void
+    {
+        if ($this->db->field_exists('buffer_before', 'services')) {
+            $this->dbforge->drop_column('services', 'buffer_before');
+        }
+
+        if ($this->db->field_exists('buffer_after', 'services')) {
+            $this->dbforge->drop_column('services', 'buffer_after');
+        }
+    }
+}

application/models/Admins_model.php

@@ -91,7 +91,11 @@ public function validate(array $admin): void
         }
 
         // Make sure all required fields are provided.
-        if (empty($admin['first_name']) || empty($admin['last_name']) || empty($admin['email'])) {
+        if (
+            empty($admin['first_name']) ||
+            empty($admin['last_name']) ||
+            empty($admin['email'])
+        ) {
             throw new InvalidArgumentException('Not all required fields are provided: ' . print_r($admin, true));
         }
 

application/models/Appointments_model.php

@@ -220,7 +220,49 @@ protected function insert(array $appointment): int
             throw new RuntimeException('Could not insert appointment.');
         }
 
-        return $this->db->insert_id();
+        $appointment_id = $this->db->insert_id();
+
+        $service = $this->db->get_where('services', ['id' => $appointment['id_services']])->row_array();
+        if (!$service) {
+            throw new RuntimeException('Could not find the service for the appointment.');
+        }
+
+        $bufferBefore = $service['buffer_before'];
+        $bufferAfter = $service['buffer_after'];
+
+        if($bufferBefore > 0) {
+            $bufferBefore = $bufferBefore * 60;
+            $unavailability['start_datetime'] = date('Y-m-d H:i:s', strtotime($appointment['start_datetime']) - $bufferBefore);
+            $unavailability['end_datetime'] = $appointment['start_datetime'];
+            $unavailability['book_datetime'] = $appointment['book_datetime'];
+            $unavailability['create_datetime'] = $appointment['create_datetime'];
+            $unavailability['update_datetime'] = $appointment['update_datetime'];
+            $unavailability['hash'] = random_string('alnum', 12);
+            $unavailability['is_unavailability'] = true;
+            $unavailability['id_users_provider'] = $appointment['id_users_provider'];
+
+            if (!$this->db->insert('appointments', $unavailability)) {
+                throw new RuntimeException('Could not insert unavailability.');
+            }
+        }
+
+        if($bufferAfter > 0) {
+            $bufferAfter = $bufferAfter * 60;
+            $unavailability['start_datetime'] = $appointment['end_datetime'];
+            $unavailability['end_datetime'] = date('Y-m-d H:i:s', strtotime($appointment['end_datetime']) + $bufferAfter);
+            $unavailability['book_datetime'] = $appointment['book_datetime'];
+            $unavailability['create_datetime'] = $appointment['create_datetime'];
+            $unavailability['update_datetime'] = $appointment['update_datetime'];
+            $unavailability['hash'] = random_string('alnum', 12);
+            $unavailability['is_unavailability'] = true;
+            $unavailability['id_users_provider'] = $appointment['id_users_provider'];
+
+            if (!$this->db->insert('appointments', $unavailability)) {
+                throw new RuntimeException('Could not insert unavailability.');
+            }
+        }
+
+        return $appointment_id;
     }
 
     /**

application/models/Services_model.php

@@ -47,6 +47,8 @@ class Services_model extends EA_Model
         'attendantsNumber' => 'attendants_number',
         'isPrivate' => 'is_private',
         'serviceCategoryId' => 'id_service_categories',
+        'bufferBefore' => 'buffer_before',
+        'bufferAfter' => 'buffer_after',
     ];
 
     /**

application/views/pages/services.php

@@ -80,6 +80,22 @@
                        disabled>
             </div>
 
+            <div class="mb-3">
+                <label class="form-label" for="buffer-before">
+                    <?= lang('buffer-before') ?>
+                    <span class="text-danger" hidden>*</span>
+                </label>
+                <input id="buffer-before" class="form-control" type="number" disabled>
+            </div>
+
+            <div class="mb-3">
+                <label class="form-label" for="buffer-after">
+                    <?= lang('buffer-after') ?>
+                    <span class="text-danger" hidden>*</span>
+                </label>
+                <input id="buffer-after" class="form-control" type="number" disabled>
+            </div>
+
             <div class="mb-3">
                 <label class="form-label" for="price">
                     <?= lang('price') ?>

assets/js/pages/installation.js

@@ -90,6 +90,10 @@ App.Pages.Installation = (function () {
             let missingRequired = false;
 
             $fields.each((index, field) => {
+                // Skip phone number field from required check
+                if ($(field).attr('id') === 'phone-number') {
+                    return;
+                }
                 if (!$(field).val()) {
                     $(field).addClass('is-invalid');
                     missingRequired = true;

assets/js/pages/services.js

@@ -29,6 +29,8 @@ App.Pages.Services = (function () {
     const $description = $('#description');
     const $filterServices = $('#filter-services');
     const $color = $('#color');
+    const $bufferBefore = $('#buffer-before');
+    const $bufferAfter = $('#buffer-after');
     let filterResults = {};
     let filterLimit = 20;
 
@@ -127,6 +129,8 @@ App.Pages.Services = (function () {
             $serviceCategoryId.val('');
             $slotInterval.val('15');
             $attendantsNumber.val('1');
+            $bufferBefore.val('0');
+            $bufferAfter.val('0');
         });
 
         /**
@@ -161,6 +165,8 @@ App.Pages.Services = (function () {
                 attendants_number: $attendantsNumber.val(),
                 is_private: Number($isPrivate.prop('checked')),
                 id_service_categories: $serviceCategoryId.val() || undefined,
+                buffer_before: $bufferBefore.val(),
+                buffer_after: $bufferAfter.val(),
             };
 
             // Include service providers.
@@ -349,6 +355,8 @@ App.Pages.Services = (function () {
         $attendantsNumber.val(service.attendants_number);
         $isPrivate.prop('checked', service.is_private);
         App.Components.ColorSelection.setColor($color, service.color);
+        $bufferBefore.val(service.buffer_before);
+        $bufferAfter.val(service.buffer_after);
 
         const serviceCategoryId = service.id_service_categories !== null ? service.id_service_categories : '';
         $serviceCategoryId.val(serviceCategoryId);