Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #12

Merged
merged 4 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions application/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
1 change: 1 addition & 0 deletions application/language/arabic/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/bulgarian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/catalan/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/chinese/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/croatian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/czech/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/danish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/dutch/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/english/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/estonian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/finnish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/french/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/german/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/greek/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -477,4 +477,5 @@
$lang['import'] = 'Εισαγωγή';
$lang['ldap_dn'] = 'LDAP DN';
$lang['role'] = 'Ρόλος';
$lang['at_least_one_field_required'] = 'Τουλάχιστον ένα πεδίο πρέπει να έχει οριστεί ως υποχρεωτικό στη σελίδα κράτησης.';
// End
1 change: 1 addition & 0 deletions application/language/hebrew/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/hindi/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/hungarian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/italian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/japanese/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/luxembourgish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/marathi/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/persian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/polish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/portuguese-br/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/portuguese/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/romanian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/russian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/serbian/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/slovak/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/spanish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/swedish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/thai/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions application/language/turkish/translations_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function up()
$fields = [
'id_caldav_calendar' => [
'type' => 'TEXT',
'default' => '',
'null' => null,
'after' => 'id_google_calendar',
],
];
Expand Down
12 changes: 7 additions & 5 deletions application/views/pages/installation.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
6 changes: 6 additions & 0 deletions assets/js/pages/booking_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down