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

country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-06 14:06:53 +02:00
parent abeb1c644c
commit 9c20e92e17
4 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,7 @@ EvntOrgCancelled = Cancelled
# #
# Public page # Public page
# #
SuggestForm = Suggestion page
RegisterPage = Page for conferences or booth RegisterPage = Page for conferences or booth
EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page. EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project

2
htdocs/public/project/index.php
View File

@ -134,7 +134,7 @@ $conf->dol_hide_topmenu = 1;
$conf->dol_hide_leftmenu = 1; $conf->dol_hide_leftmenu = 1;
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>'; $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea); llxHeader($head, $langs->trans("SuggestForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
print '<span id="dolpaymentspan"></span>'."\n"; print '<span id="dolpaymentspan"></span>'."\n";
print '<div class="center">'."\n"; print '<div class="center">'."\n";

8
htdocs/public/project/suggestbooth.php
View File

@ -377,6 +377,13 @@ if (empty($reshook) && $action == 'add') {
$error++; $error++;
$errmsg .= $conforbooth->error; $errmsg .= $conforbooth->error;
} else { } else {
// Adding the contact to the project
/*$resultaddcontact = $conforbooth->add_contact($contact);
if ($resultaddcontact<0) {
$error++;
$errmsg .= $conforbooth->error;
} else {*/
// If this is a paying booth, we have to redirect to payment page and create an invoice // If this is a paying booth, we have to redirect to payment page and create an invoice
if (!empty(floatval($project->price_booth))) { if (!empty(floatval($project->price_booth))) {
$productforinvoicerow = new Product($db); $productforinvoicerow = new Product($db);
@ -484,6 +491,7 @@ if (empty($reshook) && $action == 'add') {
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
} }
} }
//}
} }
} }
} }

13
htdocs/public/project/suggestconference.php
View File

@ -242,10 +242,6 @@ if (empty($reshook) && $action == 'add') {
$langs->load("errors"); $langs->load("errors");
$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n"; $errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
} }
if (!GETPOST("country_id")) {
$error++;
$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
}
if (!$error) { if (!$error) {
// Getting the thirdparty or creating it // Getting the thirdparty or creating it
@ -377,9 +373,15 @@ if (empty($reshook) && $action == 'add') {
$error++; $error++;
$errmsg .= $conforbooth->error; $errmsg .= $conforbooth->error;
} else { } else {
// If this is a paying booth, we have to redirect to payment page and create an invoice // Adding the contact to the project
/*$resultaddcontact = $conforbooth->add_contact($contact);
if ($resultaddcontact<0) {
$error++;
$errmsg .= $conforbooth->error;
} else {*/
$conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED; $conforbooth->status = CONFERENCEORBOOTH::STATUS_SUGGESTED;
$conforbooth->update($user); $conforbooth->update($user);
// Sending mail // Sending mail
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@ -422,6 +424,7 @@ if (empty($reshook) && $action == 'add') {
} else { } else {
dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment'); dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
} }
//}
} }
} }
} }