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

merging with dev_EventOrganization after the changes on it

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-14 16:04:36 +02:00
commit c58414c0ca
1 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,19 @@ $email = GETPOST("email");
$encodedid = GETPOST('id'); $encodedid = GETPOST('id');
$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id); $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
$conference = new ConferenceOrBooth($db);
$resultconf = $conference->fetch($id);
if ($resultconf < 0) {
setEventMessages(null, $object->errors, "errors");
}
$project = new Project($db);
$resultproject = $project->fetch($conference->fk_project);
if ($resultproject < 0){
$error++;
$errmsg .= $project->error;
}
// Getting 'securekey'.'id' from Post and decoding it // Getting 'securekey'.'id' from Post and decoding it
$encodedsecurekeyandid = GETPOST('securekey', 'alpha'); $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id); $securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
@ -97,12 +110,6 @@ if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecure
exit; exit;
} }
$conference = new ConferenceOrBooth($db);
$resultconf = $conference->fetch($id);
if ($resultconf < 0) {
setEventMessages(null, $object->errors, "errors");
}
// Load translation files // Load translation files
$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization")); $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
@ -201,10 +208,11 @@ if (empty($reshook) && $action == 'add') {
$error++; $error++;
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n"; $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
} }
/*if (!GETPOST("societe")) { // If the price has been set, name is required for the invoice
if (!GETPOST("societe") && !empty(floatval($project->price_registration))) {
$error++; $error++;
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n"; $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Societe"))."<br>\n";
}*/ }
if (GETPOST("email") && !isValidEmail(GETPOST("email"))) { if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
$error++; $error++;
$langs->load("errors"); $langs->load("errors");
@ -285,41 +293,6 @@ if (empty($reshook) && $action == 'add') {
if (!$error) { if (!$error) {
$db->commit(); $db->commit();
$project = new Project($db);
$resultproject = $project->fetch($conference->fk_project);
if ($resultproject < 0){
$error++;
$errmsg .= $project->error;
} else {
global $dolibarr_main_url_root;
if (!empty(floatval($project->price_registration))){
$facture = new Facture($db);
$facture->type = 0;
$facture->socid = $thirdparty->id;
$facture->paye = 0;
//@todo price and taxes to add
$tva = get_default_tva($mysoc, $thirdparty);
$facture->date = dol_now();
$resultfacture = $facture->create($user);
if ($resultfacture < 0){
$error++;
$errmsg .= $facture->error;
} else {
// @todo corriger la réf qui est surement celle de la facture au lieu du client
$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription&ref='.$thirdparty->ref;
Header("Location: ".$redirection);
exit;
}
} else {
// No price has been set
// Validating the subscription
$confattendee->setStatut(1);
$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
Header("Location: ".$redirection);
exit;
}
}
//Header("Location: ".$urlback); //Header("Location: ".$urlback);
//exit; //exit;
} else { } else {
@ -393,7 +366,11 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
// 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="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
// Company // Company
print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n"; print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
if(!empty(floatval($project->price_registration))){
print '<FONT COLOR="red">*</FONT>';
}
print ' </td><td><input type="text" name="societe" class="minwidth150" 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";