fix invoice in stand registration pb
This commit is contained in:
parent
50f3960d80
commit
ae5bb956ac
@ -3791,7 +3791,6 @@ abstract class CommonObject
|
|||||||
} elseif ($objecttype == 'contact') {
|
} elseif ($objecttype == 'contact') {
|
||||||
$module = 'societe';
|
$module = 'societe';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set classfile
|
// Set classfile
|
||||||
$classfile = strtolower($subelement);
|
$classfile = strtolower($subelement);
|
||||||
$classname = ucfirst($subelement);
|
$classname = ucfirst($subelement);
|
||||||
@ -3823,6 +3822,11 @@ abstract class CommonObject
|
|||||||
$classfile = 'conferenceorboothattendee';
|
$classfile = 'conferenceorboothattendee';
|
||||||
$classname = 'ConferenceOrBoothAttendee';
|
$classname = 'ConferenceOrBoothAttendee';
|
||||||
$module = 'eventorganization';
|
$module = 'eventorganization';
|
||||||
|
} elseif ($objecttype == 'conferenceorbooth') {
|
||||||
|
$classpath = 'eventorganization/class';
|
||||||
|
$classfile = 'conferenceorbooth';
|
||||||
|
$classname = 'ConferenceOrBooth';
|
||||||
|
$module = 'eventorganization';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Here $module, $classfile and $classname are set
|
// Here $module, $classfile and $classname are set
|
||||||
|
|||||||
@ -7642,6 +7642,10 @@ class Form
|
|||||||
$tplpath = 'expensereport';
|
$tplpath = 'expensereport';
|
||||||
} elseif ($objecttype == 'subscription') {
|
} elseif ($objecttype == 'subscription') {
|
||||||
$tplpath = 'adherents';
|
$tplpath = 'adherents';
|
||||||
|
} elseif ($objecttype == 'conferenceorbooth') {
|
||||||
|
$tplpath = 'eventorganization';
|
||||||
|
} elseif ($objecttype == 'conferenceorboothattendee') {
|
||||||
|
$tplpath = 'eventorganization';
|
||||||
}
|
}
|
||||||
|
|
||||||
global $linkedObjectBlock;
|
global $linkedObjectBlock;
|
||||||
|
|||||||
@ -330,7 +330,15 @@ if (!empty($withproject)) {
|
|||||||
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>';
|
||||||
print '';
|
// Define $urlwithroot
|
||||||
|
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
|
||||||
|
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
|
||||||
|
|
||||||
|
// Show message
|
||||||
|
$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
|
||||||
|
$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
|
||||||
|
$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
|
||||||
|
print $message;
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
@ -496,6 +504,41 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
$keyforbreak='pubregister';
|
$keyforbreak='pubregister';
|
||||||
|
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
|
||||||
|
$object->fetchObjectLinked();
|
||||||
|
|
||||||
|
|
||||||
|
if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
|
||||||
|
foreach ($object->linkedObjects["facture"] as $fac) {
|
||||||
|
/**
|
||||||
|
* @var $fac Facture
|
||||||
|
*/
|
||||||
|
if (empty($fac->paye)) {
|
||||||
|
$key = 'paymentlink_'.$fac->id;
|
||||||
|
print '<tr class="field_'.$key.'"><td';
|
||||||
|
print ' class="titlefield fieldname_'.$key;
|
||||||
|
print '">';
|
||||||
|
print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
print '<td class="valuefield fieldname_'.$key;
|
||||||
|
print '">';
|
||||||
|
$sourcetouse = 'boothlocation';
|
||||||
|
$reftouse = $fac->id;
|
||||||
|
$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$object->id;
|
||||||
|
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
|
||||||
|
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
|
||||||
|
$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
|
||||||
|
} else {
|
||||||
|
$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$redirection.'">';
|
||||||
|
print '<a href="'.$redirection.'" target="_blank">'.img_picto('', 'globe', 'class="paddingleft"').'</a></div>';
|
||||||
|
print '</td>';
|
||||||
|
print '</tr>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
//var_dump($object);
|
//var_dump($object);
|
||||||
// Other attributes. Fields from hook formObjectOptions and Extrafields.
|
// Other attributes. Fields from hook formObjectOptions and Extrafields.
|
||||||
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
|
||||||
|
|||||||
@ -421,8 +421,6 @@ if ($projectid > 0) {
|
|||||||
$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
|
$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
|
||||||
$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
|
$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
|
||||||
$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
|
$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
|
||||||
$message .= '</div>';
|
|
||||||
$message .= '<br>';
|
|
||||||
print $message;
|
print $message;
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
|
|||||||
@ -336,7 +336,15 @@ if (!empty($withproject)) {
|
|||||||
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>';
|
||||||
print '';
|
// Define $urlwithroot
|
||||||
|
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
|
||||||
|
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
|
||||||
|
|
||||||
|
// Show message
|
||||||
|
$message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
|
||||||
|
$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
|
||||||
|
$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
|
||||||
|
print $message;
|
||||||
print "</td></tr>";
|
print "</td></tr>";
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|||||||
47
htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
Normal file
47
htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@inodbox.com>
|
||||||
|
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
|
||||||
|
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Protection to avoid direct call of template
|
||||||
|
if (empty($conf) || !is_object($conf)) {
|
||||||
|
print "Error, template page can't be called as URL";
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "<!-- BEGIN PHP TEMPLATE -->\n";
|
||||||
|
|
||||||
|
global $user;
|
||||||
|
|
||||||
|
$langs = $GLOBALS['langs'];
|
||||||
|
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
|
||||||
|
$langs->load("eventorganization");
|
||||||
|
|
||||||
|
$total = 0;
|
||||||
|
foreach ($linkedObjectBlock as $key => $objectlink) {
|
||||||
|
echo '<tr class="oddeven">';
|
||||||
|
echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>';
|
||||||
|
echo '<td>'.$objectlink->getNomUrl(1).'</td>';
|
||||||
|
echo '<td class="center"></td>';
|
||||||
|
echo '<td class="center"></td>';
|
||||||
|
echo '<td class="right"></td>';
|
||||||
|
echo '<td class="right"></td>';
|
||||||
|
echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
|
||||||
|
echo '</tr>';
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "<!-- END PHP TEMPLATE -->\n";
|
||||||
@ -119,6 +119,8 @@ EventType = Event type
|
|||||||
LabelOfBooth=Booth label
|
LabelOfBooth=Booth label
|
||||||
LabelOfconference=Conference label
|
LabelOfconference=Conference label
|
||||||
ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
|
ConferenceIsNotConfirmed=Subcription not available, conference is not confirmed yet
|
||||||
|
DateMustBeBeforeThan=%s must be before %s
|
||||||
|
DateMustBeAfterThan=%s must be after %s
|
||||||
|
|
||||||
#
|
#
|
||||||
# Vote page
|
# Vote page
|
||||||
|
|||||||
@ -1031,6 +1031,8 @@ if ($ispaymentok) {
|
|||||||
if ($resultattendee < 0) {
|
if ($resultattendee < 0) {
|
||||||
setEventMessages(null, $attendeetovalidate->errors, "errors");
|
setEventMessages(null, $attendeetovalidate->errors, "errors");
|
||||||
} else {
|
} else {
|
||||||
|
$attendeetovalidate->amount=$FinalPaymentAmt;
|
||||||
|
$attendeetovalidate->update($user);
|
||||||
$attendeetovalidate->validate($user);
|
$attendeetovalidate->validate($user);
|
||||||
|
|
||||||
// Sending mail
|
// Sending mail
|
||||||
@ -1051,8 +1053,9 @@ if ($ispaymentok) {
|
|||||||
$arraydefaultmessage = null;
|
$arraydefaultmessage = null;
|
||||||
|
|
||||||
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
|
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
|
||||||
|
|
||||||
if (!empty($labeltouse)) {
|
if (!empty($labeltouse)) {
|
||||||
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
|
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
||||||
@ -1066,7 +1069,7 @@ if ($ispaymentok) {
|
|||||||
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
|
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
|
||||||
$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
|
$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
|
||||||
|
|
||||||
$sendto = $thirdparty->email;
|
$sendto = $attendeetovalidate->email;
|
||||||
$from = $conf->global->MAILING_EMAIL_FROM;
|
$from = $conf->global->MAILING_EMAIL_FROM;
|
||||||
$urlback = $_SERVER["REQUEST_URI"];
|
$urlback = $_SERVER["REQUEST_URI"];
|
||||||
|
|
||||||
@ -1233,7 +1236,7 @@ if ($ispaymentok) {
|
|||||||
|
|
||||||
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
|
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
|
||||||
if (!empty($labeltouse)) {
|
if (!empty($labeltouse)) {
|
||||||
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
|
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
||||||
|
|||||||
@ -81,9 +81,8 @@ $email = GETPOST("email");
|
|||||||
$societe = GETPOST("societe");
|
$societe = GETPOST("societe");
|
||||||
$label = GETPOST("label");
|
$label = GETPOST("label");
|
||||||
$note = GETPOST("note");
|
$note = GETPOST("note");
|
||||||
$datestart = GETPOST("datestart");
|
$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
|
||||||
$dateend = GETPOST("dateend");
|
$dateend = dol_mktime(23, 59, 59, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
|
||||||
|
|
||||||
$id = GETPOST('id');
|
$id = GETPOST('id');
|
||||||
|
|
||||||
$project = new Project($db);
|
$project = new Project($db);
|
||||||
@ -225,13 +224,19 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
$error++;
|
$error++;
|
||||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
|
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Note"))."<br>\n";
|
||||||
}
|
}
|
||||||
if (!GETPOST("datestart")) {
|
if (empty($datestart)) {
|
||||||
$error++;
|
$error++;
|
||||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
|
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart"))."<br>\n";
|
||||||
|
} elseif ($datestart < $project->date_start) {
|
||||||
|
$error++;
|
||||||
|
$errmsg .= $langs->trans("DateMustBeAfterThan", $langs->transnoentitiesnoconv("DateStart"), dol_print_date($project->date_start))."<br>\n";
|
||||||
}
|
}
|
||||||
if (!GETPOST("dateend")) {
|
if (empty($dateend)) {
|
||||||
$error++;
|
$error++;
|
||||||
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
|
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd"))."<br>\n";
|
||||||
|
} elseif ($dateend > dol_mktime(23, 59, 59, dol_print_date($project->date_end, '%m'), dol_print_date($project->date_end, '%d'), dol_print_date($project->date_end, '%Y'))) {
|
||||||
|
$error++;
|
||||||
|
$errmsg .= $langs->trans("DateMustBeBeforeThan", $langs->transnoentitiesnoconv("DateEnd"), dol_print_date($project->date_end))."<br>\n";
|
||||||
}
|
}
|
||||||
if (!GETPOST("email")) {
|
if (!GETPOST("email")) {
|
||||||
$error++;
|
$error++;
|
||||||
@ -376,7 +381,7 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
$conforbooth->fk_project = $project->id;
|
$conforbooth->fk_project = $project->id;
|
||||||
$conforbooth->note = $note;
|
$conforbooth->note = $note;
|
||||||
$conforbooth->fk_action = $eventtype;
|
$conforbooth->fk_action = $eventtype;
|
||||||
$conforbooth->datep =$datestart;
|
$conforbooth->datep = $datestart;
|
||||||
$conforbooth->datep2 = $dateend;
|
$conforbooth->datep2 = $dateend;
|
||||||
$conforbooth->datec = dol_now();
|
$conforbooth->datec = dol_now();
|
||||||
$conforbooth->tms = dol_now();
|
$conforbooth->tms = dol_now();
|
||||||
@ -423,7 +428,7 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
$error++;
|
$error++;
|
||||||
} else {
|
} else {
|
||||||
$db->commit();
|
$db->commit();
|
||||||
$facture->add_object_linked($contact->element, $contact->id);
|
$facture->add_object_linked($conforbooth->element, $conforbooth->id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -436,7 +441,7 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
$contact->errors = $facture->errors;
|
$contact->errors = $facture->errors;
|
||||||
$error++;
|
$error++;
|
||||||
}
|
}
|
||||||
if (!$error) {
|
/*if (!$error) {
|
||||||
$valid = true;
|
$valid = true;
|
||||||
$sourcetouse = 'boothlocation';
|
$sourcetouse = 'boothlocation';
|
||||||
$reftouse = $facture->id;
|
$reftouse = $facture->id;
|
||||||
@ -450,54 +455,12 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
}
|
}
|
||||||
Header("Location: ".$redirection);
|
Header("Location: ".$redirection);
|
||||||
exit;
|
exit;
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// If no price has been set for the booth, we confirm it as suggested and we update
|
// If no price has been set for the booth, we confirm it as suggested and we update
|
||||||
$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
|
$conforbooth->status = ConferenceOrBooth::STATUS_SUGGESTED;
|
||||||
$conforbooth->update($user);
|
$conforbooth->update($user);
|
||||||
// Sending mail
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
|
||||||
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
|
|
||||||
$formmail = new FormMail($db);
|
|
||||||
// Set output language
|
|
||||||
$outputlangs = new Translate('', $conf);
|
|
||||||
$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
|
|
||||||
// Load traductions files required by page
|
|
||||||
$outputlangs->loadLangs(array("main", "members"));
|
|
||||||
// Get email content from template
|
|
||||||
$arraydefaultmessage = null;
|
|
||||||
|
|
||||||
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
|
|
||||||
if (!empty($labeltouse)) {
|
|
||||||
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
|
||||||
$subject = $arraydefaultmessage->topic;
|
|
||||||
$msg = $arraydefaultmessage->content;
|
|
||||||
}
|
|
||||||
|
|
||||||
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
|
|
||||||
complete_substitutions_array($substitutionarray, $outputlangs, $object);
|
|
||||||
|
|
||||||
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
|
|
||||||
$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
|
|
||||||
|
|
||||||
$sendto = $thirdparty->email;
|
|
||||||
$from = $conf->global->MAILING_EMAIL_FROM;
|
|
||||||
$urlback = $_SERVER["REQUEST_URI"];
|
|
||||||
|
|
||||||
$ishtml = dol_textishtml($texttosend); // May contain urls
|
|
||||||
|
|
||||||
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
|
|
||||||
|
|
||||||
$result = $mailfile->sendfile();
|
|
||||||
if ($result) {
|
|
||||||
dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
|
|
||||||
} else {
|
|
||||||
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -505,6 +468,50 @@ if (empty($reshook) && $action == 'add') {
|
|||||||
}
|
}
|
||||||
if (!$error) {
|
if (!$error) {
|
||||||
$db->commit();
|
$db->commit();
|
||||||
|
|
||||||
|
// Sending mail
|
||||||
|
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
|
||||||
|
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
|
||||||
|
$formmail = new FormMail($db);
|
||||||
|
// Set output language
|
||||||
|
$outputlangs = new Translate('', $conf);
|
||||||
|
$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
|
||||||
|
// Load traductions files required by page
|
||||||
|
$outputlangs->loadLangs(array("main", "members"));
|
||||||
|
// Get email content from template
|
||||||
|
$arraydefaultmessage = null;
|
||||||
|
|
||||||
|
$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH;
|
||||||
|
if (!empty($labeltouse)) {
|
||||||
|
$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
|
||||||
|
$subject = $arraydefaultmessage->topic;
|
||||||
|
$msg = $arraydefaultmessage->content;
|
||||||
|
}
|
||||||
|
|
||||||
|
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
|
||||||
|
complete_substitutions_array($substitutionarray, $outputlangs, $object);
|
||||||
|
|
||||||
|
$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
|
||||||
|
$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
|
||||||
|
|
||||||
|
$sendto = $thirdparty->email;
|
||||||
|
$from = $conf->global->MAILING_EMAIL_FROM;
|
||||||
|
$urlback = $_SERVER["REQUEST_URI"];
|
||||||
|
|
||||||
|
$ishtml = dol_textishtml($texttosend); // May contain urls
|
||||||
|
|
||||||
|
$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
|
||||||
|
|
||||||
|
$result = $mailfile->sendfile();
|
||||||
|
if ($result) {
|
||||||
|
dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
|
||||||
|
} else {
|
||||||
|
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
|
||||||
|
}
|
||||||
|
|
||||||
$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
|
$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
|
||||||
$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
|
$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
|
||||||
Header("Location: ".$redirection);
|
Header("Location: ".$redirection);
|
||||||
@ -630,12 +637,23 @@ print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol
|
|||||||
print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
|
print '<tr><td>'.$langs->trans("Description").'<FONT COLOR="red">*</FONT></td>'."\n";
|
||||||
print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
|
print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
|
||||||
// Start Date
|
// Start Date
|
||||||
print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT></td>'."\n";
|
print '<tr><td>'.$langs->trans("DateStart").'<FONT COLOR="red">*</FONT>';
|
||||||
print '<td><input type="date" name="datestart" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('datestart')).'"></td></tr>'."\n";
|
if (!empty($project->date_start)) {
|
||||||
|
print '('.$langs->trans('Min'). ' '.dol_print_date($project->date_start).')';
|
||||||
|
}
|
||||||
|
print '</td>'."\n";
|
||||||
|
print '<td>';
|
||||||
|
print $form->selectDate((empty($datestart)?$project->date_start:$datestart), 'datestart');
|
||||||
|
print '</td></tr>'."\n";
|
||||||
// End Date
|
// End Date
|
||||||
print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT></td>'."\n";
|
print '<tr><td>'.$langs->trans("DateEnd").'<FONT COLOR="red">*</FONT>';
|
||||||
print '<td><input type="date" name="dateend" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('dateend')).'"></td></tr>'."\n";
|
if (!empty($project->date_end)) {
|
||||||
|
print '('.$langs->trans('Max'). ' '.dol_print_date($project->date_end).')';
|
||||||
|
}
|
||||||
|
print '</td>'."\n";
|
||||||
|
print '<td>';
|
||||||
|
print $form->selectDate(empty($dateend)?$project->date_end:$dateend, 'dateend');
|
||||||
|
print '</td></tr>'."\n";
|
||||||
|
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user