This commit is contained in:
Laurent Destailleur 2022-10-20 19:16:25 +02:00
parent 3e38d30956
commit 2d378ecede
4 changed files with 17 additions and 6 deletions

View File

@ -165,6 +165,7 @@ PaymentBoothLocation = Booth location payment
DeleteConferenceOrBoothAttendee=Remove attendee DeleteConferenceOrBoothAttendee=Remove attendee
RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b> RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
EmailAttendee=Attendee email EmailAttendee=Attendee email
EmailCompany=Company email
EmailCompanyForInvoice=Company email (for invoice, if different of attendee email) EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation

View File

@ -652,21 +652,23 @@ 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>';
$maxattendees = 0; $maxattendees = 0;
if ($conference->id) { if ($conference->id > 0) {
/* date of project is not date of event so commented
print $langs->trans("Date").': '; print $langs->trans("Date").': ';
print dol_print_date($conference->datep); print dol_print_date($conference->datep);
if ($conference->date_end) { if ($conference->date_end) {
print ' - '; print ' - ';
print dol_print_date($conference->datef); print dol_print_date($conference->datef);
} }*/
} else { } else {
/* date of project is not date of event so commented
print $langs->trans("Date").': '; print $langs->trans("Date").': ';
print dol_print_date($project->date_start); print dol_print_date($project->date_start);
if ($project->date_end) { if ($project->date_end) {
print ' - '; print ' - ';
print dol_print_date($project->date_end); print dol_print_date($project->date_end);
} }*/
$maxattendees = $project->max_attendees; $maxattendees = $project->max_attendees; // Max attendeed for the project/event
} }
print '</div>'; print '</div>';
@ -729,7 +731,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
// Email company for invoice // Email company for invoice
if ($project->price_registration) { if ($project->price_registration) {
print '<tr><td>' . $langs->trans("EmailCompanyForInvoice") . '</td><td>'; print '<tr><td>' . $form->textwithpicto($langs->trans("EmailCompany"), $langs->trans("EmailCompanyForInvoice")) . '</td><td>';
print img_picto('', 'email', 'class="pictofixedwidth"'); print img_picto('', 'email', 'class="pictofixedwidth"');
print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('emailcompany')) . '"></td></tr>' . "\n"; print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('emailcompany')) . '"></td></tr>' . "\n";
} }
@ -780,7 +782,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
if ($project->price_registration) { if ($project->price_registration) {
print '<tr><td>' . $langs->trans('Price') . '</td><td>'; print '<tr><td>' . $langs->trans('Price') . '</td><td>';
print price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency); print '<span class="amount price-registration">'.price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
print '</td></tr>'; print '</td></tr>';
} }

View File

@ -4835,8 +4835,12 @@ input#cardholder-name {
} }
.divmainbodylarge { margin-left: 40px; margin-right: 40px; } .divmainbodylarge { margin-left: 40px; margin-right: 40px; }
.publicnewmemberform div.titre { font-size: 2em; }
#divsubscribe { max-width: 900px; } #divsubscribe { max-width: 900px; }
#tablesubscribe { width: 100%; } #tablesubscribe { width: 100%; }
#tablesubscribe tr td { font-size: 1.15em; }
#tablesubscribe .price-registration { font-size: 1.5em; }
div#card-element { div#card-element {
border: 1px solid #ccc; border: 1px solid #ccc;

View File

@ -4684,8 +4684,12 @@ span.buttonpaymentsmall {
#tablepublicpayment tr.liste_total td { border-top: none; } #tablepublicpayment tr.liste_total td { border-top: none; }
.divmainbodylarge { margin-left: 40px; margin-right: 40px; } .divmainbodylarge { margin-left: 40px; margin-right: 40px; }
.publicnewmemberform div.titre { font-size: 2em; }
#divsubscribe { max-width: 900px; } #divsubscribe { max-width: 900px; }
#tablesubscribe { width: 100%; } #tablesubscribe { width: 100%; }
#tablesubscribe tr td { font-size: 1.15em; }
#tablesubscribe .price-registration { font-size: 1.5em; }
div#card-element { div#card-element {
border: 1px solid #ccc; border: 1px solid #ccc;