ifl
/
iflrandevu
forked from mirrors/easyappointments
1
1
Fork 0
Code Issues 6 Pull Requests Releases 3 Activity
3,155 Commits 2 Branches 38 Tags 55 MiB
Commit Graph

1123 Commits

Author SHA1 Message Date
Alex Tselegidis f68e475e27
Merge pull request #1330 from eerojaaskelainen/BookingRescheduleManageModeFix 
Booking reschedule: Fixed manage mode getter
 2023-01-14 10:02:37 +01:00
Alex Tselegidis 4446f26399 Make the backend footer sticky and remove the "placeFooterToBottom" function 2023-01-14 09:40:18 +01:00
Alex Tselegidis b62e458258 Change the "value" method signature 2023-01-14 09:39:14 +01:00
Alex Tselegidis 2e3e766f73 Add missing field filtering and the optional model method 2023-01-14 09:38:49 +01:00
Alex Tselegidis 71fa900ea7 Move the date time picker addon to the layout file 2022-12-26 10:23:02 +01:00
Alex Tselegidis d2c6d5a571 Add helper method for optional fields 2022-12-26 10:22:22 +01:00
Alex Tselegidis f23c9aad49 Do not apply the limitation of customers if the corresponding setting is disabled 2022-12-21 19:09:21 +01:00
Alex Tselegidis 655d98fc69 Update Italian language 
# Conflicts:
#	application/language/italian/translations_lang.php
 2022-12-12 09:20:57 +01:00
Alex Tselegidis 0ee1f5cb0a Allow the user to filter by the entire user name 2022-12-12 09:19:14 +01:00
popod e53683863d
Fix working_plan_exceptions inconsistency when empty 2022-12-03 17:17:40 +01:00
Alex Tselegidis 30c55a4666 Correct the validate username method 2022-11-30 11:53:45 +01:00
Alex Tselegidis bc0de8ec53 Add a missing condition on permissions in Calendar.php 2022-11-30 11:22:48 +01:00
Alex Tselegidis 80e52ca36d Fix condition on new field migration files 2022-11-30 11:22:48 +01:00
Alex Tselegidis c1c588be22 Correct the email mime type for the ICS file 2022-11-30 11:22:48 +01:00
Alex Tselegidis 8c91c86508 Do not take deleted records into concern 2022-11-30 11:22:48 +01:00
Eero Jääskeläinen a5e9ed3e99 Booking reschedule: Fixed manage mode getter 2022-11-28 13:21:32 +02:00
Eero Jääskeläinen ad6bf65667 Strip providers script vars' keys to fix 'find() undefined' JS error 2022-11-17 12:54:05 +02:00
Eero Jääskeläinen 8c532d8552 Finnish: More linguistic duration text 2022-11-15 11:07:05 +02:00
Eero Jääskeläinen 1c67fc7ff6 Finnish translations 2022-11-09 09:14:07 +02:00
Alex Tselegidis d8634dc366 Update the polish translation (thanks to #1312) 2022-10-19 16:12:07 +03:00
Alex Tselegidis f389608aa1 Add date, from and till query parameters to the filter the appointments index results by date (#1134). 2022-10-16 22:17:36 +03:00
Alex Tselegidis 0f6df76667 Allow the users to define their own status and assign them to appointments (#244). 2022-10-16 21:54:26 +03:00
Alex Tselegidis 5431d25f0b Use variables by reference in the foreach loops of the models 2022-10-16 18:08:33 +03:00
Alex Tselegidis 8449fd3d28 Fix the rescheduling functionality in the booking page 2022-10-16 18:07:45 +03:00
Alex Tselegidis c8ebfae7ff Make sure the search method sorts by update_datetime in descending order 2022-10-16 18:07:01 +03:00
Alex Tselegidis 581609ea43 Set the setting value correctly, if the setting-name argument was not found in the database 2022-10-16 18:06:17 +03:00
Alex Tselegidis 54bc07f62a Update the EA_Model::only method to use the array_fields function 2022-10-16 18:04:49 +03:00
Alex Tselegidis 98a0e07484 Add and autoload the array helper 2022-10-16 18:03:55 +03:00
Alex Tselegidis d02c71a0e2 Add page title to the account pages 2022-10-16 18:02:47 +03:00
Alex Tselegidis b204437473 Add missing provider fields in the "create" and "update" methods 2022-10-03 17:06:01 +03:00
Alex Tselegidis b39d02b416 Correct the available slot collection display, when any-provider is selected 2022-10-03 17:06:01 +03:00
Alex Tselegidis e784df50e9 Fix the update page error (missing proper template variable assignment) 2022-10-03 17:06:01 +03:00
Alex Tselegidis 0e2eced83c Correct the constructor phpdoc block comment 2022-10-03 17:06:01 +03:00
Alex Tselegidis 8f2a6b4e33 Correct the column names in 025_rename_is_unavailable_column_of_appointments_table.php 2022-10-03 17:06:01 +03:00
Alex Tselegidis 6d413ffdfc Unset the "password" and "salt" parameter when getting a user or a provider 2022-10-03 17:06:01 +03:00
Alex Tselegidis a01acc5773 The recovery page must link to the new login URL 2022-10-03 17:06:01 +03:00
Alex Tselegidis fb9e78535f Correct the response prop name and load the 50 last updated customers in the calendar page. 2022-10-03 17:06:01 +03:00
Alex Tselegidis 218bbea800
Merge pull request #1308 from herzogmedia/220927_updateGerman 
Update german language files
 2022-10-03 10:39:04 +03:00
Lukas Herzog 1da9c2586d update german language strings 2022-09-27 18:29:02 +02:00
Alex Tselegidis 7e0e0b9d90 Change option heading in services page 2022-09-14 12:26:42 +02:00
Alex Tselegidis 482274afad Perform styling changes to the about page 2022-09-14 12:25:48 +02:00
Alex Tselegidis 10d0d7bb7d Update the headings of the appointment modal 2022-09-14 12:13:38 +02:00
Alex Tselegidis d90fd06984 Adjust all the title page and section title markup 2022-09-14 12:02:26 +02:00
Alex Tselegidis db31e7deb8 Correct the page title markup of settings pages 2022-09-14 10:30:52 +02:00
Alex Tselegidis 9be62e2c13 Update the integrations page styling 2022-09-14 10:24:46 +02:00
Alex Tselegidis 79ebeeb6bf Update the admin page heading styles 2022-09-14 10:15:09 +02:00
Alex Tselegidis b6cc72cd06 Styling adjustments to the settings nav component and the settings pages 2022-09-14 10:14:19 +02:00
Alex Tselegidis 1340fa6e9f Update the settings related navigation 2022-07-27 02:45:52 +03:00
Alex Tselegidis bb802e34e1 Move the notification check of the account page into an options frame 2022-07-27 02:29:00 +03:00
Alex Tselegidis d408b6040a Make sure at least one field is displayed in the booking page 2022-07-27 02:26:19 +03:00
Alex Tselegidis dcc5084807 Display the company working plan when browsing the "all" filter item 2022-07-27 02:19:42 +03:00
Alex Tselegidis 2f289b48cb Add missing translation keys to german, persian and portuguese-br 2022-07-26 17:19:45 +03:00
Alex Tselegidis cd88e3d085 Rename the private checkbox to is-private to match the field name 2022-07-26 17:12:23 +03:00
Alex Tselegidis 369994f855 Remove the integrations section from the general settings page as it is replaced by the new integrations page 2022-07-26 16:52:32 +03:00
Alex Tselegidis be0f473568 Add missing margin to add-break button 2022-07-26 16:51:43 +03:00
Alex Tselegidis b5788d47d8 Change the "book advance timeout" label to "allow rescheduling/cancellation before" for better clarity 2022-07-26 16:51:02 +03:00
Alex Tselegidis 9d0ded1bd7 Change the account page title 2022-07-26 16:46:52 +03:00
Alex Tselegidis f89fdb23c0 Make sure that synced appointments are removed from Google Calendar if the provider changes after an appointment update action 2022-07-26 16:43:37 +03:00
Alex Tselegidis 0f67dbaddc Do not try to apply the company color style if no company color value is available 2022-07-26 16:40:53 +03:00
Alex Tselegidis cec1ef6175 Add missing translations 2022-07-26 16:40:00 +03:00
Alex Tselegidis ec0924fb7e Add matomo analytics settings page 2022-07-26 16:39:31 +03:00
Alex Tselegidis 8eddb768d4 Add google analytics settings page 2022-07-26 16:39:15 +03:00
Alex Tselegidis 27d58effdf Add API settings page 2022-07-26 16:38:58 +03:00
Alex Tselegidis 1aac411c7f Create new "Integrations" page for managing 3rd party integrations 2022-07-26 16:38:29 +03:00
Alex Tselegidis 13b1ad3966 Move the receive-notifications checkbox into a frame 2022-07-26 16:16:10 +03:00
Alex Tselegidis 48828d4dcf Move the private checkbox field into an "options" frame 2022-07-26 16:13:05 +03:00
Alex Tselegidis 2564ee0c36 Move the options frame before the description field 2022-07-26 16:11:43 +03:00
Alex Tselegidis 0051a6e607 Move the webhook notes field to the bottom of the page 2022-07-26 16:10:47 +03:00
Alex Tselegidis 63084a73e4 Correct library name typo 2022-07-26 16:09:36 +03:00
Alex Tselegidis 7b5f4d014a Group conditions in order to avoid querying removed records accidentally. 2022-07-07 15:27:18 +02:00
Alex Tselegidis 3d8d5afa4c Add new setting for limiting new public bookings in the future (#1203). 2022-06-27 15:14:46 +03:00
Alex Tselegidis bc80d2c6e0 Display the language key if no translation is available 2022-06-27 13:49:16 +03:00
Alex Tselegidis b79a17f25e Remove unnecessary webhooks page element 2022-06-27 11:28:21 +03:00
Alex Tselegidis 8fde7e5221 Apply the "only" method to the providers controller 2022-06-27 11:27:46 +03:00
Alex Tselegidis 680d01d16f Group checkboxes in a frame in booking settings page 2022-06-27 11:27:25 +03:00
Alex Tselegidis 0576e69ad5 Change the private field id attribute for consistency 2022-06-21 12:59:24 +03:00
Alex Tselegidis 181afcb4b9 Correct layout page title 2022-06-21 12:58:48 +03:00
Alex Tselegidis 2ae250c698 Use getter methods instead of public variables directly 2022-06-20 12:39:14 +03:00
Alex Tselegidis 5027b59150 Catch the Throwable interface instead of the exception class 2022-06-20 12:37:16 +03:00
Alex Tselegidis 15af90ff2e Use associative array when parsing the provider's google token for consistency 2022-06-20 12:36:44 +03:00
Alex Tselegidis 14ae6b24fa Change $exception to $e for consistency 2022-06-20 12:31:52 +03:00
Alex Tselegidis 658ac78d8f Replace the default exception classes with more specific ones 2022-06-20 12:31:11 +03:00
Alex Tselegidis 3c9631ede0 Apply the Google Sync fixes so that events are synced properly 2022-06-20 12:25:57 +03:00
Alex Tselegidis 32ed2c32e6 Add descriptive messages to library log output 2022-06-20 12:12:36 +03:00
Alex Tselegidis 0d5e60cdb7 Add support for dynamic webhook definition in the settings page (#581) 2022-06-20 12:12:36 +03:00
Alex Tselegidis 2e97777cad Add fallback value to permissions check. 2022-06-20 12:12:36 +03:00
Alex Tselegidis bf78545752 Apply rate-limiting only to HTTP requests 2022-06-20 12:12:36 +03:00
Alex Tselegidis 6b821792fa Non-API routes will accept string argument values instead of integer 2022-06-20 12:12:36 +03:00
Alex Tselegidis c0e7a082f3 Check both appointments and unavailabilities when generating available hours 2022-06-20 12:12:36 +03:00
Alex Tselegidis c3b643376b Change the display of the appointment timezone information 2022-06-02 15:50:08 +02:00
Alex Tselegidis 2effec6c23 More color style fixes 2022-06-02 15:16:24 +02:00
Alex Tselegidis b15a051ee3 Show an error when using a translation key that does not exist 2022-06-02 09:48:02 +02:00
Alex Tselegidis 264328032b Change cancellation title 2022-06-02 09:44:02 +02:00
Alex Tselegidis 89d22ed7e1 Apply company color to message layout pages too 2022-06-02 09:42:14 +02:00
Alex Tselegidis 9cab342719 Apply missing styles when overriding the default colors with the company colors 2022-06-02 09:19:23 +02:00
Alex Tselegidis 8df576fef4 Correct the path to the theme css file in installation and update page 2022-06-01 12:56:41 +02:00
Alex Tselegidis 12df8420cb The theme variable can be changed by the "theme" query parameter for the booking page (#1205) 2022-05-27 10:04:40 +02:00
Alex Tselegidis d7e5817484 Hide the customer add button if the limit customer access setting is enabled 2022-05-27 09:27:25 +02:00
Alex Tselegidis 9108de8865 Apply the permissions library to the customers controller 2022-05-27 09:24:34 +02:00
Alex Tselegidis df0105c65a Create the Permissions library with the "has_customer_access" method 2022-05-27 09:24:01 +02:00
Alex Tselegidis 2e21b05545 Rename the "limit_customer_visibility" setting to "limit_customer_access" 2022-05-27 09:23:38 +02:00
Alex Tselegidis 9b9888df47 Add new limit_customer_visibility setting (#1199) 2022-05-26 15:55:26 +02:00
Alex Tselegidis e09647d01f Fix the booking cancellation flow and make sure analytics are loaded in both confirmation and cancellation (#1200) 2022-05-26 15:35:17 +02:00
Alex Tselegidis 72e84bd4f3 Group commonly used UI components to a single utility module 2022-05-26 15:17:33 +02:00
Alex Tselegidis d30e83fb56 Add missing button icon margin 2022-05-26 14:54:22 +02:00
Alex Tselegidis 10e885225e Do not load the matomo script if the is no URL specified 2022-05-26 14:51:46 +02:00
Alex Tselegidis 906c91331f Rename unavailability dates to unavailable dates 2022-05-26 14:50:12 +02:00
Alex Tselegidis 15cf1cf2bf Correct exclude appointment condition 2022-05-26 14:47:12 +02:00
Alex Tselegidis 46e6661bde Add missing layout slot for styles 2022-05-24 10:47:33 +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 48122c4cd3 Update the session language and remove password from the $account array 2022-05-22 13:50:25 +02:00
Alex Tselegidis c85d47befc Change the default charset and collation 2022-05-20 18:28:13 +02:00
Alex Tselegidis 66106fcd18 Perform setting related migration improvements 2022-05-20 18:27:57 +02:00
Alex Tselegidis 14305d08cc Exclude booking pages from CSRF protection 2022-05-20 18:21:44 +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 bea53207d9 Legend display issue in Firefox 2022-05-20 17:54:14 +02:00
Alex Tselegidis 6dce7b2f33 Merge branch 'mickemartinsson-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/controllers/Localization.php
#	application/core/EA_Controller.php
#	application/core/EA_Model.php
#	application/helpers/rate_limit_helper.php
#	application/language/swedish/translations_lang.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/frontend_book_success.js
#	assets/js/general_functions.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.lock
#	gulpfile.js
#	index.php
#	package-lock.json
#	system/libraries/Email.php
 2022-05-10 14:48:46 +02:00
Alex Tselegidis d2e18c8287 Release v1.4.3 2022-05-10 14:46:14 +02:00
Alex Tselegidis 980fc3b6f7 Reduce the default rate limit duration to 2 minutes 2022-05-10 14:46:14 +02:00
Alex Tselegidis 9efb46ba4b Add missing customer data from stripped array 2022-05-10 14:46:14 +02:00
Alex Tselegidis 3c36724aae Release v1.4.3-beta.1 2022-05-10 14:46:14 +02:00
Alex Tselegidis 49e2808b98 Fix timezone issue with add-to-google link of the booking page (#1216) 2022-05-10 14:46:14 +02:00
Alex Tselegidis a759cb89f7 Replace Google Client JS with the Google Calendar Template link in the book success page (#1216) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 384d442409 Security configuration enhancements in the application (#1208) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 886343f80c PHP 8.1 support (#1209) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 617222ae2a Provider and secretary users can only add unavailabilities for their authorized users (#1214) 2022-05-10 14:46:14 +02:00
Alex Tselegidis cc697fc09e The table calendar view breaks for secretaries and providers due to appointment and unavailability removals (#1211) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 9b70a9bd5c Remove the Google Calendar read-only scope use as it is not needed (#1212) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 17e68c9726 Switch to go-to-latest database migration configuration for simplicity (#1213) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 3dd57021e2 Move the change language operation into a new public controller (#1210) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 10a5eb46f9 Remove the Google Calendar read-only scope use as it is not needed (#1212) 2022-05-10 14:46:14 +02:00
Alex Tselegidis 0bb7a0e537 PHP 8.1 support (#1209) 2022-05-10 14:46:14 +02:00
Alex Tselegidis d4b69cd553 Update italian translation 2022-05-10 14:45:09 +02:00
Alex Tselegidis 353a13fa38 Soft-Delete customer appointments when deleting a customer. 2022-05-10 14:40:19 +02:00
Alex Tselegidis 739d26d914
Merge pull request #1248 from JanC/content-type-fix 
Better content type header parsing
 2022-05-10 14:33:09 +02:00
Alex Tselegidis 6b738a1ea5 Check only in the non-deleted customers, when validating the email address (#1246) 2022-05-10 14:28:56 +02:00
Alex Tselegidis 98bf660aa2 Correct permissions for the customers controller 2022-05-10 14:28:56 +02:00
Alex Tselegidis 75542d48c0 Replace double quote with single quote 2022-05-10 14:28:55 +02:00
Alex Tselegidis 5de23ab889
Merge pull request #1242 from JanC/1241-trim-baseurl 
[1241] Trim base url slashes
 2022-05-10 13:42:10 +02:00
Alex Tselegidis b949375fe6
Merge pull request #1240 from JanC/1239-secretary-fix 
[1239] Fix Secretary cannot book a new appointment
 2022-05-10 13:40:49 +02:00
Alex Tselegidis 5bfdd57db8
Merge pull request #1229 from tanielkirikal/develop 
Add Estonian translation
 2022-05-10 13:14:29 +02:00
Alex Tselegidis e3d3673ebf Add max password length constant 2022-05-09 23:26:46 +02:00
Alex Tselegidis 63dbb51dec Check the role slug in Api.php 2022-05-09 23:26:28 +02:00
Alex Tselegidis f0e976c9ac Update Catalan translation (thanks to Marc Folch) 2022-04-25 14:10:23 +02:00
Alex Tselegidis 899de8f029 Update turkish translation (thanks to Doğukan Sahil) 2022-04-25 14:08:20 +02:00
Jan Chaloupecky a8ef23f81d Better content type header parsing 2022-04-25 10:12:01 +02:00
Jan Chaloupecky c7437fddc1 Fixed base url trailing slash 2022-04-22 13:27:33 +02:00
Jan Chaloupecky 6429dabb41 Added secretary_providers in the JS script_vars 2022-04-22 13:15:06 +02:00