Merge pull request #12 from alextselegidis/develop

Develop

application/config/app.php

@@ -9,10 +9,10 @@
 |
 */
 
-$config['version'] = '1.5.0-dev.4'; // This must be changed manually.
+$config['version'] = '1.5.0-alpha.1'; // This must be changed manually.
 
 $config['url'] = Config::BASE_URL;
 
 $config['debug'] = Config::DEBUG_MODE;
 
-$config['cache_busting_token'] = 'ZV951';
+$config['cache_busting_token'] = 'ZV952';

application/language/arabic/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/bulgarian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/catalan/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/chinese/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/croatian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/czech/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/danish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/dutch/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/english/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/estonian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/finnish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/french/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/german/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Importieren';
 $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.';
 // End

application/language/greek/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Εισαγωγή';
 $lang['ldap_dn'] = 'LDAP DN';
 $lang['role'] = 'Ρόλος';
+$lang['at_least_one_field_required'] = 'Τουλάχιστον ένα πεδίο πρέπει να έχει οριστεί ως υποχρεωτικό στη σελίδα κράτησης.';
 // End

application/language/hebrew/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/hindi/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/hungarian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/italian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/japanese/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/luxembourgish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/marathi/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/persian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/polish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/portuguese-br/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/portuguese/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/romanian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/russian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/serbian/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/slovak/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/spanish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/swedish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/thai/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/language/turkish/translations_lang.php

@@ -477,4 +477,5 @@
 $lang['import'] = 'Import';
 $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.';
 // End

application/migrations/056_add_id_caldav_calendar_column_to_appointments_table.php

@@ -22,7 +22,7 @@ public function up()
             $fields = [
                 'id_caldav_calendar' => [
                     'type' => 'TEXT',
-                    'default' => '',
+                    'null' => null,
                     'after' => 'id_google_calendar',
                 ],
             ];

application/views/pages/installation.php

@@ -24,7 +24,7 @@
 <div class="content container">
     <div class="welcome">
         <h3>Welcome to the Easy!Appointments installation page.</h3>
-        <p><details>
+        <p>
             This page will help you set the main settings of your Easy!Appointments installation. You will be able to
             edit these settings and many more in the backend session of your system. Remember to use the
             <strong class="text-primary"><?= site_url('user/login') ?></strong> URL to connect to the backend section
@@ -36,7 +36,7 @@
             submit new issues on
             <a href="https://github.com/alextselegidis/easyappointments/issues">GitHub Issues</a>
             in order to help our development process.
-        </details></p>
+        </p>
     </div>
 
     <div class="alert" hidden></div>
@@ -107,12 +107,14 @@
                     <span class="text-danger">*</span>
                 </label>
                 <select id="language" class="form-control required">
-                    <?php $config_lang = config('language');
+                    <?php
+                    $config_lang = config('language');
                     foreach (vars('available_languages') as $lang): ?>
-                        <option value="<?= $lang ?>"<?= ($lang == $config_lang ?' selected':'') ?>>
+                        <option value="<?= $lang ?>"<?= $lang == $config_lang ? ' selected' : '' ?>>
                             <?= ucfirst($lang) ?>
                         </option>
-                    <?php endforeach; ?>
+                    <?php endforeach;
+                    ?>
                 </select>
             </div>
 

assets/js/pages/booking_settings.js

@@ -52,6 +52,12 @@ App.Pages.BookingSettings = (function () {
                 throw new Error(lang('at_least_one_field'));
             }
 
+            // Ensure there is at least one field required.
+
+            if (!$('.require-switch:checked').length) {
+                throw new Error(lang('at_least_one_field_required'));
+            }
+
             return false;
         } catch (error) {
             App.Layouts.Backend.displayNotification(error.message);