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

various modifications on the way existing attendees and thirdparties are handled at registration

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-22 11:45:00 +02:00
parent 22dab0e0af
commit e05c318fd8
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/eventorganization/class/conferenceorboothattendee.class.php
View File

@ -438,6 +438,7 @@ class ConferenceOrBoothAttendee extends CommonObject
} }
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;

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

@ -81,6 +81,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$email = GETPOST("email"); $email = GETPOST("email");
$societe = GETPOST("societe");
// Getting id from Post and decoding it // Getting id from Post and decoding it
$encodedid = GETPOST('id'); $encodedid = GETPOST('id');
@ -230,14 +231,14 @@ if (empty($reshook) && $action == 'add') {
if (!$error) { if (!$error) {
// Check if attendee already exists (by email and for this event) // Check if attendee already exists (by email and for this event)
$confattendee = new ConferenceOrBoothAttendee($db); $confattendee = new ConferenceOrBoothAttendee($db);
$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email)); $resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) { if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
// Found confattendee // Found confattendee
$confattendee = $resultfetchconfattendee[0]; $confattendee = array_shift($resultfetchconfattendee);
} else { } else {
// Need to create a confattendee // Need to create a confattendee
$confattendee->date_subscription = dol_now(); $confattendee->date_subscription = dol_now();
$confattendee->email = GETPOST("email"); $confattendee->email = $email;
$confattendee->fk_actioncomm = $id; $confattendee->fk_actioncomm = $id;
$resultconfattendee = $confattendee->create($user); $resultconfattendee = $confattendee->create($user);
if ($resultconfattendee < 0) { if ($resultconfattendee < 0) {
@ -248,15 +249,34 @@ if (empty($reshook) && $action == 'add') {
// Getting the thirdparty or creating it // Getting the thirdparty or creating it
$thirdparty = new Societe($db); $thirdparty = new Societe($db);
// Fetch using fk_soc of the existing attendee
if (!empty($confattendee->fk_soc)) {
$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc); $resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
} else {
// Fetch using the input field by user
if (!empty($societe)) {
$resultfetchthirdparty = $thirdparty->fetch('', $societe);
var_dump($resultfetchthirdparty);
if ($resultfetchthirdparty<=0) {
// Need to create a new one
$resultfetchthirdparty = 0;
} else {
$confattendee->fk_soc = $thirdparty->id;
$confattendee->update($user);
}
} else {
// Need to create a thirdparty
$resultfetchthirdparty = 0;
}
}
var_dump($resultfetchthirdparty);
if ($resultfetchthirdparty<0) { if ($resultfetchthirdparty<0) {
$error++; $error++;
$errmsg .= $thirdparty->error; $errmsg .= $thirdparty->error;
$readythirdparty = -1;
} elseif ($resultfetchthirdparty==0) { } elseif ($resultfetchthirdparty==0) {
// creation of a new thirdparty // creation of a new thirdparty
if (!empty(GETPOST("societe"))) { if (!empty($societe)) {
$thirdparty->name = GETPOST("societe"); $thirdparty->name = $societe;
} else { } else {
$thirdparty->name = $email; $thirdparty->name = $email;
} }
@ -288,14 +308,16 @@ if (empty($reshook) && $action == 'add') {
} }
$thirdparty->code_client = $tmpcode; $thirdparty->code_client = $tmpcode;
$readythirdparty = $thirdparty->create($user); $readythirdparty = $thirdparty->create($user);
if ($readythirdparty <0) {
$error++;
$errmsg .= $thirdparty->error;
} else {
$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs); $thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
$thirdparty->country = getCountry($thirdparty->country_code, 0, $db, $langs); $thirdparty->country = getCountry($thirdparty->country_code, 0, $db, $langs);
} else {
// We have an existing thirdparty ready to use
$readythirdparty = 1;
}
// Updating the fk_soc associated to the confattendee to match the ready to use thirdparty we have got
$confattendee->fk_soc = $thirdparty->id; $confattendee->fk_soc = $thirdparty->id;
$confattendee->update($user);
}
}
} }
if (!$error) { if (!$error) {
@ -316,6 +338,7 @@ if (empty($reshook) && $action == 'add') {
$facture->cond_reglement_id = $confattendee->cond_reglement_id; $facture->cond_reglement_id = $confattendee->cond_reglement_id;
if (empty($facture->cond_reglement_id)) { if (empty($facture->cond_reglement_id)) {
var_dump($confattendee->db);
$paymenttermstatic = new PaymentTerm($confattendee->db); $paymenttermstatic = new PaymentTerm($confattendee->db);
$facture->cond_reglement_id = $paymenttermstatic->getDefaultId(); $facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
if (empty($facture->cond_reglement_id)) { if (empty($facture->cond_reglement_id)) {