Commit graph

1367 commits

Author SHA1 Message Date
Alex Tselegidis
a7eecb1a4c Changed the body background of the helper pages 2020-09-03 14:13:51 +03:00
Alex Tselegidis
1af5dc0774 The backend styling is structured in a mobile-first way. 2020-08-31 20:11:02 +03:00
Alex Tselegidis
4b69cf1797 Further styling for the cancel/delete header rows of the booking page. 2020-08-31 18:34:06 +03:00
Alex Tselegidis
7a496f0166 Added additional styling for the appointment cancellation and customer data removal modals. 2020-08-31 17:26:28 +03:00
Alex Tselegidis
ad320cab52 Responsive corrections for the book success and message pages 2020-08-31 17:09:13 +03:00
Alex Tselegidis
2c330a0a86 The booking page styling is now mobile-first oriented. 2020-08-31 17:02:54 +03:00
Alex Tselegidis
81cfe6a16d Replaced echo statements with php's shortcode syntax 2020-08-31 13:32:58 +03:00
Alex Tselegidis
8f618c3339 Miscellaneous fixes on view files, required after merging the bootstrap 4 codebase 2020-08-31 13:23:10 +03:00
Alex Tselegidis
6cbb13dc2d Replaced the CDN fontawesome version with a local one. 2020-08-15 18:55:35 +03:00
Alex Tselegidis
4cc4437dad Merge branch 'bootstrap-4-and-fontawesome' of https://github.com/janinavelasco9/easyappointments into janinavelasco9-bootstrap-4-and-fontawesome
# Conflicts:
#	application/views/backend/calendar.php
#	assets/js/backend_calendar_extra_periods_modal.js
#	assets/js/backend_customers_helper.js
2020-08-15 18:41:14 +03:00
Alex Tselegidis
fc392e3ccf
Merge pull request #777 from popod/fix-dropdown-disable
Fix disabled bug with insert dropdown in backend.
2020-08-15 16:08:45 +03:00
Alex Tselegidis
6348b1af56
Merge pull request #778 from popod/fix-service-details-display-in-booking-page
Fix display of service details when the service change in the booking process
2020-08-15 16:07:02 +03:00
Alex Tselegidis
65d3243986 Add the appointment has in the stored "dest_url" value when trying to access the calendar page without being logged in first (#804). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
dbc45f6b27 Do not allow appointments being created with duration less than the predefined minimum (#805). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
4f1c39b564 Consider the book advance timeout when generating unavailable dates (#855). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
177375e814
Merge pull request #784 from idstam/swedish-translation
Swedish translations
2020-08-15 15:58:06 +03:00
Alex Tselegidis
39a12a593f Merge branch 'spanish-translation-mejora' of https://github.com/rulosant/easyappointments into rulosant-spanish-translation-mejora 2020-08-15 14:22:30 +03:00
Janina Phillips
33e11291bc
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-07-19 18:56:51 -04:00
Janina Phillips
b6391ab668 fix calendar height to just adjust depending on the content and other fixes 2020-07-01 09:02:11 -04:00
Alex Tselegidis
d8a7318c95 Added missing response variable 2020-07-01 10:16:09 +02:00
Sébastien
a4056eb50b Fix some modal title and "close" button display 2020-06-29 15:31:59 +02:00
Sébastien
e87ef4a4c1 Remove old "glyphicon" icons. 2020-06-29 15:23:51 +02:00
Sébastien
58ad2e43a1 Fix "for" property for "accept to provacy policy" checkbox label in appointment process. 2020-06-29 15:04:41 +02:00
Janina Phillips
63072ead77 fix some bugs 2020-06-19 11:17:31 -04:00
Sébastien
101316a72f Fix: replace invisible class by d-none. 2020-06-19 13:13:08 +02:00
Sébastien
655cafbfc5 Unify btn styling on users page 2020-06-19 13:11:25 +02:00
Sébastien
81934f2d90 Fix: replace all btn-default class by btn-light. 2020-06-19 13:09:22 +02:00
Sébastien
1fa749d16b Fix: replace all label class by badge. 2020-06-19 12:48:18 +02:00
Janina Phillips
1e855182bd hidden is now d-none 2020-06-18 14:37:11 -04:00
Janina Phillips
1bd2647b77 fix some icons and styles 2020-06-18 14:23:16 -04:00
Sébastien
0b3d97ff1f Fix loading item always displayed on the installationn page. 2020-06-17 16:42:29 +02:00
Sébastien
1e6a13d146 Save customer language. 2020-06-16 17:01:27 +02:00
Alex Tselegidis
e857d3a37e Corrected issue with attendants number query 2020-06-14 10:56:35 +02:00
Janina Phillips
2dc94f30c7
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-06-09 10:36:54 -04:00
Sébastien
18d0541114 Improve the "help block" for the book advance timeout field in french. 2020-06-05 20:36:40 +02:00
Sébastien
5a03ecd736 Improve some french translations about book advance timeout. 2020-06-05 20:34:20 +02:00
Sébastien
950738f2fe Redirect clients which are tying to update an appointment during the book advance timeout to a warning page. 2020-06-05 18:24:05 +02:00
Sébastien
8704413c0f Do not add bookAdvanceTimeout delay to new appointment modal on the backend. 2020-06-05 17:29:35 +02:00
Alex Tselegidis
1821e50116 Added catalan translations to the app (thanks to Marc Folch) 2020-06-04 12:57:14 +02:00
Johan Idstam
8236b39e84 Swedish for translations_lang.php 2020-05-18 21:44:03 +02:00
Johan Idstam
9996b38e1e Swedish for migration_lang.php 2020-05-18 20:10:40 +02:00
Johan Idstam
2b561122a7 Add Swedish to config 2020-05-18 20:07:45 +02:00
Johan Idstam
c82df14ba0 Swedish for email_lang.php 2020-05-18 20:07:08 +02:00
Johan Idstam
d5605a00f1 Swedish for db_lang.php 2020-05-18 19:58:17 +02:00
Sébastien
3c85c420c5 Fix sercice details display on booking page. 2020-05-15 15:06:08 +02:00
Alex Tselegidis
d2745feb4d Added missing index.html files in the application/views directory. 2020-05-12 21:01:06 +02:00
Alex Tselegidis
46d1f745ee Added boilerplate code for the new notifications library. 2020-05-12 20:59:29 +02:00
Alex Tselegidis
de4054dd56 Removed unnecessary scripts from backend templates. 2020-05-12 20:59:29 +02:00
Alex Tselegidis
df44f72964 The timezones model got converted into a library (as there is no direct database table to manage). 2020-05-12 20:59:29 +02:00
Alex Tselegidis
c48a74e037 Imported the Google API Client with composer (old files are no longer needed). 2020-05-12 20:59:28 +02:00
Alex Tselegidis
70948615df Added polyfill script for backwards compatibility. 2020-05-12 20:59:28 +02:00
Alex Tselegidis
b2464deb78 Explicitly define the view in the view toggler href attribute. 2020-05-12 20:59:28 +02:00
Sébastien
779b291281 Fix disabled bug with insert dropdown in backend. 2020-05-09 23:29:16 +02:00
Mastej, Matt
f2b97402fd bootstrap 4 and font awesome 2020-05-07 10:34:23 -04:00
Alex Tselegidis
466a3a3c20 Removed typo 2020-05-06 19:14:29 +02:00
Alex Tselegidis
07276d46a6 Code changes on automatically end_datetime assignment via the REST API 2020-05-04 20:59:37 +02:00
Alex Tselegidis
5269f73bab
Merge pull request #751 from popod/api-appointments-populate-end-datetime
Automatically populate the appointment end datetime based on service duration in API
2020-05-04 20:57:15 +02:00
Alex Tselegidis
b56073c071 Group insert buttons in the backend calendar to a button dropdown so that more space is available in the toolbar. 2020-05-04 13:56:23 +02:00
Alex Tselegidis
10ed734139 Removed text from calendar reload button (icon is clear enough). 2020-05-04 13:39:12 +02:00
Alex Tselegidis
4635af5094 Added quick toggle view button in backend calendar page. 2020-05-04 13:38:28 +02:00
Alex Tselegidis
01cf72c6a6 Added the select2 library in backend pages. 2020-05-04 11:33:35 +02:00
Alex Tselegidis
080488aa7d Reconstructed the table view so that it works with fullcalendar (better handling) (#739). 2020-05-04 11:32:00 +02:00
Sébastien
05ab0db079 Automatically populate the appointment end datetime based on service duration in API. 2020-05-03 22:17:31 +02:00
Alex Tselegidis
b834869fd3 Disable the password auto-complete for users and settings page. 2020-05-02 15:04:26 +02:00
Alex Tselegidis
df031fa5a1 The same migration names need to be used so that existing installations do not have problems with multiple migration numbers laying on the server. 2020-05-02 13:18:05 +02:00
Alex Tselegidis
6578b32dc8 Removed hardcoded use of the database prefix. 2020-05-02 12:51:06 +02:00
Alex Tselegidis
49f585fea8 Add default timezone value for admin, after during the installation. 2020-05-02 12:49:41 +02:00
Alex Tselegidis
8ded0851d8 Move the javascript logic of the login page to an external file. 2020-04-27 20:27:18 +02:00
Alex Tselegidis
2f17d46960 Corrected date.js path in view files. 2020-04-27 20:24:34 +02:00
Alex Tselegidis
69f4daca89 Move the javascript logic of the forgot password page to an external file. 2020-04-27 20:20:35 +02:00
Alex Tselegidis
788175b9de Added "alt" attribute to image. 2020-04-27 20:20:13 +02:00
Alex Tselegidis
83fd802f57 Adjusted HTTP requests in javascript files (and further code fine tuning). 2020-04-27 20:14:20 +02:00
Alex Tselegidis
8b34d8086e Make use of the dbprefix configuration option so that query builder calls do not need to explicitly use the database prefix. 2020-04-23 20:48:20 +02:00
Alex Tselegidis
63fe772155 The installation procedure will not use the assets/sql files but execute the migrations instead. 2020-04-23 20:36:43 +02:00
Alex Tselegidis
6792e3526e The Consents_model.php will set the created and modified time. 2020-04-23 20:36:01 +02:00
Alex Tselegidis
13dfc33581 Removed comment from migration config file 2020-04-23 20:35:36 +02:00
Alex Tselegidis
f571fc9de8 Refactor the migrations so that the complete DB change history is reproduced (fixes are also included). 2020-04-23 20:35:21 +02:00
Alex Tselegidis
39956c6b37 Major refactoring and improvements to the application API code. 2020-04-22 21:48:56 +02:00
Alex Tselegidis
e2337a354c Corrected the SQL file paths during installation. 2020-04-08 13:35:49 +02:00
Alex Tselegidis
0b50814cf4 Appointment location could be empty, use the company name instead. 2020-04-08 10:57:31 +02:00
Alex Tselegidis
560398c882 Corrected model batch querying. 2020-04-08 10:31:01 +02:00
Alex Tselegidis
7278f448e6 Load less information in the booking page. 2020-04-08 10:30:27 +02:00
Alex Tselegidis
fc8bb6c03b Fixed issue with PHP 7.4 compatibility. 2020-04-06 20:48:22 +02:00
Alex Tselegidis
488860f9fe Corrected call to the appointments model. 2020-04-06 20:40:32 +02:00
Alex Tselegidis
15757852ec Added new setting for toggling the "any provider" option in the booking page (#247). 2020-04-06 20:36:22 +02:00
Alex Tselegidis
653007604f Added pagination in backend pages for faster result loading (#496). 2020-04-06 20:34:32 +02:00
Alex Tselegidis
2d57022a63 The book advance condition must check with the provider's timezone. 2020-03-30 15:42:30 +02:00
Alex Tselegidis
513b0101eb Added new button for applying the global working plan to all providers (#551). 2020-03-29 19:25:23 +02:00
Alex Tselegidis
7279b1911e Can replace customer notes with empty notes (#541). 2020-03-29 19:00:37 +02:00
Alex Tselegidis
909b62cea5 Changed position of the timezone user setting. 2020-03-29 16:34:05 +02:00
Alex Tselegidis
320ff37de1 Google syncing also supports the provider timezones. 2020-03-29 16:29:07 +02:00
Alex Tselegidis
6858d120f6 The emails display the provider timezone. 2020-03-29 16:23:53 +02:00
Alex Tselegidis
88bbe06548 The booking zone supports timezones. 2020-03-29 16:20:30 +02:00
Alex Tselegidis
8798813606 Users are able to change their timezone from the backend settings page. 2020-03-29 15:12:44 +02:00
Alex Tselegidis
849f83ed03 Backend calendar handling with timezones. 2020-03-29 15:08:07 +02:00
Alex Tselegidis
b639318dac All the backend pages have the timezone information. 2020-03-29 14:43:53 +02:00
Alex Tselegidis
26442a1e17 Events get rendered based on the current user timezone. 2020-03-29 14:17:56 +02:00
Alex Tselegidis
1e5a1e59ea Added timezone handling for users in the backend section. 2020-03-29 14:10:49 +02:00
Alex Tselegidis
5847728fd2 Added timezone translation. 2020-03-29 14:08:42 +02:00
Alex Tselegidis
c0cd2346fd Created new render helper for the timezone dropdown. 2020-03-29 14:07:01 +02:00
Alex Tselegidis
26efa3c410 Login will set the user timezone in the session variable (if available). 2020-03-29 14:04:24 +02:00
Alex Tselegidis
b8ebe2b1bd Do not depend on the server timezone for providing the default timezone value. 2020-03-29 14:03:50 +02:00
Alex Tselegidis
db5c2968c6 Use UTC as the default timezone value for all users. 2020-03-29 14:02:00 +02:00
Alex Tselegidis
19406ca2c0 Created the Timezones_model.php 2020-03-29 13:42:58 +02:00
Alex Tselegidis
fbe1a10eeb Include the user timezone in the session information. 2020-03-29 12:54:02 +02:00
Alex Tselegidis
3d0d1f2005 Added timezone fields to the database (#313). 2020-03-29 12:47:57 +02:00
Alex Tselegidis
12f6833ca5 Providers and services are ordered alphabetically (#568). 2020-03-27 11:11:51 +01:00
Alex Tselegidis
2321c3b7fc Token based authentication for the REST API (#610). 2020-03-27 11:02:06 +01:00
Alex Tselegidis
3c4ecb2873 Corrected issue with language resolving on an API request. 2020-03-27 11:00:54 +01:00
Alex Tselegidis
ca989d01fa Use HTTPS protocol for easyappointments.org links. 2020-03-27 10:31:07 +01:00
Alex Tselegidis
1d91f6d1c4 Improved rendering for email templates (#611). 2020-03-27 10:30:31 +01:00
Alex Tselegidis
1f4438afd2 Ensure minified vendor files are being loaded. 2020-03-27 10:30:06 +01:00
Alex Tselegidis
fff57ad3f3 Ensure that only valid appointments are being processed. 2020-03-24 18:54:50 +01:00
Alex Tselegidis
474453cf59 The data removal text states that appointments will also be removed (#648). 2020-03-18 20:36:13 +01:00
Alex Tselegidis
22a0986468 Only use the minified files of vendor assets. 2020-03-18 20:21:11 +01:00
Alex Tselegidis
fc6921103e The Config::DEBUG flag toggles the min files (#502). 2020-03-18 20:20:43 +01:00
Alex Tselegidis
e1e9a60085 Moved source files to the root directory. 2020-03-11 10:24:25 +01:00