alextselegidis
1cd0d45153
Converted the settings menu to a dropdown widget
2021-11-22 08:09:56 +01:00
alextselegidis
83bfd87d5d
Ported the current about content to a new standalone page
2021-11-22 08:09:56 +01:00
alextselegidis
a622f2f295
Ported the current user settings functionality to a new standalone page
2021-11-22 08:09:56 +01:00
alextselegidis
35a05de1f0
Ported the legal contents settings functionality to a new standalone page
2021-11-22 08:09:56 +01:00
alextselegidis
fc48db0ea4
Ported the client form settings functionality to a new standalone page
2021-11-22 08:09:56 +01:00
Alex Tselegidis
81044eb9c6
Corrected issue with routing and CORS while running from the terminal
2021-11-18 17:17:08 +01:00
Alex Tselegidis
255d1b5d95
Corrected the CORS headers hanlding
2021-11-18 15:01:17 +01:00
alextselegidis
2d1fb357c8
Ported the business logic settings functionality to a new standalone page
2021-11-18 08:49:23 +01:00
alextselegidis
753237d003
Ported the general settings functionality to a new standalone page
2021-11-18 07:53:41 +01:00
alextselegidis
fa97f743ae
Added settings related callbacks to the Settings controller (copied from Backend_api)
2021-11-18 07:34:43 +01:00
alextselegidis
f5cedbd0d5
Added calendar related callbacks to the Calendar controller (copied from Backend_api)
2021-11-18 07:30:52 +01:00
alextselegidis
4b4d8887e8
Added google related callbacks to the Google controller (copied from Backend_api)
2021-11-18 07:30:31 +01:00
alextselegidis
b06a2505b2
Created a new unavailabilities resource controller
2021-11-18 07:29:41 +01:00
alextselegidis
8a8f4a7ce0
Changed the cancellation URL to point to the Booking controller
2021-11-18 07:13:11 +01:00
alextselegidis
fa52b14bb7
The default route should point to the booking controller
2021-11-18 07:12:30 +01:00
alextselegidis
7eac5b8638
Moved the frontend book functionality to a new controller called Booking.php and created a new resource controller for appointments
2021-11-18 07:12:16 +01:00
alextselegidis
28f6a58211
Updated comment
2021-11-18 07:09:21 +01:00
alextselegidis
fec42278c8
Created a new customers resource controller
2021-11-18 06:34:07 +01:00
alextselegidis
df13336af5
Changed page ID attribute (service categories)
2021-11-18 06:28:00 +01:00
alextselegidis
d8a5460397
Changed page ID attribute (providers)
2021-11-18 06:28:00 +01:00
alextselegidis
16cfd17536
Dropdown navbar menu for users
2021-11-18 06:25:30 +01:00
alextselegidis
7a3aa38622
Created a new secretaries resource controller
2021-11-18 06:23:21 +01:00
alextselegidis
e842089694
Removed semicolon
2021-11-18 06:13:28 +01:00
alextselegidis
d6b294a12b
Created a new admins resource controller
2021-11-18 06:11:18 +01:00
alextselegidis
4bbcb9fff8
Created a new providers resource controller
2021-11-18 06:08:36 +01:00
alextselegidis
8682fc886b
Removed the services part from the service categories page
2021-11-18 05:35:56 +01:00
alextselegidis
2a599f11b8
Removed the service categories part from the services page
2021-11-18 05:32:46 +01:00
alextselegidis
54ee7ac924
Dropdown navbar menu for services
2021-11-18 05:28:16 +01:00
alextselegidis
aadac6a060
Created a new service categories resource controller
2021-11-18 05:23:54 +01:00
alextselegidis
8dd509d4dc
Created a new services resource controller
2021-11-18 05:21:30 +01:00
alextselegidis
af42c7c532
The availability generation algorithm needs performance improvements when many appointments are stored in the system ( #1171 ).
2021-11-17 18:10:06 +01:00
alextselegidis
f7b2e60f95
PHP formatting
2021-11-17 09:28:35 +01:00
alextselegidis
e86b01dada
Added background color to the standalone error pages
2021-11-17 09:28:04 +01:00
alextselegidis
8bad857edb
Modified the exception and error messages so that they display nicely within the modal and on standalone pages
2021-11-17 09:26:13 +01:00
alextselegidis
758e556f56
Use the bootstrap.bundle.min.js in the installations page
2021-11-17 08:49:51 +01:00
alextselegidis
8c353917b2
Load the working plan exceptions modal via the component helper
2021-11-17 08:46:58 +01:00
alextselegidis
81b93fc17d
The set setting may also get int and bool values
2021-11-17 08:46:48 +01:00
alextselegidis
8ce3a8ffce
The timezone dropdown becomes a component for customers_page.php
2021-11-17 08:42:12 +01:00
alextselegidis
532ee4fabc
Allow multiple renders with the loader class during the rendering of a layout page
2021-11-17 08:41:51 +01:00
alextselegidis
35f9a6eb1c
Replaced bootstrap.min.js with bootstrap.bundle.min.js so that popper dependent widgets work
2021-11-17 08:28:44 +01:00
alextselegidis
d3787b2b29
The calendar page must also extend from the backend layout
2021-11-16 10:40:54 +01:00
alextselegidis
aa760e827e
Fixed variable problems of the manage_appointment_modal.php component
2021-11-16 10:40:15 +01:00
alextselegidis
12a12caa36
Added missing slots to the backend layout file
2021-11-16 10:39:51 +01:00
alextselegidis
4a49800674
Minor formatting
2021-11-16 10:22:24 +01:00
alextselegidis
a3ab7ad898
Added the meta and styles slots to the account layout
2021-11-16 10:21:42 +01:00
alextselegidis
2966b89a59
Added the missing scripts section to the account layout
2021-11-16 10:20:53 +01:00
alextselegidis
ca8f3524ef
Replaced the render function with the new component function
2021-11-16 10:15:37 +01:00
alextselegidis
5fb2fcdf71
Relative paths in booking_page.php
2021-11-16 10:15:23 +01:00
alextselegidis
f0109226ce
Render the layout filename prop
2021-11-16 10:15:05 +01:00
alextselegidis
62b0651ce8
Fixed issues with component rendering
2021-11-16 10:14:47 +01:00
alextselegidis
8f74643437
Updated the controller classes to use the slots instead
2021-11-15 09:49:19 +01:00
alextselegidis
914ed84a40
The view files use the new layout slots
2021-11-15 09:49:08 +01:00
alextselegidis
79d2460b2a
Added slots to the layouts
2021-11-15 09:48:51 +01:00
alextselegidis
ae408c4bfb
Adjusted the components html helper function
2021-11-15 09:48:26 +01:00
alextselegidis
31b6c104c3
Removed the layout method as it is no longer needed
2021-11-15 09:47:51 +01:00
alextselegidis
b7bcaa86be
Override the "view" method of the CI_Loader class so that layouts are supported
2021-11-15 08:53:59 +01:00
alextselegidis
b7c39e94a2
Renamed the component_helper.php file to html_helper.php
2021-11-15 08:53:24 +01:00
alextselegidis
4a29034418
Added new layout helper methods in the component_helper.php file
2021-11-15 08:52:35 +01:00
alextselegidis
abf9bdd049
Set the page title of the booking page
2021-11-12 21:27:11 +01:00
alextselegidis
702089beb7
Removed period from translation key
2021-11-12 21:26:43 +01:00
alextselegidis
1103db92df
Loaded scripts from the appointments controller
2021-11-12 17:30:09 +01:00
alextselegidis
2d1c7c0f7a
Miscellaneous fixes and refactoring on Appointments.php
2021-11-12 17:23:43 +01:00
alextselegidis
548bc04c88
Corrected moment timezone script URL
2021-11-12 17:22:39 +01:00
alextselegidis
d2be2327e8
Minor refactoring for the appointments page
2021-11-12 17:09:39 +01:00
alextselegidis
eb64b6c7ef
The google analytics code does not need to be loaded twice
2021-11-12 17:09:01 +01:00
alextselegidis
3fa817d52d
Renamed the email templates for more consistency
2021-11-12 16:58:55 +01:00
alextselegidis
007e95ed7a
Moved the installation and update pages to the new view/pages directory
2021-11-12 16:57:05 +01:00
alextselegidis
0b9f7ecea2
Updated the routes.php config file comments and added the missing "translate_uri_dashes" config entry
2021-11-12 16:54:21 +01:00
alextselegidis
cf579dddc2
Removed the error override configuration and files
2021-11-12 16:53:42 +01:00
alextselegidis
ee6729cf0b
Converted all the account related pages to the new layout structure
2021-11-12 16:51:25 +01:00
alextselegidis
64846e0107
Removed the appointments directory from the view files
2021-11-12 16:40:12 +01:00
alextselegidis
9fdafa5497
Converted the booking message to the booking message layout
2021-11-12 16:39:38 +01:00
alextselegidis
b31b4c87bd
Converted the booking success page to the layout structure
2021-11-12 16:33:01 +01:00
alextselegidis
35393642fa
Default value for the styles, scripts and global variables entry
2021-11-12 16:32:31 +01:00
alextselegidis
d96e65792b
Converted the booking page view files to the layout structure
2021-11-12 08:38:20 +01:00
alextselegidis
2479ffb3a1
Changed the users callback to use the layout loading method
2021-11-12 08:37:50 +01:00
alextselegidis
3ca9211449
Created the backend layout and moved all of its templates into the new "pages" directory
2021-11-12 08:25:27 +01:00
alextselegidis
fa313c3ef3
Moved partial and other reusable view files into the new "components" directory
2021-11-12 08:24:43 +01:00
alextselegidis
ad3d726d1a
Added new layout loading method to the EA_Loader.php file.
2021-11-12 08:22:49 +01:00
alextselegidis
2d681a774a
Autoload the new component helper
2021-11-11 09:01:57 +01:00
alextselegidis
179e72bfb9
Changed the directory of the render functions to "components"
2021-11-11 09:01:42 +01:00
alextselegidis
538ded7d69
Added new component helper file
2021-11-11 09:00:48 +01:00
alextselegidis
0e8ebc8110
Added doc blocks for template vars and did minor template fixes
2021-11-10 08:32:46 +01:00
alextselegidis
44fffb1c56
Moved the remaining modals into their own files.
2021-11-09 08:53:09 +01:00
alextselegidis
2068f70840
Moved the modal view files to a new modals directory
2021-11-09 08:47:09 +01:00
alextselegidis
fb92fa1832
Updated the meta html tag of the view files
2021-11-09 08:44:37 +01:00
alextselegidis
6c356aec50
Added new functions to the render helper that render the global variables and EALang scripts into a view file
2021-11-09 08:40:20 +01:00
alextselegidis
6d567a74a4
Added new layout method to the loader
2021-11-09 08:39:30 +01:00
alextselegidis
cd9a92bed9
Removed the polyfill scripts as it is no longer needed.
2021-11-09 08:11:33 +01:00
Alex Tselegidis
f371177fb6
Updated the vendor script paths in the view files
2021-11-08 10:57:03 +01:00
Alex Tselegidis
f41547b77d
Method could also return null and not always an int
2021-11-08 10:44:36 +01:00
Alex Tselegidis
85bd7b9b38
Renamed attach to load in Backend_api.php
2021-11-06 17:14:57 +01:00
Alex Tselegidis
331aa8c174
Moved the old BASE URL to the app configuration for use in mails etc where a public facing URL is required
2021-11-06 17:11:09 +01:00
Alex Tselegidis
1c88a2f987
The app will now automatically detect the BASE URL based on the current request.
2021-11-06 17:07:03 +01:00
Alex Tselegidis
4a696fc992
Changed the develop state version
2021-11-06 16:54:34 +01:00
Alex Tselegidis
5f211f3cf1
Updated comment
2021-11-06 16:53:57 +01:00
Alex Tselegidis
356629fab6
Minor formatting
2021-11-06 16:52:52 +01:00
Alex Tselegidis
3e1381c302
Moved the app related config in a new app.php config file
2021-11-06 16:52:46 +01:00
Alex Tselegidis
a20f2e9e33
Corrected the login HTTP callback
2021-11-06 16:51:36 +01:00
Alex Tselegidis
54e86795d5
Minor comment changes for consistency
2021-11-06 16:21:27 +01:00
Alex Tselegidis
245fc43ec1
Replaced the old engine class use with the new Email_messages library
2021-11-06 16:11:55 +01:00
Alex Tselegidis
130adf88c3
Created new email messages library (ported the deprecated engine email class)
2021-11-06 16:11:44 +01:00
Alex Tselegidis
31b452766d
Refactored the login controller callback
2021-11-06 16:09:59 +01:00
Alex Tselegidis
e38df7452b
Renamed the attach query paramter of API controllers to with
2021-11-06 15:41:11 +01:00
Alex Tselegidis
c68565e2c3
Renamed the attached method to load for all models
2021-11-06 15:40:55 +01:00
Alex Tselegidis
f36c49819c
Added support for the "attach" query parameter to all API controllers
2021-11-06 15:34:54 +01:00
Alex Tselegidis
bd8144f7cb
Make sure the attach method works with API properties
2021-11-06 15:34:35 +01:00
Alex Tselegidis
89b9c802a2
Unavailabilities can only attach a provider record
2021-11-06 15:21:11 +01:00
Alex Tselegidis
bcc9b88623
Added support for upgrading and downgrading manually the database via the CLI
2021-11-06 15:17:03 +01:00
Alex Tselegidis
0a88442aa2
Corrected the settings routing config
2021-11-06 15:04:26 +01:00
Alex Tselegidis
8603a8ae33
Refactored all the API controller classes (and renamed them) to work well on top of the models
2021-11-06 15:03:08 +01:00
Alex Tselegidis
b4f903e724
Various fixes and additions to the model classes
2021-11-06 15:02:40 +01:00
Alex Tselegidis
1883b97630
Fixed API authorization issue
2021-11-06 15:01:17 +01:00
Alex Tselegidis
27c5c3ab35
Replaced the appointments model with the unavailabilities model in the Backend_api.php
2021-11-06 14:56:56 +01:00
Alex Tselegidis
00f54dcfec
Added the new Unavailabilities_model @property to EA_Controller.php
2021-11-06 14:56:12 +01:00
Alex Tselegidis
c7bb9d3a47
Added new Unavailabilities_model.php to enable handling such records as an independent resource
2021-11-06 14:55:36 +01:00
Alex Tselegidis
2406eefd39
Added validation to the sort direction value
2021-11-06 13:30:12 +01:00
Alex Tselegidis
01dfdf22f1
Added manual imports so that the migration system works again
2021-11-06 11:15:32 +01:00
Alex Tselegidis
4020e40a25
Corrected settings and availabilities routes
2021-11-06 11:15:15 +01:00
Alex Tselegidis
169b9818a6
Use the new routes helper in the routes.php config file
2021-11-06 10:23:25 +01:00
Alex Tselegidis
308e41bbe1
Autoload the new routes_helper.php file
2021-11-06 10:22:09 +01:00
Alex Tselegidis
3476807b40
Added the routes helper file
2021-11-06 10:18:46 +01:00
Alex Tselegidis
ba77658551
Ported the api parser encode and decode into the model classes
2021-11-05 09:37:14 +01:00
Alex Tselegidis
95a4e94a53
The response helper function must properly set the status code and the headers
2021-11-05 08:31:37 +01:00
Alex Tselegidis
3c5be0d12b
The set setting method could also get a NULL value
2021-11-05 08:28:59 +01:00
Alex Tselegidis
afc05577a4
Refactored the admins API controller (no engine code is being used).
2021-11-03 08:38:59 +01:00
Alex Tselegidis
ea659ccb9f
The base model knows how to map an API resource field to a DB field.
2021-11-03 08:22:27 +01:00
Alex Tselegidis
c390a6552a
Using the request helper without specifying a key should return the entire request body.
2021-11-03 08:22:05 +01:00
Alex Tselegidis
10ee3401e4
The API library can correctly sort and set the CORS headers
2021-11-03 08:21:30 +01:00
Alex Tselegidis
6eaa6e52a5
Added API resource mapping
2021-11-03 08:21:03 +01:00
Alex Tselegidis
4c6c5b5913
Remove the old and deprecated API_V1_Controller.php
2021-11-02 10:45:05 +01:00
Alex Tselegidis
7d3bc3104c
Created new library that handles common API functionality.
2021-11-02 10:44:37 +01:00
Alex Tselegidis
c2127a28fb
Added missing comments
2021-11-02 10:04:46 +01:00
Alex Tselegidis
dc50f8dee1
Updated @since tag
2021-11-02 09:24:28 +01:00
Alex Tselegidis
bdaa46459c
The new settings model does not have the set_setting and get_setting values.
2021-10-29 13:21:03 +02:00
Alex Tselegidis
306e94a082
The delete model method does not return a result any more.
2021-10-29 13:20:33 +02:00
Alex Tselegidis
4ed7465784
Corrected the name of the exception variable
2021-10-29 13:16:21 +02:00
Alex Tselegidis
182cebfb74
Renamed the add_unavailable method to save_unavailable for consistency
2021-10-29 13:12:39 +02:00
Alex Tselegidis
e29c2198de
Removed the delete_unavailable method
2021-10-29 13:11:56 +02:00
Alex Tselegidis
8b02cbb369
Added missing type hints for method params
2021-10-29 13:10:54 +02:00
Alex Tselegidis
3dee2ef4ef
Added missing @method tag in phpdoc comments
2021-10-29 13:10:36 +02:00
Alex Tselegidis
8947500968
If the request does not have the application/json content type header then return NULL
2021-10-29 13:08:41 +02:00
Alex Tselegidis
d886f6db16
Override the CSRF validation to support the X-CSRF header.
2021-10-29 13:06:56 +02:00
Alex Tselegidis
3233c19571
Added overrides for all the framework classes as templates and for consistency
2021-10-29 13:04:26 +02:00
Alex Tselegidis
12ec5c1ac3
The request helper can now also fetch JSON-payload attributes
2021-10-29 12:54:49 +02:00
Alex Tselegidis
dd546164fb
Common type casting functionality
2021-10-29 12:39:49 +02:00
Alex Tselegidis
b7305be038
Type casting for the Users_model.php
2021-10-29 12:39:38 +02:00
Alex Tselegidis
d62dd9b053
Type casting for the Settings_model.php
2021-10-29 12:39:32 +02:00
Alex Tselegidis
83777d35ba
Type casting for the Services_model.php
2021-10-29 12:39:27 +02:00
Alex Tselegidis
791f1e38e4
Type casting for the Service_categories_model.php
2021-10-29 12:39:20 +02:00
Alex Tselegidis
879b58ad6a
Type casting for the Secretaries_model.php
2021-10-29 12:39:14 +02:00
Alex Tselegidis
23cdaa2c6b
Type casting for the Roles_model.php
2021-10-29 12:39:08 +02:00
Alex Tselegidis
e0dbdeccfc
Type casting for the Providers_model.php
2021-10-29 12:39:02 +02:00
Alex Tselegidis
9338ec4445
Type casting for the Customers_model.php
2021-10-29 12:38:56 +02:00
Alex Tselegidis
6cc17d7bf5
Type casting for the Consents_model.php
2021-10-29 12:38:49 +02:00
Alex Tselegidis
d1b78397ef
Type casting for the Admins_model.php
2021-10-29 12:38:41 +02:00
Alex Tselegidis
64205cb23b
Type casting for the Appointments_model.php
2021-10-29 12:38:30 +02:00
Alex Tselegidis
76afdef30b
Moved the instance handling logic to a re-usable library
2021-10-29 10:44:01 +02:00
Alex Tselegidis
18348e02a5
Added core migration class.
2021-10-29 10:19:10 +02:00
Alex Tselegidis
9a528e6734
Updated the class comments
2021-10-29 10:18:44 +02:00
Alex Tselegidis
8ecf389bf1
Updated all the API controllers to work with the updated code.
2021-10-28 14:01:27 +02:00
Alex Tselegidis
a280496294
Updated all the main controllers to work with the updated code.
2021-10-28 14:01:17 +02:00
Alex Tselegidis
61a718cb2f
Updated the Timezones.php library to work with the updated code.
2021-10-28 14:00:48 +02:00
Alex Tselegidis
8e11dddf4a
Updated the Synchronization.php library to work with the updated code.
2021-10-28 14:00:40 +02:00
Alex Tselegidis
44aea4febb
Updated the Notifications.php library to work with the updated code.
2021-10-28 14:00:33 +02:00
Alex Tselegidis
23d80259d9
Updated the Ics_file.php library to work with the updated code.
2021-10-28 14:00:18 +02:00
Alex Tselegidis
f540922abc
Updated the Google_sync.php library to work with the updated code.
2021-10-28 14:00:10 +02:00
Alex Tselegidis
e4c01f54f8
Updated the Availability.php library to work with the updated code.
2021-10-28 13:59:56 +02:00
Alex Tselegidis
adc6d00bb5
Updated the Google Analytics and Permissions helper functions.
2021-10-28 13:59:27 +02:00
Alex Tselegidis
5e4bf0bd22
Corrected variable and table name
2021-10-28 13:51:46 +02:00
Alex Tselegidis
b2d2a5a1ce
Updated the new accounts library.
2021-10-28 13:29:15 +02:00
Alex Tselegidis
198db17100
Minor formatting changes
2021-10-28 13:28:37 +02:00
Alex Tselegidis
18e89e1ba4
Minor formatting change
2021-10-28 13:27:47 +02:00
Alex Tselegidis
110e5ec17d
Properly read and write settings via the settings helper
2021-10-28 13:27:14 +02:00
Alex Tselegidis
af58f924b1
Autoload the string helper as well
2021-10-28 13:26:48 +02:00
Alex Tselegidis
4671055a52
Corrected typo on get customer role ID method
2021-10-28 13:26:31 +02:00
Alex Tselegidis
0aaff2eae1
Removed manual helper loading
2021-10-27 12:05:28 +02:00
Alex Tselegidis
2e9bf9d29d
Automatically load all the core helper files
2021-10-27 12:03:51 +02:00
Alex Tselegidis
a241e8b2a4
Removed teh custom_exceptions_helper.php file
2021-10-27 12:02:24 +02:00
Alex Tselegidis
c1db2b636c
The content array must be encoded before returned
2021-10-27 11:44:45 +02:00
Alex Tselegidis
c495cd8225
Added the success prop to the json exception response payload
2021-10-27 11:19:45 +02:00
Alex Tselegidis
4bec35d70c
Removed the : void return typehint
2021-10-27 10:49:42 +02:00
Alex Tselegidis
85ac86caae
Updated class comment
2021-10-27 10:46:32 +02:00
Alex Tselegidis
e0ad767ec7
Updated @property tags in EA_Controller.php
2021-10-27 10:06:58 +02:00
Alex Tselegidis
40e06d2f19
The base model class has all the deprecated methods for backwards compatibility.
2021-10-27 10:06:44 +02:00
Alex Tselegidis
97c7a2821d
Created the users model class.
2021-10-27 10:05:43 +02:00
Alex Tselegidis
de4c232488
Migrated the user model logic into the accounts library
2021-10-27 10:05:26 +02:00
Alex Tselegidis
d914a52c02
Created the service categories model class.
2021-10-27 10:04:59 +02:00
Alex Tselegidis
65282bc5a2
Updated the settings model class.
2021-10-27 10:04:48 +02:00
Alex Tselegidis
175b6a9ffe
Updated the services model class.
2021-10-27 10:04:42 +02:00
Alex Tselegidis
8022ab28af
Updated the secretaries model class.
2021-10-27 10:04:35 +02:00
Alex Tselegidis
a4cd74863b
Updated the roles model class.
2021-10-27 10:04:28 +02:00
Alex Tselegidis
beeb821f8a
Updated the providers model class.
2021-10-27 10:04:21 +02:00
Alex Tselegidis
024479e5c6
Updated the customers model class.
2021-10-27 10:04:15 +02:00
Alex Tselegidis
07925c58ef
Updated the consents model class.
2021-10-27 10:04:09 +02:00
Alex Tselegidis
a72a33abb1
Updated the appointments model class.
2021-10-27 10:04:01 +02:00
Alex Tselegidis
5f2e5f1d28
Updated the admins model class.
2021-10-27 10:03:52 +02:00
Alex Tselegidis
f5471b0f2b
Renamed and updated the password helper
2021-10-24 22:00:59 +02:00
Alex Tselegidis
658c131f79
Renamed and updated the validation helper
2021-10-24 22:00:16 +02:00
Alex Tselegidis
584e624139
Added deprecated method stubs for backwards compatibility
2021-10-24 14:16:35 +02:00
Alex Tselegidis
fa6e48b344
Corrected property tag order
2021-10-24 14:13:20 +02:00
Alex Tselegidis
6417db8ca1
Added fallback support for the model class deprecations
2021-10-23 19:33:55 +02:00
Alex Tselegidis
bee96c172a
Corrected typo in class comment
2021-10-23 19:32:55 +02:00
Alex Tselegidis
bc1380ca89
Added helper file with permission related functions.
2021-10-23 19:19:21 +02:00
Alex Tselegidis
a97b6a4e13
Added helper file with http related functions.
2021-10-23 19:08:08 +02:00
Alex Tselegidis
e55c68fcb4
Added @throws tag at the comments
2021-10-23 13:42:23 +02:00
Alex Tselegidis
d636f60cbc
Added short argument explanation
2021-10-23 13:41:41 +02:00
Alex Tselegidis
0a6b596dec
Added examples at the comments
2021-10-23 13:38:54 +02:00
Alex Tselegidis
c117eda101
Set the right @since value for the new helper files
2021-10-23 13:29:31 +02:00
Alex Tselegidis
6d5a961fc7
Added helper file with path related functions.
2021-10-23 13:28:01 +02:00
Alex Tselegidis
4a7cdd96b2
Added helper file with setting related functions.
2021-10-23 13:21:30 +02:00
Alex Tselegidis
30c08bf95a
Changed the return comment
2021-10-23 13:20:39 +02:00
Alex Tselegidis
af656d70e2
Changed the return comment
2021-10-23 13:20:33 +02:00
Alex Tselegidis
d70e6f21ce
Added helper file with session related functions.
2021-10-23 13:18:20 +02:00
Alex Tselegidis
7a85ae6fc8
Updated the get example.
2021-10-23 13:17:38 +02:00
Alex Tselegidis
aad8e38bea
Added additional comment
2021-10-23 13:13:43 +02:00
Alex Tselegidis
863caa31fd
Added helper file with environment related functions.
2021-10-23 13:11:19 +02:00
Alex Tselegidis
b14341c328
Validate $key argument with empty instead with is_null
2021-10-23 13:10:09 +02:00
Alex Tselegidis
31c324dd92
Updated the exception message.
2021-10-23 13:08:24 +02:00
Alex Tselegidis
8abeb4dbf2
Added new helper file with debugging related functions
2021-10-23 13:07:00 +02:00
Alex Tselegidis
85a6be1d7d
Changed the exception instance to InvalidArgument exception.
2021-10-23 13:06:41 +02:00
Alex Tselegidis
1492963dee
The config helper function can now also set a value.
2021-10-23 13:04:15 +02:00
Alex Tselegidis
727391aa8f
Added default value to the config helper
2021-10-23 12:59:39 +02:00
Tthecreator
ff89857934
Update style of Client Form menu
...
Co-authored-by: Vitor Mattos <vitor@php.rio>
2021-10-20 22:18:40 +02:00
Thomas Saedt
9671def4ea
Merge branch 'develop' into 1081_hide_data_fields
2021-10-20 22:12:47 +02:00
Alex Tselegidis
1664ac6f9f
Merge pull request #1119 from om-ha/patch-1
...
FIX Providers API incorrect `array_key_exists`
2021-10-18 13:58:42 +02:00
Alex Tselegidis
6606340da4
Update French translations ( #1107 ).
2021-10-18 13:54:38 +02:00
Alex Tselegidis
6b179c3b58
When selecting the any provider option in the booking page then merge all the available hours of all providers that can serve the selected service ( #1147 ).
2021-10-18 13:04:32 +02:00
Alex Tselegidis
86bc718782
Condier unavailable time periods that span into multiple days ( #880 ).
2021-10-18 12:43:40 +02:00
Alex Tselegidis
03f5fed5a6
Merge branch 'lourdas-master' into develop
2021-10-04 09:38:20 +02:00
Alex Tselegidis
53acb6146c
Mark required the fields of the settings page
2021-10-04 09:27:50 +02:00
Alex Tselegidis
0c0ac6a0b2
The backend appointment removal is using the notifications library
2021-10-04 09:26:12 +02:00
Alex Tselegidis
a210c32b73
Czech translation corrections
2021-10-04 09:25:44 +02:00
Vasileios Lourdas
0d708077ca
Updated Greek language file.
...
Fixed a few typos and translated a couple of messages.
2021-09-26 20:01:24 +03:00
om-ha
a17c234698
FIX Providers API incorrect array_key_exists
...
- `array_key_exists` should search for they key `working_plan` within `$provider['settings']` and not `$provider['settings']['working_plan']`
2021-08-28 14:50:01 +03:00
Alex Tselegidis
49197b5c66
Use the right bootstrap CSS classes for the setting input field help blocks
2021-08-24 16:01:44 +03:00
Alex Tselegidis
591de3d35f
Corrected model comments
2021-08-24 16:01:17 +03:00
Alex Tselegidis
7393c36462
Release v1.4.2
2021-07-27 11:31:43 +03:00
Alex Tselegidis
215c4f501e
Release v1.4.2-beta.1
2021-07-19 18:25:36 +03:00
Alex Tselegidis
6103b6992d
The timepicker sliders do not work when using an iOS device. #1026
2021-07-19 17:26:24 +03:00
Alex Tselegidis
5d513ea43f
Resolve availability generation issue with 5 minute services.
2021-07-19 16:59:41 +03:00
Alex Tselegidis
9ddc820176
Set minimum service duration field value to honor the value of EVENT_MINIMUM_DURATION. #1068
2021-07-19 16:59:21 +03:00
Alex Tselegidis
5a039f2757
Missing Pacific (and potentially other) timezones ( #980 ).
2021-07-19 16:07:26 +03:00
Alex Tselegidis
bdd45f448a
Merge pull request #1055 from LibreCodeCoop/pt_br_translate
...
Update pt_BR translations
2021-07-19 14:24:19 +03:00
Alex Tselegidis
ea8798d2a6
The model base class needs a constructor when running the app with PHP8.0
2021-07-19 14:03:40 +03:00
Alex Tselegidis
3c4e7923ce
Removed duplicate row from the configuration file.
2021-07-19 13:42:29 +03:00
Alex Tselegidis
dfdbea6214
HTTP_ACCEPT_LANGUAGE is not set when executing the app from the console.
2021-06-14 10:21:43 +02:00
Thomas Saedt
bc87d5a573
[1081] added rudimentary translations for client form settings
2021-05-30 13:53:06 +02:00
Thomas Saedt
1bcbf9f71b
[1081] Made show booking form field settings functional
2021-05-30 13:27:39 +02:00
Thomas S
ea2cdeff70
[1081] Added visual buttons to hide or show form fields
2021-05-29 20:58:08 +02:00
Thomas S
872640c46d
[1081] Frontend hiding of fields
2021-05-28 15:39:14 +02:00
Thomas S
094b780fd8
[1081] Add new settings in db
2021-05-28 13:37:58 +02:00
Alex Tselegidis
4f0b2c6c8f
Make sure admins do not get notified on appointment removals, if their notification setting is deactivated ( #1074 ).
2021-05-17 12:57:06 +02:00
Vitor Mattos
ab07b585f0
Update translation
2021-04-16 20:51:31 -03:00
Vitor Mattos
de867ef4c5
Remove duplicated translate key
2021-04-16 20:33:14 -03:00
Vitor Mattos
ca57834262
New translation
2021-04-16 19:14:13 -03:00
Vitor Mattos
f6437ce1bc
Update pt_BR translations
2021-04-16 14:08:59 -03:00
Winfried Mosler
95dfc866e1
fix calendar table events for roles other than admin
2021-04-07 10:52:09 +02:00
Alex Tselegidis
33693af996
Merge pull request #1022 from Mips2648/patch-1
...
fix notification to secretaries
2021-04-07 10:49:06 +02:00
Alex Tselegidis
f9bb741810
Merge branch 'add-ga4-support' of https://github.com/c0un7-z3r0/easyappointments into develop
...
# Conflicts:
# application/language/german/translations_lang.php
2021-04-07 10:44:00 +02:00
Alex Tselegidis
25ca6a2349
Added additional translation files in the persian languages directory
2021-04-07 10:35:53 +02:00
Alex Tselegidis
65bc7a2092
Merge branch 'develop' of https://github.com/mhsenpc/easyappointments into develop
...
# Conflicts:
# application/config/config.php
2021-04-07 10:35:00 +02:00
Alex Tselegidis
fc82005a41
German language corrections ( #1009 ).
2021-04-07 10:32:15 +02:00
Alex Tselegidis
60254558a3
Merge branch 'master' of https://github.com/cbka/easyappointments into develop
2021-04-07 10:11:30 +02:00
Alex Tselegidis
1c763f3870
Support all-day events while syncing with Google Calendar ( #1040 ).
2021-04-07 10:02:30 +02:00
Alex Tselegidis
718fbf97aa
Merge pull request #967 from bevanjkay/all-day-google-events
...
All day google events
2021-04-07 09:49:35 +02:00
David Kagerer
acbce19a50
feat: add ga4 property support
...
Since google analytics is using now GA4 the support for the new script was needed
2021-03-30 21:13:59 +02:00
cbka
015a01b58a
Update email.php
2021-03-27 19:56:40 +01:00
cbka
bf57e028e6
Update email.php
2021-03-27 19:40:36 +01:00
Alex Tselegidis
e79c2d558e
Added comment at the end of the language files so that new keys can be easily inserted
2021-03-25 12:38:29 +01:00
Alex Tselegidis
0af112723d
Added missing translation keys in language files
2021-03-25 12:34:46 +01:00
Alex Tselegidis
ecdb7a662e
Czech language translation corrections
2021-03-25 12:08:55 +01:00
Alex Tselegidis
76672db959
Make sure that the duration of a service does not become less than the minimum acceptable value as otherwise it will make problems with the availability generation
2021-03-25 11:32:10 +01:00
Alex Tselegidis
e496105fac
Added missing translation files into the language/*/ directories
2021-03-25 11:26:11 +01:00
Alex Tselegidis
0b604dc229
Added missing translation keys to that czech language file
2021-03-25 11:15:03 +01:00
Alex Tselegidis
b6a17d4e11
Missing language mappings would cause issues with the auto-detection of the user's language.
2021-03-22 19:18:38 +01:00
Mips2648
45273fe707
fix notification to secretaries
2021-03-12 19:48:19 +01:00
Alex Tselegidis
99a5423e41
Updated catalan translations files (thanks to Marc Folch)
2021-02-18 14:32:10 +01:00
Mohsen Shamohamadi
d6f96a6c17
Add support for Persian language
2021-02-07 17:33:58 +03:30
Alex Tselegidis
0b5938471e
The availabilities API controller must use the Availability library (this change will also fix the PHP error, when processing a service with multiple attendants) ( #990 )
2021-01-27 13:40:01 +01:00
Alex Tselegidis
120421b3af
Replaced the generation of the appointment hash with the use of CodeIgniter's random_string method, in order to avoid collisions ( #986 ).
2021-01-21 14:10:13 +01:00
Alex Tselegidis
7c9137f69d
Make sure the selected hour is checked before selecting a provider on behalf of the customer, if he selected the any-provider option ( #982 ).
2021-01-20 15:21:59 +01:00
Alex Tselegidis
7718b32cfb
Removed some breaks from the default company working plan
2021-01-08 12:36:50 +02:00
Alex Tselegidis
2c67f7ce26
Correctly check for the assigned providers when notifying secretaries ( #966 ).
2021-01-08 12:07:08 +02:00
Bevan Kay
edace7b002
Add ability to sync all-day Google Calendar Events
2021-01-07 16:10:47 +11:00
Alex Tselegidis
5d73fafc31
Release v1.4.1
2020-12-17 16:54:58 +02:00
Alex Tselegidis
5a52bde05a
Additional check for the provided user props via the API
2020-12-17 16:49:04 +02:00
Alex Tselegidis
cf7bad9f19
Always display events in the provider's timezone in the backend calendar pages
2020-12-14 20:41:21 +02:00
Alex Tselegidis
5512731c41
Added customer data in the book success page
2020-12-14 20:40:56 +02:00
Alex Tselegidis
5df1bd4902
Made the timezone and language fields required, in the backend customers page
2020-12-14 20:40:10 +02:00
Alex Tselegidis
b7ff6cbc16
Include the moment timezone support file in backend pages
2020-12-14 20:38:34 +02:00
Alex Tselegidis
17e1f77a69
Changed the class name for consistency
2020-12-14 20:37:30 +02:00
Alex Tselegidis
bae970d257
Sync appointment with customer's Google Calendar in the book success page needs the correct timezone
2020-12-14 20:37:08 +02:00
Alex Tselegidis
f77ceeff84
Corrected click event behavior of the captcha refresh button
2020-12-14 10:48:36 +02:00
Alex Tselegidis
0d5f673ecf
User timezone must not be empied by default as it is required.
2020-12-14 09:53:16 +02:00
Alex Tselegidis
731fb52ab4
Display confirmation modal when disabling a connected Google Calendar Sync ( #955 ).
2020-12-12 14:22:25 +02:00
Alex Tselegidis
2dc5439b5d
The password must be provided when creating a new user ( #954 )
2020-12-11 21:18:33 +02:00
Alex Tselegidis
36def8c52c
Corrections in the API endpoints ( #950 )
2020-12-11 21:16:49 +02:00
Alex Tselegidis
3381b998a1
Check for other services when calculating multiple attendants number availability ( #948 ).
2020-12-11 12:44:29 +02:00
Alex Tselegidis
7bf1d536f3
Updated the facebook URL in the about page.
2020-12-11 09:55:54 +02:00
Alex Tselegidis
ae3e0b1dcb
Google Calendar sync must not break when syncing all day events ( #945 ).
2020-12-10 11:31:59 +02:00
Alex Tselegidis
9133aeedd6
Applied Captcha fixes in the booking page
2020-12-09 21:28:26 +02:00
Alex Tselegidis
29a0fadf32
Release v1.4.0
2020-12-09 16:16:03 +02:00
Alex Tselegidis
bde91f5a14
Ensure that multiple attendant services can be modified with proper availability.
2020-12-09 15:32:39 +02:00
Alex Tselegidis
75905752f7
Adding missing parent constructor call in Privacy.php controller
2020-12-09 14:55:27 +02:00
Alex Tselegidis
39d4f3185e
Removed [AJAX] string from controller comments.
2020-12-09 14:46:27 +02:00
Alex Tselegidis
b87be634b4
Applied same default data for both console and UI installation
2020-12-09 14:45:55 +02:00
Alex Tselegidis
4252bc8d0b
Corrected the modal header
2020-12-09 14:29:02 +02:00
Alex Tselegidis
8a68e97f94
Reformatted code files
2020-12-09 14:17:45 +02:00
Alex Tselegidis
cc44f3e0c6
Corrected timezone support when syncing events with Google Calendar
2020-12-09 14:07:14 +02:00
Alex Tselegidis
022644b59e
Corrected method call argument
2020-12-09 14:07:01 +02:00
Alex Tselegidis
6fe10a919b
Updated the cache bust token
2020-12-08 15:25:14 +02:00
Alex Tselegidis
6e2b649955
Changed the default encryption key value
2020-12-08 15:25:02 +02:00
Alex Tselegidis
ee1aa81b6e
Typo
2020-12-08 14:49:17 +02:00
Alex Tselegidis
22ac631995
Updated copyright information in backend
2020-12-08 14:16:42 +02:00
Alex Tselegidis
e92902f332
Backend users and services page would register the tab content events again and again
2020-12-08 13:23:37 +02:00
Alex Tselegidis
0aa41d0927
Corrected config set for language in parent controller
2020-12-08 13:22:46 +02:00
Alex Tselegidis
0631dbadf9
Fixed the validate_username model method.
2020-12-08 11:00:31 +02:00
Alex Tselegidis
9655feca6c
Corrected issue with table view and duplicate appointments
2020-12-08 10:17:24 +02:00
Alex Tselegidis
54c4852cd7
Consistently use solid style of fontawesome
2020-12-08 00:10:49 +02:00
Alex Tselegidis
9b2a892b12
Removed blog link
2020-12-07 23:09:28 +02:00
Alex Tselegidis
228235fa26
Corrected argument order
2020-12-07 22:56:37 +02:00
Alex Tselegidis
40cf6cab40
Renamed variable
2020-12-07 22:55:31 +02:00
Alex Tselegidis
90c8ca157d
Updated greek translations
2020-12-07 22:55:06 +02:00
Alex Tselegidis
c400366cd1
Modify default past and future dates (migration)
2020-12-07 22:54:52 +02:00
Alex Tselegidis
df8417a8cc
Minor refactoring to helper files
2020-12-05 11:55:20 +02:00
Alex Tselegidis
e084ee913f
Moved all the loader commands to the constructors
2020-12-05 11:55:09 +02:00
Alex Tselegidis
e31aec1ab5
Pass the manage_mode parameter to notifications and google libraries
2020-12-05 11:46:05 +02:00
Alex Tselegidis
843a476d0b
The get_value method check the existence of a property with array_key_exists
2020-12-05 11:43:38 +02:00
Alex Tselegidis
9c3d253456
Code enhancements in the model classes
2020-12-05 11:38:57 +02:00
Alex Tselegidis
14017a49f5
Renamed the partial directory
2020-12-05 11:16:07 +02:00
Alex Tselegidis
033719e9b4
Renamed variables in API controllers
2020-12-05 11:14:13 +02:00
Alex Tselegidis
3dca937728
Improved condition checks in the API controller classes
2020-12-05 11:09:25 +02:00
Alex Tselegidis
93c2eb190f
Added a help command in the console
2020-12-05 11:03:12 +02:00
Alex Tselegidis
3f43d2f768
Added new console command for created data backups.
2020-12-04 14:28:18 +02:00
Alex Tselegidis
8c8160897a
Added more CI classes in the core props block
2020-12-04 12:58:31 +02:00
Alex Tselegidis
76379ede44
Added a seed and installation command.
2020-12-04 12:49:57 +02:00
Alex Tselegidis
8171d18fd4
Updated code style in API_V1_Controller.php
2020-12-04 12:36:27 +02:00
Alex Tselegidis
fc362b340b
Added fresh option to migrations
2020-12-02 22:21:35 +02:00
Alex Tselegidis
9cde499f9a
Use the shorthand method for config items
2020-12-02 22:12:54 +02:00
Alex Tselegidis
77d8d4e5ab
Use the shorthand method for translations
2020-12-02 22:11:07 +02:00
Alex Tselegidis
238c480837
Consistently use $CI to reference the framework instance
2020-12-02 22:10:11 +02:00
Alex Tselegidis
d465e05652
Render emails with the framework
2020-12-02 22:08:49 +02:00
Alex Tselegidis
1571a01f1d
Update page UI fixes
2020-12-02 21:58:32 +02:00
Alex Tselegidis
e7b4aeedab
Automatically load the translations
2020-12-02 20:04:06 +02:00
Alex Tselegidis
84ab6702b3
Autoload the session library
2020-12-02 20:03:55 +02:00
Alex Tselegidis
c0a6370544
Snake case variable name
2020-12-02 19:50:17 +02:00
Alex Tselegidis
190e2d792a
Updated the swedish translation (thanks to Thomas Dilts)
2020-12-01 09:39:02 +02:00
Alex Tselegidis
e8655066fd
Added scope to the Google Calendar connection flow to enforce the user consent screen.
2020-11-30 21:34:12 +02:00
Alex Tselegidis
f6ee08608a
Initialize unavailability array
2020-11-21 23:09:27 +02:00
Alex Tselegidis
d5d4893840
Corrected method calls in when appointment gets saved from the backend
2020-11-21 23:08:07 +02:00
Alex Tselegidis
fe9d385a72
Fallback value for working days that are disabled.
2020-11-21 22:21:37 +02:00
Alex Tselegidis
8c836bf10c
Multiple attendant number generation must take into consideration the working plan exceptions
2020-11-21 22:16:53 +02:00
Alex Tselegidis
9e71255cae
Merge branch 'develop'
2020-11-21 22:05:29 +02:00
Alex Tselegidis
d6a5373264
Less data loaded for providers in book success.
2020-11-21 22:02:55 +02:00
Alex Tselegidis
da187c8b02
Redirect to appointments instead of appointments/index
2020-11-21 22:02:44 +02:00
giladx
15e44483d3
hebrew language translation
2020-11-18 18:35:06 +02:00
giladx
7d36eeaef8
added hebrew language
2020-11-18 17:43:55 +02:00
giladx
3e581a1de9
added hebrew language
2020-11-18 17:36:22 +02:00
Alex Tselegidis
87fdb2ae5c
The EA_Migration class is not part of the core and cannot be extended directly.
2020-11-16 13:25:54 +02:00
Alex Tselegidis
46d604f5e6
Applied consistent code style to the engine class files.
2020-11-16 11:55:34 +02:00
Alex Tselegidis
084aed9e23
Notifications go out on the recipient's timezone ( #914 )
2020-11-16 11:55:33 +02:00
Alex Tselegidis
af5ddfaac4
Only admins can modify working plan exceptions at the moment
2020-11-16 11:09:48 +02:00
Alex Tselegidis
6f8e971673
Ensure working plan exceptions will not be NULL before being used ( #926 ).
2020-11-16 10:43:25 +02:00
Alex Tselegidis
a48324be08
Minor changes to the model classes
2020-11-16 10:41:04 +02:00
Alex Tselegidis
75a5addbc2
Grouped the property tag into parent core classes so that it does not need to be repeated.
2020-11-16 10:29:36 +02:00
Alex Tselegidis
976cabb2c4
Updated URLs in the file comments
2020-11-16 10:16:00 +02:00
Alex Tselegidis
6e66eb4fd8
Consistent module naming throughout the app
2020-11-16 10:16:00 +02:00
Alex Tselegidis
501d359ee1
Merge pull request #935 from 0xalen/develop
...
Spanish translations
2020-11-16 09:05:18 +01:00
Alejandro
a9d7b107e0
Merge pull request #1 from 0xalen/working-plans-spanish-translations
...
Working plans Spanish translations
2020-11-14 20:59:58 -03:00
Alejandro
46da3d1fa8
Update translations_lang.php
...
Add remaining translations about working plans.
Special mention about secretaries. In Spanish it might be worth to use 'Secretario/as' as a reference to both sexes to avoid issues with the users.
2020-11-14 20:55:15 -03:00
Alex Tselegidis
e8556e0339
jQuery needs to be defined before being used in the login page.
2020-11-12 14:55:03 +02:00
Alex Tselegidis
39c8ec9068
Groupped load commands in model constructor methods
2020-11-12 14:51:10 +02:00
Alex Tselegidis
8842e2d918
Update session date based on the current user settings page updates
2020-11-12 14:47:15 +02:00
Alex Tselegidis
0c20363b8b
Correction in the Appointments check datetime availability method
2020-11-12 14:46:51 +02:00
Alex Tselegidis
d13df8f8e1
Corrected condition fallback value in Categories.php API controller
2020-11-12 14:16:23 +02:00
Alex Tselegidis
25fdd5636d
Corrected wrong parameters order.
2020-11-12 14:15:38 +02:00
Alex Tselegidis
cc6b18022c
Ensure that non working days are not processed.
2020-11-12 14:15:12 +02:00
Alex Tselegidis
69daed1d4b
Merge pull request #918 from mokkin/patch-2
...
German translation correction
2020-10-27 11:31:29 +02:00
Alex Tselegidis
0e7abeac1c
Merge pull request #916 from mokkin/patch-1
...
Updated german translations for v1.4.0
2020-10-27 11:31:05 +02:00
Alex Tselegidis
39614fc418
Corrected the column class of the time selection container
2020-10-27 11:30:03 +02:00
Alex Tselegidis
632b943392
Use the container class in installation.php
2020-10-27 11:29:51 +02:00
mokkin
8924e305e6
correct translation
2020-10-24 22:50:52 +02:00
mokkin
90012dffe1
completed german translations
2020-10-24 22:22:35 +02:00
Alex Tselegidis
e3089aeca9
Release v1.4.0-beta.1
2020-10-22 12:50:47 +03:00
Alex Tselegidis
a85ec4c275
Removed old image files and updated the content and styling of the isntallation page
2020-10-22 12:49:37 +03:00
Alex Tselegidis
9604aa4ef9
Replaced qtip with tippy.js
2020-10-22 12:29:09 +03:00
Alex Tselegidis
67dc42b2d8
Update in the backend header brand subtitle
2020-10-22 12:10:36 +03:00
Alex Tselegidis
733e9a119a
Updated the code style of the API controllers
2020-10-21 21:49:05 +03:00
Alex Tselegidis
1067a92a18
Renamed further "unavailabilities" occurrences to "unavailability events"
2020-10-21 21:44:35 +03:00
Alex Tselegidis
f7ca104836
Moved duplicated code into re-usable library classes
2020-10-21 21:37:47 +03:00
Alex Tselegidis
d2dd9925ec
Added icon in the language pick label of the backend footer.
2020-10-21 21:37:21 +03:00
Alex Tselegidis
e0dea50ee4
Renamed the unavailabilities to unavailability events
2020-10-21 21:36:37 +03:00
Alex Tselegidis
8031104d49
Added subtitle in the backend header
2020-10-21 21:36:05 +03:00
Alex Tselegidis
0e6fdebe0f
Completed the working plan exceptions feature.
2020-10-20 16:05:00 +03:00
Alex Tselegidis
5e6476c0f5
Moved the first "next" button of the booking page to the right side of the wizard
2020-10-20 16:04:25 +03:00
Alex Tselegidis
93dce95c51
Single quotes in routes.php
2020-10-20 16:04:25 +03:00
Alex Tselegidis
90147026f3
Changed custom availability period related translations
2020-10-20 16:04:25 +03:00
Alex Tselegidis
9dbc7ae000
Updated the styling of the required fields
2020-10-20 16:03:56 +03:00
KibGim
c5cc7d05b6
Update translations_lang.php - italian
...
Translation of the latest rows from English to Italian.
2020-10-19 18:05:54 +02:00
Alex Tselegidis
54d1ae83dc
Removed the required fields message in ui (below the forms)
2020-09-28 15:25:56 +03:00
Alex Tselegidis
06956e82d0
Replaced the btn light class with btn outline secondary
2020-09-28 15:24:29 +03:00
Alex Tselegidis
cab9aed12f
Styling upgrades for the backend calendar page
2020-09-28 15:17:47 +03:00
Alex Tselegidis
454c135f0b
Updated translations message
2020-09-28 15:13:01 +03:00
Alex Tselegidis
4a4403e9a1
Replaced required fields with red stars and removed form message
2020-09-28 15:12:49 +03:00
Alex Tselegidis
d9985643f3
Additional styling for the frontend pages.
2020-09-28 14:42:32 +03:00
Alex Tselegidis
0cd6e793c2
Added parethnesis between the utc time difference of the timezone list items
2020-09-28 13:51:38 +03:00
Alex Tselegidis
13ff9cfc4a
Replaced exclamation mark with period in translation messages.
2020-09-28 13:51:12 +03:00
Alex Tselegidis
2f32c4cd08
Styling for the login button of the booking page
2020-09-28 13:43:57 +03:00
Alex Tselegidis
b54fe7946b
Added fontawesome to general pages
2020-09-28 13:34:47 +03:00
Alex Tselegidis
068a3995b0
Further fixes on the google synyc activation ( #890 ).
2020-09-24 10:26:29 +03:00
Alex Tselegidis
4c10b5a173
Add scope to the google sync client ( #890 ).
2020-09-24 09:43:11 +03:00
Alex Tselegidis
069509c8da
Merge branch 'book-advance-timeout-improvements' of https://github.com/popod/easyappointments into popod-book-advance-timeout-improvements
...
# Conflicts:
# application/views/backend/calendar.php
# application/views/backend/settings.php
2020-09-23 15:13:58 +03:00
Alex Tselegidis
46a176db5b
Updated the default service currency value
2020-09-23 14:59:43 +03:00
Alex Tselegidis
36d387accf
Styling changes to the email templates
2020-09-23 14:55:48 +03:00
Alex Tselegidis
f05aab39ca
Styling adjustments to the booking footer elements
2020-09-23 14:53:30 +03:00
Alex Tselegidis
abe6de3ab5
Added more information to the ICS file, sent with the email confirmation.
2020-09-23 14:53:15 +03:00
Alex Tselegidis
cfc6167d4f
Use the "alnum" method when generating random strings via the codeigniter helper function (generates shorter strings)
2020-09-23 14:37:09 +03:00
Alex Tselegidis
8dce5bf17a
Added Easy!Appointments to the mail template titles
2020-09-23 14:36:39 +03:00
Alex Tselegidis
c04058f6f5
Corrected the reset password mail notification
2020-09-23 14:36:22 +03:00
Alex Tselegidis
8dd346c90e
Improved display of booking page footer for desktop viewports
2020-09-23 14:29:18 +03:00
Alex Tselegidis
e7800e5302
FontAwesome icon improvements in the view files
2020-09-23 14:18:50 +03:00
Alex Tselegidis
a3dfb91550
Improvements in the user language storage feature.
2020-09-23 13:48:07 +03:00
Alex Tselegidis
5706447ea6
Problem with links in legal content ( #813 ).
2020-09-23 13:44:12 +03:00
Alex Tselegidis
10df66fddb
The "created" and "modified" consent fields are date time and they need a proper date time value
2020-09-23 13:36:24 +03:00
Alex Tselegidis
ed262c2e9a
Corrected the migration file name
2020-09-23 13:33:29 +03:00
Alex Tselegidis
683aa269b0
Use the codeigniter random string generation function for creating random passwords ( #680 ).
2020-09-23 13:16:37 +03:00
Alex Tselegidis
12c25da042
Removed unnecessary command from Google_sync.php
2020-09-23 13:16:37 +03:00
Alex Tselegidis
532548d64d
Proper use of the property phpdoc tag
2020-09-23 13:16:37 +03:00
Alex Tselegidis
7bbe85b88a
Merge pull request #817 from popod/save-customer-language
...
Save customer language to the database
2020-09-23 13:16:25 +03:00
Alex Tselegidis
f5a94ea6fe
Notify admins and secretaries on appointment changes ( #889 ).
2020-09-23 12:42:18 +03:00
Alex Tselegidis
30eb95461a
Improvements and fixes on the custom availability feature
2020-09-23 12:24:42 +03:00
Alex Tselegidis
1aa8132e4d
Added console commands and support for triggering the google sync from the terminal
2020-09-23 12:24:20 +03:00
Alex Tselegidis
fc02e55a69
Removed the notifications library (it will be implemented on an upcoming version).
2020-09-23 11:35:54 +03:00
Alex Tselegidis
ae1f951cf8
Resolve the any-provider selection before processing provider information ( #885 ).
2020-09-21 14:26:21 +03:00
Alex Tselegidis
be85f46158
Restructured the customer's appointments column and added direct link to editing an appointment.
2020-09-08 10:42:58 +03:00
Alex Tselegidis
e2bbef8fff
Added project attribution in every page.
2020-09-08 10:21:40 +03:00
Alex Tselegidis
73e976ddab
Replaced the check icons.
2020-09-08 09:58:10 +03:00
Alex Tselegidis
64cdbfb445
Applied the switcher widget for the settings user notifications
2020-09-07 14:51:52 +03:00
Alex Tselegidis
4a7d6e5d6e
Added required fields message in all forms.
2020-09-07 14:40:59 +03:00
Alex Tselegidis
69e39b9062
Corrected disabled state on users page.
2020-09-07 14:33:02 +03:00
Alex Tselegidis
6188df7ae5
Replaced the custom tab widget in backend providers with bootstrap based navigation
2020-09-07 14:17:01 +03:00
Alex Tselegidis
6f69c52a3f
Consistent use of html title (except from booking page).
2020-09-07 13:54:37 +03:00
Alex Tselegidis
b4ad00d9f3
Moved inline styles in external css files
2020-09-07 13:51:50 +03:00
Alex Tselegidis
6c1af6dc71
Removed data structure comment from models.
2020-09-07 13:35:28 +03:00
Alex Tselegidis
20cb8b3a01
Reformatting for GlobalVariables definition.
2020-09-07 13:34:52 +03:00
Alex Tselegidis
28afe4d1c7
Replaced document ready call in all templates
2020-09-07 13:30:24 +03:00
Alex Tselegidis
0b203c00c6
Updated the About Easy!Appointments links.
2020-09-07 13:23:26 +03:00
Alex Tselegidis
af270e8fe2
Use the short "phone" for the appointment popover
2020-09-07 13:03:59 +03:00
Alex Tselegidis
2f6699f655
All buttons have their icon.
2020-09-07 12:21:16 +03:00
Alex Tselegidis
529e418589
Set default notifications setting value for the installation admin.
2020-09-07 11:45:57 +03:00
Alex Tselegidis
185686d194
Replaced custom toggle buttons with bootstrap switcher component.
2020-09-07 11:36:36 +03:00
Alex Tselegidis
02628a2cbd
Random password for installation provider record.
2020-09-07 11:18:08 +03:00
Alex Tselegidis
5220e87249
Renamed installation helper method
2020-09-07 11:15:58 +03:00
Alex Tselegidis
769668c828
Move the call to action button of modals to the right
2020-09-07 11:15:01 +03:00
Alex Tselegidis
889f093942
Corrected migration names.
2020-09-07 11:05:08 +03:00
Alex Tselegidis
0e0a5e6b20
Removed the subpackage phpdoc tag (not supported).
2020-09-07 10:56:40 +03:00
Alex Tselegidis
395b329e78
Minor formatting changes in API_V1_Controller.php
2020-09-03 14:59:05 +03:00
Alex Tselegidis
f05a4be918
Renamed the step_*_title translation keys to meaningful keys based on their content (most translations kept unchanged as the previous texts still matches)
2020-09-03 14:57:17 +03:00
Alex Tselegidis
5c207751a8
Removed aria and role attributes for maintaining leaner HTML markup in the view files.
2020-09-03 14:48:58 +03:00
Alex Tselegidis
e8e3ae8598
Use nav-pills for page sub navigation.
2020-09-03 14:44:02 +03:00
Alex Tselegidis
9b3502bf4a
Consistent use of the backend-page css class
2020-09-03 14:35:58 +03:00
Alex Tselegidis
159225a7c7
Changed the display of the availability in the booking page for a better user experience (buttons are used now).
2020-09-03 14:14:34 +03:00
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