lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug event organization module

Browse Source
This commit is contained in:
Laurent Destailleur 2021-09-07 18:13:55 +02:00
parent 83ec43a2ee
commit 07d48e627e
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/eventorganization/conferenceorbooth_list.php
View File

@ -398,15 +398,15 @@ if ($projectid > 0) {
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $form->editfieldkey('PriceOfRegistration', 'price_registration', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid'); print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
print '</td><td>'; print '</td><td>';
print $form->editfieldval('PriceOfRegistration', 'price_registration', $project->price_registration, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid'); print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $project->price_booth, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'; print '<tr><td>';
print $form->editfieldkey('PriceOfBooth', 'price_booth', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid'); print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
print '</td><td>'; print '</td><td>';
print $form->editfieldval('PriceOfBooth', 'price_booth', $project->price_booth, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid'); print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $project->price_registration, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
print "</td></tr>"; print "</td></tr>";
print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>'; print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';

7
htdocs/langs/en_US/eventorganization.lang
View File

@ -29,6 +29,7 @@ EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
# #
# Admin page # Admin page
# #
NewRegistration=Registration
EventOrganizationSetup = Event Organization setup EventOrganizationSetup = Event Organization setup
Settings = Settings Settings = Settings
EventOrganizationSetupPage = Event Organization setup page EventOrganizationSetupPage = Event Organization setup page
@ -76,7 +77,7 @@ AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
PriceOfRegistration=Price of registration PriceOfRegistration=Price of registration
PriceOfRegistrationHelp=Price of registration PriceOfRegistrationHelp=Price to pay to register or participate in the event
PriceOfBooth=Subscription price to stand a booth PriceOfBooth=Subscription price to stand a booth
PriceOfBoothHelp=Subscription price to stand a booth PriceOfBoothHelp=Subscription price to stand a booth
EventOrganizationICSLink=Link ICS for events EventOrganizationICSLink=Link ICS for events
@ -101,7 +102,7 @@ EvntOrgCancelled = Cancelled
# #
SuggestForm = Suggestion page SuggestForm = Suggestion page
SuggestOrVoteForConfOrBooth = Page for suggestion or vote SuggestOrVoteForConfOrBooth = Page for suggestion or vote
EvntOrgRegistrationHelpMessage = Here, you can vote for an event, or suggest a new conference or booth for the project EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or booth or suggest a new one for the event
EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
ListOfSuggestedConferences = List of suggested conferences ListOfSuggestedConferences = List of suggested conferences
@ -113,7 +114,7 @@ ViewAndVote = View and vote for suggested events
PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
PublicAttendeeSubscriptionPage = Public link for registration to this event only PublicAttendeeSubscriptionPage = Public link for registration to this event only
MissingOrBadSecureKey = The security key is invalid or missing MissingOrBadSecureKey = The security key is invalid or missing
EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s' EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
EvntOrgDuration = This conference starts on %s and ends on %s. EvntOrgDuration = This conference starts on %s and ends on %s.
ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s. ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s

28
htdocs/public/eventorganization/attendee_subscription.php
View File

@ -483,10 +483,10 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
$form = new Form($db); $form = new Form($db);
$formcompany = new FormCompany($db); $formcompany = new FormCompany($db);
llxHeaderVierge($langs->trans("NewSubscription")); llxHeaderVierge($langs->trans("NewRegistration"));
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center'); print load_fiche_titre($langs->trans("NewRegistration"), '', '', 0, 0, 'center');
print '<div align="center">'; print '<div align="center">';
@ -498,9 +498,19 @@ print '<div class="center subscriptionformhelptext justify">';
print $langs->trans("EvntOrgWelcomeMessage", $project->title . ' '. $conference->label); print $langs->trans("EvntOrgWelcomeMessage", $project->title . ' '. $conference->label);
print '<br>'; print '<br>';
if ($conference->id) { if ($conference->id) {
print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef)); print $langs->trans("Date").': ';
print dol_print_date($conference->datep);
if ($conference->date_end) {
print ' - ';
print dol_print_date($conference->datef);
}
} else { } else {
print $langs->trans("EvntOrgDuration", dol_print_date($project->date_start), dol_print_date($project->date_end)); print $langs->trans("Date").': ';
print dol_print_date($project->date_start);
if ($project->date_end) {
print ' - ';
print dol_print_date($project->date_end);
}
} }
print '</div>'; print '</div>';
@ -540,13 +550,13 @@ if (!empty($conference->id) && $conference->status==ConferenceOrBooth::STATUS_CO
print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n"; print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
// Email // Email
print '<tr><td>' . $langs->trans("Email") . '<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('email')) . '"></td></tr>' . "\n"; print '<tr><td>' . $langs->trans("Email") . '<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth200" value="' . dol_escape_htmltag(GETPOST('email')) . '"></td></tr>' . "\n";
// Company // Company
print '<tr id="trcompany" class="trcompany"><td>' . $langs->trans("Company"); print '<tr id="trcompany" class="trcompany"><td>' . $langs->trans("Company");
if (!empty(floatval($project->price_registration))) { if (!empty(floatval($project->price_registration))) {
print '<FONT COLOR="red">*</FONT>'; print '<FONT COLOR="red">*</FONT>';
} }
print ' </td><td><input type="text" name="societe" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('societe')) . '"></td></tr>' . "\n"; print ' </td><td><input type="text" name="societe" class="minwidth200" value="' . dol_escape_htmltag(GETPOST('societe')) . '"></td></tr>' . "\n";
// Address // Address
print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n"; print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n";
print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="' . ROWS_3 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n"; print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="' . ROWS_3 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n";
@ -587,6 +597,12 @@ if (!empty($conference->id) && $conference->status==ConferenceOrBooth::STATUS_CO
print '</td></tr>'; print '</td></tr>';
} }
if ($project->price_registration) {
print '<tr><td>' . $langs->trans('Price') . '</td><td>';
print price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency);
print '</td></tr>';
}
print "</table>\n"; print "</table>\n";
print dol_get_fiche_end(); print dol_get_fiche_end();