Commit graph

374 commits

Author SHA1 Message Date
Alex Tselegidis
0e6fdebe0f Completed the working plan exceptions feature. 2020-10-20 16:05:00 +03:00
Alex Tselegidis
0324a3e464 Removed the unnecessary modal-close event handler 2020-10-20 16:04:25 +03:00
Alex Tselegidis
5e0ef2acc1 Corrected method name typo 2020-10-20 16:04:25 +03:00
Alex Tselegidis
45c8a82d3f Add some margin between the icon and the text of the edit popover 2020-10-20 16:04:25 +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
d9985643f3 Additional styling for the frontend pages. 2020-09-28 14:42:32 +03:00
Alex Tselegidis
068a3995b0 Further fixes on the google synyc activation (#890). 2020-09-24 10:26:29 +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
a3dfb91550 Improvements in the user language storage feature. 2020-09-23 13:48:07 +03:00
Alex Tselegidis
e70e39e3f7 The language selection popup will disappear if the users clicks anywhere on the screen (#815). 2020-09-23 13:40:49 +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
30eb95461a Improvements and fixes on the custom availability feature 2020-09-23 12:24:42 +03:00
Sébastien
9d1dda3806 Fix appointment date wrongly updated to current date when the modal is open from the /backend/index/<appointment hash> url 2020-09-09 15:24:28 +02: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
34e4d6ea13 Refactored the backend resetForm and validation methods for consistency between pages. 2020-09-08 09:57:07 +03:00
Alex Tselegidis
64cdbfb445 Applied the switcher widget for the settings user notifications 2020-09-07 14:51:52 +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
de498ab5c2 Styling for the table view calendar header row. 2020-09-07 13:18:25 +03:00
Alex Tselegidis
18fa137336 Styling corrections to the popover buttons 2020-09-07 13:04:07 +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
185686d194 Replaced custom toggle buttons with bootstrap switcher component. 2020-09-07 11:36:36 +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
5031b66bd2 Renamed the id attribute from "message_box" to "message-box" to keep things consistent. 2020-09-07 11:08:18 +03:00
Alex Tselegidis
b0b8620379 The delete reason textarea has the "form-control" class. 2020-09-07 11:07:24 +03:00
Alex Tselegidis
a1c10fc2d3 Replace custom event handler methods with the use of "on". 2020-09-07 10:53:39 +03:00
Alex Tselegidis
6c8fea4ad8 Register modal events before using them, e.g. when provider edits an existing appointment via link (#839) 2020-09-07 10:51:46 +03:00
Alex Tselegidis
63b9653bb2 Added bootstrap 4 classes to the date field of the table calendar view in backend. 2020-09-03 14:14:56 +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
935c36be60 Replaced the well element with the card (bootstrap). 2020-08-31 18:33:36 +03:00
Alex Tselegidis
b6dbf1cfd8 Corrected the markup for the load more button. 2020-08-31 18:33:15 +03:00
Alex Tselegidis
76755a286d Properly set the selected date when editing an existing appointment in the booking page. 2020-08-31 17:35:27 +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
8f618c3339 Miscellaneous fixes on view files, required after merging the bootstrap 4 codebase 2020-08-31 13:23:10 +03:00
Alex Tselegidis
6d6dc9b19c
Merge pull request #870 from popod/fix-translations
Fix the undo translation
2020-08-20 17:49:26 +02: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
10bc62de9f Merge branch 'develop' of github.com:alextselegidis/easyappointments into develop 2020-08-15 16:58:05 +03:00
Alex Tselegidis
f69db8fd93
Merge pull request #755 from popod/fix-typo
Fix some minor errors
2020-08-15 16:56:32 +03:00
Alex Tselegidis
ac44edf43f
Merge pull request #756 from popod/remove-modal-timeout
Remove timeout before closing the extra periods modal on success.
2020-08-15 16:50:04 +03:00
Alex Tselegidis
143624b7d8 Close popover when inserting new appointment (#773). 2020-08-15 16:33:26 +03:00
Alex Tselegidis
ad509e8f22 Corrected the jsdoc 2020-08-15 16:27:20 +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
f122d1ea20 Display error message (if any) when saving appointments or unavailable time periods. 2020-08-15 15:58:17 +03:00
Alex Tselegidis
8f1e82019f The generic error handler callback can now display non-JSON responses (#836). 2020-08-15 15:58:17 +03:00
Alex Tselegidis
88ce8d506a Hide the service price and provider address if they are empty (#863) 2020-08-15 15:58:17 +03:00
Alex Tselegidis
e055223f8f
Merge pull request #824 from popod/customers-appointment-details-fix
Fix appointment details display in customers page
2020-08-15 15:30:40 +03:00
Alex Tselegidis
e4d16a66dc
Merge pull request #825 from popod/customers-disable-select-fix
Fix select which aren't disabled in customers backend page
2020-08-15 15:29:22 +03:00
Alex Tselegidis
afac484f51
Merge pull request #841 from popod/fix-safari-dates
Fix datepicker initialization dates with safari and IE.
2020-08-15 15:08:52 +03:00
Alex Tselegidis
1bb31dbc81
Merge pull request #846 from popod/fix-reset-of-has-error-class-in-resetform-fct
Fix: reset has-error class on resetForm() function.
2020-08-15 14:47:15 +03:00
Sébastien
23b55c75ec Fix the undo translation. 2020-07-23 14:29:39 +02:00
Sébastien
7d1d1f986c Fix current user validation in settings page. 2020-07-20 20:48:17 +02:00
Janina Phillips
33e11291bc
Merge branch 'develop' into bootstrap-4-and-fontawesome 2020-07-19 18:56:51 -04:00
Sébastien
e5fc1d427f Fix: reset has-error class on resetForm() function. 2020-07-13 18:13:52 +02:00
Sébastien
0eb5c939d9 Fix datepicker initialization dates with safari and IE. 2020-07-06 18:10:04 +02: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
Sébastien
dc704aa1d4 Restore some code after merge. 2020-07-01 11:18:50 +02:00
Sébastien
516830b5fe Remove unneeded code. 2020-07-01 11:15:40 +02:00
Sébastien
d169628dc0 Merge branch 'develop' into fix-typo
# Conflicts:
#	assets/js/backend_calendar_unavailabilities_modal.js
2020-07-01 11:12:53 +02:00
Alex Tselegidis
16c18f9b99 Display event notes in the popup widget (#745). 2020-07-01 10:16:09 +02:00
Alex Tselegidis
6290b85b82 Replaced the AJAX failure callback function 2020-07-01 10:16:09 +02:00
Sébastien
e87ef4a4c1 Remove old "glyphicon" icons. 2020-06-29 15:23:51 +02:00
Janina Phillips
8f3f4a3d28 fix calendar pop up actions 2020-06-22 09:55:46 -04:00
Sébastien
4f1cf415af Fix select not disabled in customers backend page. 2020-06-19 18:58:43 +02:00
Janina Phillips
63072ead77 fix some bugs 2020-06-19 11:17:31 -04:00
Sébastien
1e1764436b Fix appointment details display. 2020-06-19 13:56:02 +02:00
Sébastien
101316a72f Fix: replace invisible class by d-none. 2020-06-19 13:13:08 +02:00
Sébastien
81934f2d90 Fix: replace all btn-default class by btn-light. 2020-06-19 13:09:22 +02:00
Janina Phillips
32b5742bd0 fix calendar popover buttons 2020-06-18 14:46:13 -04:00
Janina Phillips
1e855182bd hidden is now d-none 2020-06-18 14:37:11 -04:00
Janina Phillips
a341334734 fix the language list 2020-06-18 14:32:37 -04:00
Janina Phillips
1bd2647b77 fix some icons and styles 2020-06-18 14:23:16 -04:00
Alex Tselegidis
6382bc422a Fixed typo 2020-06-18 19:30:47 +02:00
Alex Tselegidis
6585c38eb9 Toggle the visibility of the alert element by toggling the "hidden" class (#705) 2020-06-18 14:02:02 +02: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
Sébastien
24a1eeee2f Fix a js typo. 2020-06-16 15:10:56 +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
8704413c0f Do not add bookAdvanceTimeout delay to new appointment modal on the backend. 2020-06-05 17:29:35 +02:00
Sébastien
3c85c420c5 Fix sercice details display on booking page. 2020-05-15 15:06:08 +02:00
Alex Tselegidis
03b4adc6ad Removed the use of jQuery methods for array and data processing wherever possible, along with other improvements in the javascript code. 2020-05-12 20:59:29 +02:00
Alex Tselegidis
7af93aba76 Use the array find method directly. 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
74c10d3b7b Converted hard coded HTML to jQuery generated markup. 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
Sébastien
356b4242a7 Fix close button not displayed on login error modal when username and password are empty. 2020-05-09 18:17:25 +02:00
Mastej, Matt
f2b97402fd bootstrap 4 and font awesome 2020-05-07 10:34:23 -04:00
Alex Tselegidis
80b53b2dd0 removed leading underscore from javascript function names. 2020-05-06 19:23:49 +02:00
Alex Tselegidis
c670c023a7 Performed major javascript refactoring for more consistncy and efficiency in the code base (work in progress) 2020-05-06 19:15:11 +02:00
Sébastien
9905c942ac Remove timeout before closing the extra periods modal on success. 2020-05-04 21:19:02 +02:00
Sébastien
6f1604d452 Fix typo. 2020-05-04 21:13:13 +02:00
Alex Tselegidis
a8394f3adf
Merge pull request #752 from popod/backend-appointments-modal-improvements
Remove delay before closing the appointments modal.
2020-05-04 20:53:37 +02:00
Alex Tselegidis
d6f176f320
Merge pull request #750 from popod/fix-notifications-auto-dismiss
Notifications are no longer automatically hidden
2020-05-04 20:51:19 +02:00
Alex Tselegidis
9b924cd3c1 Corrected the selector for notification actions (#753). 2020-05-04 20:45:59 +02:00
Alex Tselegidis
08144ceae8 Updated the event resizing and dropping of the table view. 2020-05-04 20:41:46 +02:00
Alex Tselegidis
397ba1dfcf Corrected non working hour display in calendar table view. 2020-05-04 13:20:16 +02:00
Alex Tselegidis
f47ceae466 Added multi provider/service filtering in the backend calendar table view. 2020-05-04 13:13:42 +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
b7c54af0d0 Remove timeout when appointment modal save/update action is successfull. 2020-05-03 22:40:29 +02:00
Sébastien
e637faa53d [Fix] Notifications without actions are automatically hidden after 5 seconds. 2020-05-03 21:32:36 +02:00
Alex Tselegidis
17f99883c0 Reset user settings form before validation. 2020-05-03 11:26:04 +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
69f4daca89 Move the javascript logic of the forgot password page to an external file. 2020-04-27 20:20:35 +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
39956c6b37 Major refactoring and improvements to the application API code. 2020-04-22 21:48:56 +02:00
Alex Tselegidis
c99694b520 Fixed any-provider use case in booking page. 2020-04-08 10:57:18 +02:00
Alex Tselegidis
cf581e08e6 Unavailability events do not have the provider property set. 2020-04-08 10:41:40 +02:00
Alex Tselegidis
2256505244 Corrected invalid selector use. 2020-04-08 10:29:47 +02:00
Alex Tselegidis
6b83cc6083 Corrected loading selector use. 2020-04-06 20:48:11 +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
513b0101eb Added new button for applying the global working plan to all providers (#551). 2020-03-29 19:25:23 +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
c67ec03fc1 Customer appointments are being displayed in the current user's timezone. 2020-03-29 15:10:30 +02:00
Alex Tselegidis
849f83ed03 Backend calendar handling with timezones. 2020-03-29 15:08:07 +02:00
Alex Tselegidis
534d6e1761 Event popover display the provider timezone. 2020-03-29 14:44:06 +02:00
Alex Tselegidis
1e5a1e59ea Added timezone handling for users in the backend section. 2020-03-29 14:10:49 +02:00
Alex Tselegidis
71f9892ace Automatically reload backend calendar events (#301). 2020-03-18 20:30:15 +01:00
Alex Tselegidis
afd0323571 Updated the gulp flow (simplified tasks). 2020-03-11 13:24:23 +01:00
Alex Tselegidis
e1e9a60085 Moved source files to the root directory. 2020-03-11 10:24:25 +01:00