Commit graph

518 commits

Author SHA1 Message Date
Alex Tselegidis
a9a72e503d Use the default service duration if the user just clicks on a calendar slot for creating a new appointment (#1237) 2022-05-26 14:26:36 +02:00
Alex Tselegidis
ae71c4c89d Make sure the right provider timezone information is displayed in the appointment and unavailability modals 2022-05-24 10:47:56 +02:00
Alex Tselegidis
c84fb2d3db Change the way theme files are loaded, keep only 10 themes 2022-05-22 17:18:44 +02:00
Alex Tselegidis
6666e5862c Support multiple Bootswatch themes for the app (#1205). 2022-05-22 14:39:19 +02:00
Alex Tselegidis
b253a002a8 Do no to overwrite the password when updating the account info 2022-05-20 18:15:14 +02:00
Alex Tselegidis
905dd59425 Allow the user to select their own preferred language (#1263) 2022-05-20 18:15:14 +02:00
Alex Tselegidis
ffb19f113a Do not display the working plan exception option if no direct provider is selected 2022-05-20 18:03:03 +02:00
Alex Tselegidis
0e316e7dea
Merge pull request #1206 from albertsalles4/develop
Fix Datepicker in Backend's Calendar Header does not change accordinly to language and first day #1201
2022-05-10 14:34:25 +02:00
Alex Tselegidis
403edba15f
Merge pull request #1245 from JanC/1244-secreterie-providers
[1244] Fix providers not visible for secretaries
2022-05-10 13:51:44 +02:00
Jan Chaloupecky
b87f7aa1b3 fix providers not visible for secretaries 2022-04-22 15:15:42 +02:00
Jan Chaloupecky
ae171b3ffb Validate email address only when it's set 2022-04-22 14:24:20 +02:00
Alex Tselegidis
c8b6f0fb1c Empty the available hours list before rendering the new time 2022-04-11 13:03:47 +02:00
Alex Tselegidis
ae2fc9ef99 Set overflow-auto to the error message container for better display 2022-03-29 10:49:15 +02:00
Alex Tselegidis
09711853a6 Do not display a message if there's no content 2022-03-29 10:48:55 +02:00
Alex Tselegidis
669aa2f6c6 Add customer language and timezone fields to the appointments modal (#1094) 2022-03-29 10:15:24 +02:00
Alex Tselegidis
942cb3d46f Update the usage of the localization http client across all layouts and pages 2022-03-28 08:33:45 +02:00
Alex Tselegidis
8f66376b74 Move the change change language method to the new localization controller (removed from account) 2022-03-28 08:30:51 +02:00
Alex Tselegidis
2f67141d75 Apply the new add-to-google button for 1.5 2022-03-28 08:18:00 +02:00
Alex Tselegidis
ce028607c2 Remove unnecessary file (post-merge fix) 2022-03-28 08:17:42 +02:00
Alex Tselegidis
e4e285931f Move the consent creation process to when the appointment gets created and not earlier 2022-03-25 12:44:05 +01:00
Alex Tselegidis
eaae61231a Remove no_privileges.css (post-merge) 2022-03-25 10:58:07 +01:00
Alex Tselegidis
a3b8228122 Merge branch 'master' into develop
# Conflicts:
#	application/config/autoload.php
#	application/config/config.php
#	application/controllers/Appointments.php
#	application/controllers/Backend.php
#	application/controllers/Backend_api.php
#	application/controllers/Captcha.php
#	application/controllers/Console.php
#	application/controllers/Google.php
#	application/controllers/Installation.php
#	application/core/EA_Controller.php
#	application/core/EA_Model.php
#	application/libraries/Google_sync.php
#	application/libraries/Ics_file.php
#	application/models/Settings_model.php
#	application/views/appointments/book_success.php
#	assets/css/layouts/backend_layout.scss
#	assets/css/no_privileges.css
#	assets/js/backend_calendar_table_view.js
#	assets/js/backend_calendar_unavailability_events_modal.js
#	assets/js/frontend_book.js
#	assets/js/general_functions.js
#	assets/js/pages/booking_confirmation.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.json
#	composer.lock
#	docs/console.md
#	docs/docker.md
#	docs/faq.md
#	docs/get-involved.md
#	docs/google-calendar-sync.md
#	docs/installation-guide.md
#	docs/manage-translations.md
#	docs/readme.md
#	docs/rest-api.md
#	docs/update-guide.md
#	gulpfile.js
#	system/core/Input.php
#	system/core/Output.php
#	system/core/Security.php
#	system/libraries/Session/drivers/Session_files_driver.php
2022-03-25 10:53:46 +01:00
Alex Tselegidis
13e81c80b1 Make sure the window.cookieconsent object is loaded before using it, as some browsers or extensions might block it 2022-03-08 17:31:33 +01:00
Alex Tselegidis
53993b2994 Do not display empty messages 2022-03-08 17:21:11 +01:00
Alex Tselegidis
09444c1b5e Only show the any-provider option if there are more than one providers 2022-03-08 17:01:25 +01:00
Alex Tselegidis
95fbbeec27 Prepend the any-provider option in the booking page 2022-03-08 17:00:33 +01:00
Alex Tselegidis
1bc02e11c0 Corrected working plan exception removal issue on table view 2022-03-08 16:45:01 +01:00
Alex Tselegidis
803f4e4e7e Reset add-break button disabled state 2022-03-08 16:32:45 +01:00
Alex Tselegidis
42687cb3c5 Correct css file name 2022-03-04 18:41:07 +01:00
Alex Tselegidis
89acfafcce Improve popover handling while reloading appointments 2022-03-02 13:28:20 +01:00
Alex Tselegidis
f7ffb25f05 Replace Google Client JS with the Google Calendar Template link in the book success page (#1216) 2022-02-24 15:38:51 +01:00
Alex Tselegidis
a2b14ac93b Minor style fix in backend.css 2022-02-23 12:54:07 +01:00
Alex Tselegidis
cc5d219311 Provider and secretary users can only add unavailabilities for their authorized users (#1214) 2022-02-23 12:00:39 +01:00
Alex Tselegidis
1cf4f5246f Move the change language operation into a new public controller (#1210) 2022-02-23 11:09:24 +01:00
albertsalles4
1732a39965 Fix Datepicker in Backend's Calendar Header does not change accordinly to language and first day #1201 2022-02-22 12:04:20 +01:00
Alex Tselegidis
ab7ba646a8 Add global JS error handling for HTTP requests. 2022-02-10 20:54:05 +01:00
Alex Tselegidis
0a4ea1c336 Only pre-select the service if its found 2022-02-10 20:34:59 +01:00
Alex Tselegidis
050478492c Make the captcha challenges more user friendly. 2022-01-26 22:04:33 +01:00
Alex Tselegidis
05e6704e67 Secondary info wrapped in small tag and using text-muted class. 2022-01-26 21:27:57 +01:00
Alex Tselegidis
72baa18b86 Prefill the form field though url parameters (#1021). 2022-01-24 23:57:59 +01:00
Alex Tselegidis
9097a968ca Skip the first booking step when only one service and one provider are available (#349). 2022-01-24 23:53:06 +01:00
Alex Tselegidis
4c0793129d The calendar will ask for the kind of event to be added after selecting time slots with the mouse. 2022-01-24 22:55:35 +01:00
Alex Tselegidis
b968970fa6 Correct slot label format for default view. 2022-01-24 22:43:18 +01:00
Alex Tselegidis
b6e9a7209f Select appointment time from within the calendar when "all" select filter item is selected. 2022-01-24 22:40:35 +01:00
Alex Tselegidis
5df3e63055 Correct deserialize general settings method. 2022-01-24 22:38:45 +01:00
Alex Tselegidis
03010184f6 Improve the display of the booking link for services, providers and service-provider combinations. 2022-01-24 22:37:05 +01:00
Alex Tselegidis
42534ffcb3 Service duration values shorter than 5 minutes should be acceptable via the services page (#1110). 2022-01-24 22:09:30 +01:00
Alex Tselegidis
4f5fbb8262 Display appointments from all providers in one view. 2022-01-24 22:07:24 +01:00
Alex Tselegidis
0bbbff47c8 Correct reload call (not in select filter item callback). 2022-01-24 22:00:47 +01:00
Alex Tselegidis
97f98c5118 All the user roles with access to the backend calendar page can filter by service (#956). 2022-01-24 21:57:17 +01:00