BookCal: prevent double booking, add mail templates & confirm/cancel actions#38110
Open
ElaaxMarketing wants to merge 5 commits intoDolibarr:developfrom
Open
BookCal: prevent double booking, add mail templates & confirm/cancel actions#38110ElaaxMarketing wants to merge 5 commits intoDolibarr:developfrom
ElaaxMarketing wants to merge 5 commits intoDolibarr:developfrom
Conversation
Contributor
|
@ElaaxMarketing use develop branch for this PR please...
|
eldy
reviewed
May 6, 2026
| } elseif ((int) $obj->percent === 100 || (string) $obj->answer_status === '1') { | ||
| print '<span class="badge badge-status4">Bestaetigt</span>'; | ||
| } else { | ||
| print '<span class="badge badge-status1">Offen</span>'; |
Member
There was a problem hiding this comment.
Must use $langs->trans("KeyInEnglish") and add the key=value into en_US/agenda.lang file
eldy
reviewed
May 6, 2026
| $elementList['project'] = img_picto('', 'project', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToProject')); | ||
| } | ||
| if (isModEnabled('bookcal')) { | ||
| $elementList['bookcal_send'] = img_picto('', 'calendar', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('BookingCalendar')); |
Member
There was a problem hiding this comment.
The entry BookingCalendar does not exists in any en_US/*.lang file.
Must be added in one file with english translation.
eldy
added
the
PR to fix - See feedback in comments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes several issues in BookCal’s public booking flow and internal booking list:
Prevents double bookings by creating public bookings inside a database transaction with a row lock.
Adds the BookCal email template type (bookcal_send) to the admin email templates UI.
Allows bookings to be confirmed or canceled from the booking list, with customer notifications sent via email templates.
Handles missing BookCal document model directories when generating availability documents.
Notes
Email content can be customized with email templates using type_template=bookcal_send.
Suggested labels used by the code:
BookCalBookingAcknowledgement
BookCalBookingConfirmed
BookCalBookingCanceled
Also adds translation keys for booking-slot errors and booking status messages in English and French.