Merge pull request #13 from alextselegidis/develop

Develop

application/controllers/Booking.php

@@ -385,6 +385,7 @@ public function register(): void
                 $customer['id'] = $this->customers_model->find_record_id($customer);
 
                 $existing_appointments = $this->appointments_model->get([
+                    'id !=' => $manage_mode ? $appointment['id'] : null,
                     'id_users_customer' => $customer['id'],
                     'start_datetime <=' => $appointment['start_datetime'],
                     'end_datetime >=' => $appointment['end_datetime'],

application/language/arabic/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/bulgarian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/catalan/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/chinese/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/croatian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/czech/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/danish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/dutch/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/english/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/estonian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/finnish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/french/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/german/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP-DN';
 $lang['role'] = 'Rolle';
 $lang['at_least_one_field_required'] = 'Mindestens ein Feld muss auf der Buchungsseite als erforderlich gekennzeichnet sein.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/greek/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Ρόλος';
 $lang['at_least_one_field_required'] = 'Τουλάχιστον ένα πεδίο πρέπει να έχει οριστεί ως υποχρεωτικό στη σελίδα κράτησης.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/hebrew/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/hindi/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/hungarian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/italian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/japanese/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/luxembourgish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/marathi/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/persian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/polish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/portuguese-br/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/portuguese/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/romanian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/russian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/serbian/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/slovak/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/spanish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/swedish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/thai/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End

application/language/turkish/translations_lang.php

@@ -478,4 +478,5 @@
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Role';
 $lang['at_least_one_field_required'] = 'At least one field must be set as required in the booking page.';
+$lang['customer_is_already_booked'] = 'This customer already has an appointment during the requested reservation period.';
 // End