";
@@ -447,6 +457,7 @@ if ($projectid > 0) {
// --------------------------------------------------------------------
$sql = 'SELECT ';
$sql .= $object->getFieldList('t');
+
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 9f75374f2a0..335c257b224 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -1,4 +1,5 @@
# Copyright (C) 2021 Florian Henry
+# Copyright (C) 2021 Dorian Vabre
#
# 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
@@ -81,6 +82,7 @@ PriceOfBoothHelp=Subscription price to stand a booth
EventOrganizationICSLink=Link ICS for events
ConferenceOrBoothInformation=Conference Or Booth informations
Attendees = Attendees
+DownloadICSLink = Download ICS link
EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
@@ -96,9 +98,13 @@ EvntOrgCancelled = Cancelled
#
# Public page
#
+SuggestForm = Suggestion page
RegisterPage = Page for conferences or booth
-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 vote for an event, or suggest a new conference or booth for the project
+EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference for the project
+EvntOrgRegistrationBoothHelpMessage = Here, you can suggest a new booth for the project
+ListOfSuggestedConferences = List of suggested conferences
+ListOfSuggestedBooths = List of suggested booths
SuggestConference = Suggest a new conference
SuggestBooth = Suggest a booth
ViewAndVote = View and vote for suggested events
@@ -107,6 +113,20 @@ MissingOrBadSecureKey = The security key is invalid or missing
EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
EvntOrgDuration = This conference starts on %s and ends on %s.
ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
+BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+EventType = Event type
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
+EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
+EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
+VoteOk = Your vote has been accepted.
+AlreadyVoted = You have already voted for this event.
+VoteError = An error has occurred during the vote, please try again.
+
#
# SubscriptionOk page
#
@@ -118,5 +138,6 @@ ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a co
#
# Payment page
#
-Attendee = Participant
-PaymentConferenceAttendee = Paiement de participation à une conférence
+Attendee = Attendee
+PaymentConferenceAttendee = Conference attendee payment
+PaymentBoothLocation = Booth location payment
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index cc255b185ed..a0e7ea817a7 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -135,7 +135,12 @@ if (GETPOST("notolderthan", 'int')) {
} else {
$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
}
-
+if (GETPOST("module", 'alpha')) {
+ $filters['module'] = GETPOST("module", 'alpha');
+}
+if (GETPOST("status", 'int')) {
+ $filters['status'] = GETPOST("status", 'int');
+}
// Check config
if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
$user->getrights();
@@ -201,6 +206,15 @@ foreach ($filters as $key => $value) {
if ($key == 'notactiontype') {
$filename .= '-notactiontype'.$value;
}
+ if ($key == 'actiontype') {
+ $filename .= '-actiontype'.$value;
+ }
+ if ($key == 'module') {
+ $filename .= '-module'.$value;
+ }
+ if ($key == 'status') {
+ $filename .= '-status'.$value;
+ }
}
// Add extension
if ($format == 'vcal') {
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 70e994d57cd..a81ac456353 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -1,11 +1,5 @@
- * Copyright (C) 2001-2002 Jean-Louis Bergamo
- * Copyright (C) 2006-2013 Laurent Destailleur
- * Copyright (C) 2012 Regis Houssin
- * Copyright (C) 2012 J. Fernando Lagrange
- * Copyright (C) 2018-2019 Frédéric France
- * Copyright (C) 2018 Alexandre Spangaro
+/* Copyright (C) 2021 Dorian Vabre
*
* 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
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 02fb456f7d2..8586535f5ab 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -3,6 +3,7 @@
* Copyright (C) 2006-2013 Laurent Destailleur
* Copyright (C) 2012 Regis Houssin
* Copyright (C) 2021 Waël Almoman
+ * Copyright (C) 2021 Dorian Vabre
*
* 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
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b58a57fc706..377077531ae 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -5,6 +5,7 @@
* Copyright (C) 2018 Juanjo Menent
* Copyright (C) 2018-2019 Thibault FOUCART
* Copyright (C) 2021 Waël Almoman
+ * Copyright (C) 2021 Dorian Vabre
*
* 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
@@ -142,6 +143,23 @@ if ($source == 'conferencesubscription') {
}
}
}
+} elseif ($source == 'boothlocation') {
+ // Getting the amount to pay, the invoice, finding the thirdparty
+ $invoiceid = GETPOST('ref');
+ $invoice = new Facture($db);
+ $resultinvoice = $invoice->fetch($invoiceid);
+ if ($resultinvoice <= 0) {
+ setEventMessages(null, $invoice->errors, "errors");
+ } else {
+ $amount = price2num($invoice->total_ttc);
+ // Finding the associated thirdparty
+ $thirdparty = new Societe($db);
+ $resultthirdparty = $thirdparty->fetch($invoice->socid);
+ if ($resultthirdparty <= 0) {
+ setEventMessages(null, $thirdparty->errors, "errors");
+ }
+ $object = $thirdparty;
+ }
}
@@ -1807,9 +1825,92 @@ if ($source == 'conferencesubscription') {
// Object
$text = ''.$langs->trans("PaymentConferenceAttendee").'';
- if (GETPOST('desc', 'alpha')) {
- $text = ''.$langs->trans(GETPOST('desc', 'alpha')).'';
+ print '