'."\n";
+
+ // Common attributes
+ //$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
+ //unset($object->fields['fk_project']); // Hide field already shown in banner
+ //unset($object->fields['fk_member']); // Hide field already shown in banner
+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+ // End of subscription date
+ $fadherent = new Adherent($db);
+ $fadherent->fetch($object->fk_member);
+ print '
'.$langs->trans("SubscriptionEndDate").'
';
+ if ($fadherent->datefin) {
+ print dol_print_date($fadherent->datefin, 'day');
+ if ($fadherent->hasDelay()) {
+ print " ".img_warning($langs->trans("Late"));
+ }
+ } else {
+ if (!$adht->subscription) {
+ print $langs->trans("SubscriptionNotRecorded");
+ if ($fadherent->statut > 0) {
+ print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+ }
+ } else {
+ print $langs->trans("SubscriptionNotReceived");
+ if ($fadherent->statut > 0) {
+ print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+ }
+ }
+ }
+ print '
';
+
+ // Other attributes. Fields from hook formObjectOptions and Extrafields.
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+ print '
__(Sincerely)__ __USER_SIGNATURE__', null, '1', null);
diff --git a/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
new file mode 100644
index 00000000000..7e0bb6661f6
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2021 Noé Cendrier
+--
+-- 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 .
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index e69cad3564c..5dfeac1d222 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -587,4 +587,5 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
-- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant double(24,8) NULL;
-- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN montant DROP NOT NULL;
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index af6c2f48f50..e26930739a7 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -59,11 +59,11 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
+
-- For v14
-ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
-
create table llx_accounting_groups_account
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
@@ -157,6 +157,18 @@ CREATE TABLE llx_workstation_workstation_usergroup(
fk_workstation integer
) ENGINE=innodb;
+CREATE TABLE llx_c_producbatch_qcstatus(
+ rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+ entity integer NOT NULL DEFAULT 1,
+ code varchar(16) NOT NULL,
+ label varchar(50) NOT NULL,
+ active integer DEFAULT 1 NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
+
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);
@@ -187,6 +199,7 @@ ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_i
ALTER TABLE llx_fichinter ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
ALTER TABLE llx_projet ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
+ALTER TABLE llx_expensereport ADD COLUMN last_main_doc varchar(255) DEFAULT NULL AFTER model_pdf;
create table llx_payment_vat
(
@@ -220,7 +233,7 @@ ALTER TABLE llx_tva ALTER COLUMN paye SET DEFAULT 0;
INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,
\n \n\n \n\n __(Sincerely)__ \n __[MAIN_INFO_SOCIETE_NOM]__ \n \n');
+ALTER TABLE llx_adherent ADD COLUMN url varchar(255) NULL AFTER email;
ALTER TABLE llx_facture_fourn ADD COLUMN date_closing datetime DEFAULT NULL after date_valid;
ALTER TABLE llx_facture_fourn ADD COLUMN fk_user_closing integer DEFAULT NULL after fk_user_valid;
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
new file mode 100644
index 00000000000..9ffa27bc3a5
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2021 Noé Cendrier
+--
+-- 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 .
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
new file mode 100644
index 00000000000..73daa56067a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2012-2017 Noé Cendrier
+--
+-- 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 2 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 .
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_productbatch_qcstatus
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer NOT NULL DEFAULT 1,
+ code varchar(16) NOT NULL,
+ label varchar(50) NOT NULL,
+ active integer DEFAULT 1 NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d803593bc3e..a69bf9e9ca2 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -966,6 +966,8 @@ Permission23003=Delete Scheduled job
Permission23004=Execute Scheduled job
Permission50101=Use Point of Sale (SimplePOS)
Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
Permission50201=Read transactions
Permission50202=Import transactions
Permission50330=Read objects of Zapier
@@ -1045,6 +1047,7 @@ DictionaryOpportunityStatus=Lead status for project/lead
DictionaryExpenseTaxCat=Expense report - Transportation categories
DictionaryExpenseTaxRange=Expense report - Range by transportation category
DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product lot/serial Quality Control status
TypeOfUnit=Type of unit
SetupSaved=Setup saved
SetupNotSaved=Setup not saved
@@ -1434,6 +1437,7 @@ MemberMainOptions=Main options
AdherentLoginRequired= Manage a Login for each member
AdherentMailRequired=Email required to create a new member
MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders.
MembersDocModules=Document templates for documents generated from member record
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index c4f88a8d5b3..a1155b0f57c 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -299,3 +299,4 @@ WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So y
ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
CheckVersionFail=Version check fail
+ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index a9d31c1dbaf..9f75374f2a0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -82,6 +82,8 @@ EventOrganizationICSLink=Link ICS for events
ConferenceOrBoothInformation=Conference Or Booth informations
Attendees = Attendees
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
#
# Status
#
@@ -94,8 +96,27 @@ EvntOrgCancelled = Cancelled
#
# Public 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
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
PublicAttendeeSubscriptionPage = Public link of registration to a conference
MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference
-EvntOrgStartDuration = This conference starts on
-EvntOrgEndDuration = and ends on
+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.
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated
+#
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
+# Payment page
+#
+Attendee = Participant
+PaymentConferenceAttendee = Paiement de participation à une conférence
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b6d2e4c4ef8..d91989190e0 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1072,6 +1072,7 @@ ValidFrom=Valid from
ValidUntil=Valid until
NoRecordedUsers=No users
ToClose=To close
+ToRefuse=To refuse
ToProcess=To process
ToApprove=To approve
GlobalOpenedElemView=Global view
@@ -1126,6 +1127,7 @@ UpdateForAllLines=Update for all lines
OnHold=On hold
Civility=Civility
AffectTag=Affect Tag
+CreateExternalUser=Create external user
ConfirmAffectTag=Bulk Tag Affect
ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
CategTypeNotFound=No tag type found for type of records
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 5bd1a545bfa..6f5e47591f3 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -213,3 +213,4 @@ SendReminderForExpiredSubscription=Send reminder by email to members when subscr
MembershipPaid=Membership paid for current period (until %s)
YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
XMembersClosed=%s member(s) closed
+XExternalUserCreated=%s external user(s) created
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 7681449755e..df9619533de 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -16,41 +16,65 @@
#
# Generic
#
-ModulePartnershipName = Partnership management
-PartnershipDescription = Module Partnership management
+ModulePartnershipName=Partnership management
+PartnershipDescription=Module Partnership management
PartnershipDescriptionLong= Module Partnership management
#
# Menu
#
-NewPartnership = New Partnership
-ListOfPartnerships = List of partnership
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
#
# Admin page
#
-PartnershipSetup = Partnership setup
-PartnershipAbout = About Partnership
-PartnershipAboutPage = Partnership about page
-
+PartnershipSetup=Partnership setup
+PartnershipAbout=About Partnership
+PartnershipAboutPage=Partnership about page
+partnershipforthirdpartyormember=Partnership is for a 'thirdparty' or for a 'member'
+PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancel status of partnership when subscription is expired
#
# Object
#
+DeletePartnership=Delete a partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
+PartnershipDedicatedToThisMember=Partnership dedicated to this member
DatePartnershipStart=Start date
DatePartnershipEnd=End date
+ReasonDecline=Decline reason
+ReasonDeclineOrCancel=Decline reason
+PartnershipAlreadyExist=Partnership already exist
+ShowPartnership=Show partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
+ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
#
# Template Mail
#
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
+SendingEmailOnPartnershipRefused=Partnership refused
+SendingEmailOnPartnershipAccepted=Partnership accepted
+SendingEmailOnPartnershipCanceled=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
+YourPartnershipRefusedTopic=Partnership refused
+YourPartnershipAcceptedTopic=Partnership accepted
+YourPartnershipCanceledTopic=Partnership canceled
+
+YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
+YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
+YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
#
# Status
#
-PartnershipDraft = Draft
-PartnershipAccepted = Accepted
-PartnershipRefused = Refused
-PartnershipCanceled = Canceled
-
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
PartnershipManagedFor=Partners are
\ No newline at end of file
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index e7105c544ed..450d0285819 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
ManageLotSerial=Use lot/serial number
ProductStatusOnBatch=Yes (lot required)
ProductStatusOnSerial=Yes (unique serial number required)
@@ -39,5 +39,7 @@ ManufacturingDate=Manufacturing date
DestructionDate=Destruction date
FirstUseDate=First use date
QCFrequency=Quality control frequency (in days)
-InWorkingOrder=In working order
+
+#Traceability - qc status
OutOfOrder=Out of order
+InWorkingOrder=In working order
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 44e4aba52ed..e9b5ddf5c4e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1044,6 +1044,7 @@ DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
+DictionaryBatchStatus=État de qualité du lot/série (produits)
TypeOfUnit=Type d'unité
SetupSaved=Configuration sauvegardée
SetupNotSaved=Configuration non enregistrée
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 68714707a9c..337af188fe1 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
ManageLotSerial=Utiliser les numéros de lots/série
ProductStatusOnBatch=Oui (Lot/Série requis)
ProductStatusOnSerial=Oui (numéro de série unique requis)
@@ -30,8 +30,8 @@ BatchLotNumberingModules=Options pour la génération automatique de produits en
BatchSerialNumberingModules=Options pour la génération automatique de produits en lots gérés par numéros de série
ManageLotMask=Masque personnalisé
CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
-LotProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de lot dédié
-SNProductTooltip=Ajoute une option dans la fiche produit pour définir un masque de numéro de série dédié
+LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
QtyToAddAfterBarcodeScan=Quantité à ajouter pour chaque code à barres/lot/série scanné
LifeTime=Durée de vie (en jours)
EndOfLife=Date de fin de vie
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d687faebfb8..9007eab60cc 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -82,6 +82,7 @@ $arrayofparameters = array(
//'MYMODULE_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
//'MYMODULE_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
//'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+ //'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
);
$error = 0;
@@ -299,6 +300,11 @@ if ($action == 'edit') {
});';
print '';
}
+ } elseif ($val['type'] == 'product') {
+ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+ $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+ $form->select_produits($selected, $constname, '', 0);
+ }
} else {
print '';
}
@@ -365,8 +371,16 @@ if ($action == 'edit') {
} elseif ($conf->global->{$constname}==0) {
print $langs->trans("NorProspectNorCustomer");
}
+ } elseif ($val['type'] == 'product') {
+ $product = new Product($db);
+ $resprod = $product->fetch($conf->global->{$constname});
+ if ($resprod > 0) {
+ print $product->ref;
+ } elseif ($resprod < 0) {
+ setEventMessages(null, $object->errors, "errors");
+ }
} else {
- print $conf->global->{$constname};
+ print $conf->global->{$constname};
}
print '';
}
diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
new file mode 100644
index 00000000000..0d3fb11c4e3
--- /dev/null
+++ b/htdocs/partnership/admin/about.php
@@ -0,0 +1,101 @@
+
+ * Copyright (C) 2021 Dorian Laurent
+ *
+ * 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 .
+ */
+
+/**
+ * \file partnership/admin/about.php
+ * \ingroup partnership
+ * \brief About page of module Partnership.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+ $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+ $i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+ $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+ $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) {
+ $res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+ $res = @include "../../../main.inc.php";
+}
+if (!$res) {
+ die("Include of main fails");
+}
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once '../lib/partnership.lib.php';
+
+// Translations
+$langs->loadLangs(array("errors", "admin", "partnership@partnership"));
+
+// Access control
+if (!$user->admin) {
+ accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+
+/*
+ * Actions
+ */
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$page_name = "PartnershipAbout";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = ''.$langs->trans("BackToModuleList").'';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = partnershipAdminPrepareHead();
+print dol_get_fiche_head($head, 'about', '', 0, 'partnership@partnership');
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/modPartnership.class.php';
+$tmpmodule = new modPartnership($db);
+print $tmpmodule->getDescLong();
+
+// Page end
+print dol_get_fiche_end();
+llxFooter();
+$db->close();
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index aac962ede72..d681274106c 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -82,36 +82,21 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
if ($action == 'setting') {
require_once DOL_DOCUMENT_ROOT."/core/modules/modPartnership.class.php";
- $partnership = new modPartnership($db);
- $value = GETPOST('managed_for', 'alpha');
-
-
- $modulemenu = ($value == 'member') ? 'member' : 'thirdparty';
+ $modulemenu = (GETPOST('PARTNERSHIP_IS_MANAGED_FOR', 'alpha') == 'member') ? 'member' : 'thirdparty';
$res = dolibarr_set_const($db, "PARTNERSHIP_IS_MANAGED_FOR", $modulemenu, 'chaine', 0, '', $conf->entity);
- $partnership->tabs = array();
- if ($modulemenu == 'member') {
- $partnership->tabs[] = array('data'=>'member:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
- $fk_mainmenu = "members";
- } else {
- $partnership->tabs[] = array('data'=>'thirdparty:+partnership:Partnership:partnership:$user->rights->partnership->read:/partnership/partnership.php?socid=__ID__');
- $fk_mainmenu = "companies";
- }
-
- foreach ($partnership->menu as $key => $menu) {
- $partnership->menu[$key]['mainmenu'] = $fk_mainmenu;
-
- if ($menu['leftmenu'] == 'partnership')
- $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu;
- else $partnership->menu[$key]['fk_menu'] = 'fk_mainmenu='.$fk_mainmenu.',fk_leftmenu=partnership';
- }
+ $partnership = new modPartnership($db);
$error += $partnership->delete_tabs();
$error += $partnership->insert_tabs();
$error += $partnership->delete_menus();
$error += $partnership->insert_menus();
+
+ if (GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'))
+ dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'), 'chaine', 0, '', $conf->entity);
+ dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
}
if ($action) {
@@ -120,6 +105,8 @@ if ($action) {
} else {
setEventMessages($langs->trans("SetupNotError"), null, 'errors');
}
+ header("Location: ".$_SERVER['PHP_SELF']);
+ exit;
}
/*
@@ -154,19 +141,48 @@ print '';
print '
';
-// Default partnership price base type
-print '
';
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 1dab8890050..a42e12fd412 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -100,26 +100,7 @@ class Partnership extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
- 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,),
- 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
- 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
- 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
- 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
- 'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
- 'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
- 'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
- 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
- 'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
- 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>4, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'Refused', '9'=>'Canceled'),),
- 'fk_member' => array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>51, 'notnull'=>-1, 'visible'=>1, 'index'=>1,),
- 'date_partnership_start' => array('type'=>'datetime', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
- 'date_partnership_end' => array('type'=>'datetime', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
- 'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
- 'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
- );
+ public $fields=array();
public $rowid;
public $ref;
public $fk_soc;
@@ -137,6 +118,7 @@ class Partnership extends CommonObject
public $date_partnership_start;
public $date_partnership_end;
public $count_last_url_check_error;
+ public $last_check_backlink;
public $reason_decline_or_cancel;
// END MODULEBUILDER PROPERTIES
@@ -188,12 +170,39 @@ class Partnership extends CommonObject
$this->db = $db;
+ $this->fields=array(
+ 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+ 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+ 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
+ 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+ 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+ 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+ 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+ 'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+ 'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+ 'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+ 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+ 'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+ 'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
+ 'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>1, 'visible'=>1,),
+ 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>$langs->trans('Draft'), '1'=>$langs->trans('Accepted'), '2'=>$langs->trans('Refused'), '9'=>$langs->trans('Canceled')),),
+ 'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
+ 'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
+ 'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
+ );
+
+ if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+ $this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+ } else {
+ $this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1,);
+ }
+
if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
$this->fields['rowid']['visible'] = 0;
}
- if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
- $this->fields['entity']['enabled'] = 0;
- }
+ // if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+ // $this->fields['entity']['enabled'] = 0;
+ // }
// Example to show how to set values of fields definition dynamically
/*if ($user->rights->partnership->read) {
@@ -229,6 +238,7 @@ class Partnership extends CommonObject
*/
public function create(User $user, $notrigger = false)
{
+ $this->status = 0;
return $this->createCommon($user, $notrigger);
}
@@ -333,20 +343,97 @@ class Partnership extends CommonObject
/**
* Load object in memory from the database
+ * Get object from database. Get also lines.
*
- * @param int $id Id object
- * @param string $ref Ref
- * @return int <0 if KO, 0 if not found, >0 if OK
+ * @param int $id Id of object to load
+ * @param string $ref Ref of object
+ * @param int $fk_soc_or_member fk_soc or fk_member
+ * @return int >0 if OK, <0 if KO, 0 if not found
*/
- public function fetch($id, $ref = null)
+ public function fetch($id, $ref = null, $fk_soc_or_member = null)
{
- $result = $this->fetchCommon($id, $ref);
- if ($result > 0 && !empty($this->table_element_line)) {
- $this->fetchLines();
+ global $conf;
+
+ // Check parameters
+ if (empty($id) && empty($ref) && empty($fk_soc_or_member)) {
+ return -1;
+ }
+
+ $sql = 'SELECT p.rowid, p.ref, p.fk_soc, p.fk_member, p.status';
+ $sql .= ', p.entity, p.date_partnership_start, p.date_partnership_end, p.date_creation';
+ $sql .= ', p.fk_user_creat, p.tms, p.fk_user_modif, p.fk_user_modif';
+ $sql .= ', p.note_private, p.note_public';
+ $sql .= ', p.last_main_doc, p.count_last_url_check_error, p.last_check_backlink, p.reason_decline_or_cancel';
+ $sql .= ', p.import_key, p.model_pdf';
+
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'partnership as p';
+
+ if ($id) {
+ $sql .= " WHERE p.rowid=".$id;
+ } else {
+ $sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Dont't use entity if you use rowid
+ }
+
+ if ($ref) {
+ $sql .= " AND p.ref='".$this->db->escape($ref)."'";
+ }
+
+ if ($fk_soc_or_member) {
+ $sql .= ' AND';
+ if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
+ $sql .= ' p.fk_member = ';
+ else $sql .= ' p.fk_soc = ';
+ $sql .= $fk_soc_or_member;
+ $sql .= ' ORDER BY p.date_partnership_end DESC';
+ }
+
+ dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result) {
+ $obj = $this->db->fetch_object($result);
+ if ($obj) {
+ $this->id = $obj->rowid;
+ $this->entity = $obj->entity;
+ $this->rowid = $obj->rowid;
+ $this->ref = $obj->ref;
+ $this->fk_soc = $obj->fk_soc;
+ $this->fk_member = $obj->fk_member;
+ $this->status = $obj->status;
+ $this->date_partnership_start = $this->db->jdate($obj->date_partnership_start);
+ $this->date_partnership_end = $this->db->jdate($obj->date_partnership_end);
+ $this->date_creation = $this->db->jdate($obj->date_creation);
+ $this->fk_user_creat = $obj->fk_user_creat;
+ $this->tms = $obj->tms;
+ $this->fk_user_modif = $obj->fk_user_modif;
+ $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
+ $this->last_main_doc = $obj->last_main_doc;
+ $this->count_last_url_check_error = $obj->count_last_url_check_error;
+ $this->last_check_backlink = $this->db->jdate($obj->last_check_backlink);
+ $this->reason_decline_or_cancel = $obj->reason_decline_or_cancel;
+ $this->import_key = $obj->import_key;
+ $this->model_pdf = $obj->model_pdf;
+
+ $this->lines = array();
+
+ // Retrieve all extrafield
+ // fetch optionals attributes and labels
+ $this->fetch_optionals();
+
+ $this->db->free($result);
+
+ return 1;
+ } else {
+ // $this->error = 'Partnership with id '.$id.' not found sql='.$sql;
+ return 0;
+ }
+ } else {
+ $this->error = $this->db->error();
+ return -1;
}
- return $result;
}
+
/**
* Load object lines in memory from the database
*
@@ -765,21 +852,24 @@ class Partnership extends CommonObject
* @param int $notrigger 1=Does not execute triggers, 0=Execute triggers
* @return int <0 if KO, 0=Nothing done, >0 if OK
*/
- public function refused($user, $notrigger = '')
+ public function refused($user, $reasondeclinenote = '', $notrigger = 0)
{
// Protection
- // if ($this->status != self::STATUS_DRAFT) {
- // return 0;
- // }
+ if ($this->status == self::STATUS_REFUSED) {
+ return 0;
+ }
- /*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
- || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
- {
- $this->error='Permission denied';
- return -1;
- }*/
+ $this->status = self::STATUS_REFUSED;
+ $this->reason_decline_or_cancel = $reasondeclinenote;
- return $this->setStatusCommon($user, self::STATUS_REFUSED, $notrigger, 'PARTNERSHIP_REFUSE');
+ $result = $this->update($user);
+
+ if ($result) {
+ $this->reason_decline_or_cancel = $reasondeclinenote;
+ return 1;
+ }
+
+ return -1;
}
/**
@@ -816,7 +906,7 @@ class Partnership extends CommonObject
public function reopen($user, $notrigger = 0)
{
// Protection
- if ($this->status != self::STATUS_CANCELED) {
+ if ($this->status != self::STATUS_CANCELED && $this->status != self::STATUS_REFUSED) {
return 0;
}
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 61659e6075c..992fca2703e 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -26,16 +26,20 @@
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
dol_include_once('partnership/lib/partnership.lib.php');
+dol_include_once('/partnership/class/partnership.class.php');
-
+require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
/**
* Class with cron tasks of Partnership module
*/
class PartnershipUtils
{
public $db; //!< To store db handler
- public $error; //!< To return error code (or message)
+ public $error; //!< To return error code (or message)
public $errors=array(); //!< To return several error codes (or messages)
@@ -50,33 +54,387 @@ class PartnershipUtils
return 1;
}
-
/**
- * Action executed by scheduler to cancel status of partnership when subscription is expired + x days. (Max number of cancel per call = $conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL)
+ * Action executed by scheduler to cancel status of partnership when subscription is expired + x days. (Max number of action batch per call = $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL)
*
* CAN BE A CRON TASK
*
* @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
*/
- public function doCancelStatusOfPartnership()
+ public function doCancelStatusOfMemberPartnership()
{
global $conf, $langs, $user;
- $langs->load("agenda");
+ $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
- $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL) ? 100 : $conf->global->PARTNERSHIP_MAX_CANCEL_PER_CALL); // Limit to 100 per call
+ if ($managedfor != 'member') {
+ return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.
+ }
- $error = 0;
- $this->output = '';
- $this->error='';
+ $partnership = new Partnership($this->db);
+ $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL); // Limit to 25 per call
+ $langs->loadLangs(array("partnership", "member"));
- dol_syslog(__METHOD__." we cancel status of partnership ", LOG_DEBUG);
+ $error = 0;
+ $erroremail = '';
+ $this->output = '';
+ $this->error = '';
+ $partnershipsprocessed = array();
+
+ $gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+ if ($gracedelay < 1) {
+ $this->error='BadValueForDelayBeforeCancelCheckSetup';
+ return -1;
+ }
+
+ dol_syslog(get_class($this)."::doCancelStatusOfMemberPartnership cancel expired partnerships with grace delay of ".$gracedelay);
$now = dol_now();
+ $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
- // En cours de traitement ...
+ $this->db->begin();
+
+ $sql = "SELECT p.rowid, p.fk_member, p.status";
+ $sql .= ", d.datefin, d.fk_adherent_type, dty.subscription";
+ $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = p.fk_member)";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
+ $sql .= " WHERE fk_member > 0";
+ $sql .= " AND (d.datefin < '".$this->db->idate($datetotest)."' AND dty.subscription = 1)";
+ $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+ $sql .= $this->db->order('d.rowid', 'ASC');
+ // Limit is managed into loop later
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $numofexpiredmembers = $this->db->num_rows($resql);
+
+ $somethingdoneonpartnership = 0;
+ $ifetchpartner = 0;
+ while ($ifetchpartner < $numofexpiredmembers) {
+ $ifetchpartner++;
+
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+
+ if ($somethingdoneonpartnership >= $MAXPERCALL) {
+ dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
+ break;
+ }
+
+ $object = new Partnership($this->db);
+ $object->fetch($obj->rowid);
+
+ // Get expiration date
+ $expirationdate = $obj->datefin;
+
+ if ($expirationdate && $expirationdate < $now) { // If contract expired (we already had a test into main select, this is a security)
+ $somethingdoneonpartnership++;
+
+ $result = $object->cancel($user, 0);
+ // $conf->global->noapachereload = null;
+ if ($result < 0) {
+ $error++;
+ $this->error = $object->error;
+ if (is_array($object->errors) && count($object->errors)) {
+ if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
+ else $this->errors = $object->errors;
+ }
+ } else {
+ $partnershipsprocessed[$object->id]=$object->ref;
+
+ // Send an email to inform member
+ $labeltemplate = '(SendingEmailOnPartnershipCanceled)';
+
+ dol_syslog("Now we will send an email to member id=".$object->fk_member." with label ".$labeltemplate);
+
+ // Send deployment email
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+ $formmail=new FormMail($this->db);
+
+ // Define output language
+ $outputlangs = $langs;
+ $newlang = '';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+ if (! empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ $outputlangs->loadLangs(array('main','member','partnership'));
+ }
+
+ $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+
+ $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+ complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+ $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+ $msg = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+ $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+
+ $adherent = new Adherent($this->db);
+ $adherent->fetch($object->fk_member);
+ $to = $adherent->email;
+
+ $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+ $result = $cmail->sendfile();
+ if (! $result || $cmail->error) {
+ $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+ $this->errors[] = $cmail->error;
+ if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+ }
+ }
+ }
+ }
+ }
+ } else {
+ $error++;
+ $this->error = $this->db->lasterror();
+ }
+
+ if (! $error) {
+ $this->db->commit();
+ $this->output = $numofexpiredmembers.' expired partnership members found'."\n";
+ if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+ } else {
+ $this->db->rollback();
+ $this->output = "Rollback after error\n";
+ $this->output.= $numofexpiredmembers.' expired partnership members found'."\n";
+ if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail;
+ }
return ($error ? 1: 0);
}
+
+
+ /**
+ * Action executed by scheduler to check if Dolibarr backlink not found on partner website. (Max number of action batch per call = $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL)
+ *
+ * CAN BE A CRON TASK
+ *
+ * @return int 0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+ */
+ public function doWarningOfPartnershipIfDolibarrBacklinkNotfound()
+ {
+ global $conf, $langs, $user;
+
+ $managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+
+ $partnership = new Partnership($this->db);
+ $MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL); // Limit to 10 per call
+
+ $langs->loadLangs(array("partnership", "member"));
+
+ $error = 0;
+ $erroremail = '';
+ $this->output = '';
+ $this->error = '';
+ $partnershipsprocessed = array();
+
+ $gracedelay=$conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+ if ($gracedelay < 1) {
+ $this->error='BadValueForDelayBeforeCancelCheckSetup';
+ return -1;
+ }
+
+ $fk_partner = ($managedfor == 'member') ? 'fk_member' : 'fk_soc';
+
+ dol_syslog(get_class($this)."::doWarningOfPartnershipIfDolibarrBacklinkNotfound Warning of partnership");
+
+ $now = dol_now();
+ $datetotest = dol_time_plus_duree($now, -1 * abs($gracedelay), 'd');
+
+ $this->db->begin();
+
+ $sql = "SELECT p.rowid, p.status, p.".$fk_partner;
+ $sql .= ", p.last_check_backlink";
+
+ $sql .= ', partner.url, partner.email';
+
+ $sql .= " FROM ".MAIN_DB_PREFIX."partnership as p";
+
+ if ($managedfor == 'member') {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as partner on (partner.rowid = p.fk_member)";
+ } else {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as partner on (partner.rowid = p.fk_soc)";
+ }
+
+ $sql .= " WHERE 1 = 1";
+ $sql .= " AND p.".$fk_partner." > 0";
+ $sql .= " AND p.status = ".$partnership::STATUS_ACCEPTED; // Only accepted not yet canceled
+ $sql .= " AND (p.last_check_backlink IS NULL OR p.last_check_backlink <= '".$this->db->idate($now - 7 * 24 * 3600)."')"; // Every week, check that website contains a link to dolibarr.
+ $sql .= $this->db->order('p.rowid', 'ASC');
+ // Limit is managed into loop later
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $numofexpiredmembers = $this->db->num_rows($resql);
+ $somethingdoneonpartnership = 0;
+ $ifetchpartner = 0;
+ while ($ifetchpartner < $numofexpiredmembers) {
+ $ifetchpartner++;
+
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ if (! empty($partnershipsprocessed[$obj->rowid])) continue;
+
+ if ($somethingdoneonpartnership >= $MAXPERCALL) {
+ dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
+ break;
+ }
+
+ $backlinkfound = 0;
+
+ $object = new Partnership($this->db);
+ $object->fetch($obj->rowid);
+
+ if ($managedfor == 'member') {
+ $fk_partner = $object->fk_member;
+ } else {
+ $fk_partner = $object->fk_soc;
+ }
+
+ $website = $obj->url;
+
+ if (empty($website)) {
+ $websitenotfound .= ($websitenotfound ? ', ' : '').'Website not found for id="'.$fk_partner.'"'."\n";
+ } else {
+ $backlinkfound = $this->checkDolibarrBacklink($website);
+ }
+
+ if (!$backlinkfound) {
+ $tmpcount = $object->count_last_url_check_error + 1;
+
+ if ($tmpcount > 2 && $tmpcount <= 4) { // Send Warning Email
+ if (!empty($obj->email)) {
+ $emailnotfound .= ($emailnotfound ? ', ' : '').'Email not found for id="'.$fk_partner.'"'."\n";
+ } else {
+ $labeltemplate = '(SendingEmailOnPartnershipWillSoonBeCanceled)';
+
+ dol_syslog("Now we will send an email to partner id=".$fk_partner." with label ".$labeltemplate);
+
+ // Send deployment email
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+ $formmail=new FormMail($this->db);
+
+ // Define output language
+ $outputlangs = $langs;
+ $newlang = '';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+ if (! empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ $outputlangs->loadLangs(array('main','member','partnership'));
+ }
+
+ $arraydefaultmessage=$formmail->getEMailTemplate($this->db, 'partnership_send', $user, $outputlangs, 0, 1, $labeltemplate);
+
+ $substitutionarray=getCommonSubstitutionArray($outputlangs, 0, null, $object);
+ complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+ $subject = make_substitutions($arraydefaultmessage->topic, $substitutionarray, $outputlangs);
+ $msg = make_substitutions($arraydefaultmessage->content, $substitutionarray, $outputlangs);
+ $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+
+ $to = $obj->email;
+
+ $cmail = new CMailFile($subject, $to, $from, $msg, array(), array(), array(), '', '', 0, 1);
+ $result = $cmail->sendfile();
+ if (! $result || $cmail->error) {
+ $erroremail .= ($erroremail ? ', ' : '').$cmail->error;
+ $this->errors[] = $cmail->error;
+ if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+ }
+ }
+ } elseif ($tmpcount > 4) { // Cancel Partnership
+ $object->status = $object::STATUS_CANCELED;
+ $object->reason_decline_or_cancel = $langs->trans('BacklinkNotFoundOnPartnerWebsite');
+ }
+
+ $object->count_last_url_check_error = $tmpcount;
+ } else {
+ $object->count_last_url_check_error = 0;
+ $object->reason_decline_or_cancel = '';
+ }
+
+ $partnershipsprocessed[$object->id]=$object->ref;
+
+ $object->last_check_backlink = $this->db->idate($now);
+
+ $object->update($user);
+ }
+ }
+ } else {
+ $error++;
+ $this->error = $this->db->lasterror();
+ }
+
+ if (! $error) {
+ $this->db->commit();
+ $this->output = $numofexpiredmembers.' partnership checked'."\n";
+ if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+ if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+ if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+ } else {
+ $this->db->rollback();
+ $this->output = "Rollback after error\n";
+ $this->output.= $numofexpiredmembers.' partnership checked'."\n";
+ if ($erroremail) $this->output.='. Got errors when sending some email : '.$erroremail."\n";
+ if ($emailnotfound) $this->output.='. Email not found for some partner : '.$emailnotfound."\n";
+ if ($websitenotfound) $this->output.='. Website not found for some partner : '.$websitenotfound."\n";
+ }
+
+ return ($error ? 1: 0);
+ }
+
+ /**
+ * Action to check if Dolibarr backlink not found on partner website
+ *
+ * CAN BE A CRON TASK
+ * @param $website Partner's website
+ * @return int 0 if KO, 1 if OK
+ */
+ public function checkDolibarrBacklink($website = null)
+ {
+ global $conf, $langs, $user;
+
+ $found = 0;
+ $error = 0;
+ $webcontent = '';
+
+ // $website = 'https://nextgestion.com/'; // For Test
+ $tmpgeturl = getURLContent($website);
+ if ($tmpgeturl['curl_error_no']) {
+ $error++;
+ dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);
+ } elseif ($tmpgeturl['http_code'] != '200') {
+ $error++;
+ dol_syslog('Error getting '.$website.': '.$tmpgeturl['curl_error_msg']);
+ } else {
+ $urlContent = $tmpgeturl['content'];
+ $dom = new DOMDocument();
+ @$dom->loadHTML($urlContent);
+
+ $xpath = new DOMXPath($dom);
+ $hrefs = $xpath->evaluate("//a");
+
+ for ($i = 0; $i < $hrefs->length; $i++) {
+ $href = $hrefs->item($i);
+ $url = $href->getAttribute('href');
+ $url = filter_var($url, FILTER_SANITIZE_URL);
+ if (!filter_var($url, FILTER_VALIDATE_URL) === false) {
+ $webcontent .= $url;
+ }
+ }
+ }
+
+ if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/'.$conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK.'/', $webcontent)) {
+ $found = 1;
+ }
+
+ return $found;
+ }
}
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 5c2b46415b6..b31ced3556f 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -108,9 +108,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
// Initialize array of search criterias
$search_all = GETPOST("search_all", 'alpha');
$search = array();
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
- unset($object->fields['fk_soc']);
-else unset($object->fields['fk_member']);
+
foreach ($object->fields as $key => $val) {
if (GETPOST('search_'.$key, 'alpha')) {
$search[$key] = GETPOST('search_'.$key, 'alpha');
@@ -125,21 +123,18 @@ if (empty($action) && empty($id) && empty($ref)) {
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
-$permissiontoread = $user->rights->partnership->read;
-$permissiontoadd = $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
-
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-//restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-//if (empty($conf->partnership->enabled)) accessforbidden();
-//if (empty($permissiontoread)) accessforbidden();
+$permissiontoread = $user->rights->partnership->read;
+$permissiontoadd = $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
+$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+if (empty($conf->partnership->enabled)) accessforbidden();
+if (empty($permissiontoread)) accessforbidden();
+if ($object->id > 0 && $object->fk_member > 0 && $managedfor != 'member') accessforbidden();
+if ($object->id > 0 && $object->fk_soc > 0 && $managedfor != 'thirdparty') accessforbidden();
/*
* Actions
@@ -166,6 +161,19 @@ if (empty($reshook)) {
}
}
+ $fk_partner = ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
+ $obj_partner = ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
+
+ if ($action == 'add' || ($action == 'update' && $obj_partner != $fk_partner)) {
+ $fpartnership = new Partnership($db);
+
+ $partnershipid = $fpartnership->fetch(0, "", $fk_partner);
+ if ($partnershipid > 0) {
+ setEventMessages($langs->trans('PartnershipAlreadyExist').' : '.$fpartnership->getNomUrl(0, '', 1), '', 'errors');
+ $action = ($action == 'add') ? 'create' : 'edit';
+ }
+ }
+
$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
@@ -214,10 +222,12 @@ if (empty($reshook)) {
if ($object->statut != $object::STATUS_REFUSED) {
$db->begin();
- $result = $object->refused($user, GETPOST('reason_decline_or_cancel', 'alpha'));
+ $result = $object->refused($user, GETPOST('reason_decline_or_cancel', 'restricthtml'));
if ($result < 0) {
setEventMessages($object->error, $object->errors, 'errors');
$error++;
+ } else {
+ $object->reason_decline_or_cancel = GETPOST('reason_decline_or_cancel', 'restricthtml');
}
if (!$error) {
@@ -252,8 +262,14 @@ if (empty($reshook)) {
$autocopy = 'MAIN_MAIL_AUTOCOPY_PARTNERSHIP_TO';
$trackid = 'partnership'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+ if (!empty($id) && !empty(GETPOST('confirm'))) {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+ exit;
+ }
}
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) $object->fields['reason_decline_or_cancel']['visible'] = 3;
@@ -392,7 +408,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($action == 'close') {
// Create an array for form
$formquestion = array();
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmCloseAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClose'), $langs->trans('ConfirmClosePartnershipAsk', $object->ref), 'confirm_close', $formquestion, 'yes', 1);
}
// Reopon confirmation
if ($action == 'reopen') {
@@ -405,7 +421,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($action == 'refuse') {
//Form to close proposal (signed or not)
$formquestion = array(
- array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel', 'value' => '') // Field to complete private note (not replace)
+ array('type' => 'text', 'name' => 'reason_decline_or_cancel', 'label' => $langs->trans("Note"), 'morecss' => 'reason_decline_or_cancel minwidth400', 'value' => '') // Field to complete private note (not replace)
);
// if (!empty($conf->notification->enabled)) {
@@ -416,7 +432,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// ));
// }
- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReasonDecline'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToRefuse'), $text, 'confirm_refuse', $formquestion, '', 1, 250);
}
// Confirmation of action xxxx
@@ -489,6 +505,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}*/
$morehtmlref .= '';
+ if ($managedfor == 'member') $npfilter .= " AND te.fk_member > 0 "; else $npfilter .= " AND te.fk_soc > 0 ";
+ $object->next_prev_filter = $npfilter;
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -504,6 +522,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
//unset($object->fields['fk_soc']); // Hide field already shown in banner
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+ // End of subscription date
+ if ($managedfor == 'member') {
+ $fadherent = new Adherent($db);
+ $fadherent->fetch($object->fk_member);
+ print '
'.$langs->trans("SubscriptionEndDate").'
';
+ if ($fadherent->datefin) {
+ print dol_print_date($fadherent->datefin, 'day');
+ if ($fadherent->hasDelay()) {
+ print " ".img_warning($langs->trans("Late"));
+ }
+ } else {
+ if (!$adht->subscription) {
+ print $langs->trans("SubscriptionNotRecorded");
+ if ($fadherent->statut > 0) {
+ print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+ }
+ } else {
+ print $langs->trans("SubscriptionNotReceived");
+ if ($fadherent->statut > 0) {
+ print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+ }
+ }
+ }
+ print '
';
+ }
+
// Other attributes. Fields from hook formObjectOptions and Extrafields.
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -583,7 +627,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Back to draft
- if ($object->status == $object::STATUS_ACCEPTED) {
+ if ($object->status != $object::STATUS_DRAFT) {
print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
}
@@ -600,23 +644,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
}
- // Clone
- // print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
-
-
- // if ($permissiontoadd) {
- // if ($object->status == $object::STATUS_ENABLED) {
- // print ''.$langs->trans("Disable").''."\n";
- // } else {
- // print ''.$langs->trans("Enable").''."\n";
- // }
- // }
-
// Cancel
if ($permissiontoadd) {
if ($object->status == $object::STATUS_ACCEPTED) {
- print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd);
- } elseif ($object->status == $object::STATUS_CANCELED) {
+ print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
+ } elseif ($object->status > $object::STATUS_ACCEPTED) {
// print ''.$langs->trans("Re-Open").''."\n";
print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken(), '', $permissiontoadd);
}
@@ -624,7 +656,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Refuse
if ($permissiontoadd) {
- if ($object->status != $object::STATUS_CANCELED) {
+ if ($object->status != $object::STATUS_CANCELED && $object->status != $object::STATUS_REFUSED) {
print ''.$langs->trans("Refuse").''."\n";
}
}
@@ -685,7 +717,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
// Presend form
- $modelmail = 'partnership';
+ $modelmail = 'partnership_send';
$defaulttopic = 'InformationMessage';
$diroutput = $conf->partnership->dir_output;
$trackid = 'partnership'.$object->id;
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index d0a4738576d..1ae90d0d4cf 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -77,6 +77,7 @@ if (!$res) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
// load partnership libraries
require_once __DIR__.'/class/partnership.class.php';
@@ -85,7 +86,7 @@ require_once __DIR__.'/class/partnership.class.php';
//dol_include_once('/othermodule/class/otherobject.class.php');
// Load translation files required by the page
-$langs->loadLangs(array("partnership", "other"));
+$langs->loadLangs(array("partnership", "members", "other"));
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -112,8 +113,9 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
// Initialize technical objects
-$object = new Partnership($db);
-$extrafields = new ExtraFields($db);
+$object = new Partnership($db);
+$extrafields = new ExtraFields($db);
+$adherent = new Adherent($db);
$diroutputmassaction = $conf->partnership->dir_output.'/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('partnershiplist')); // Note that conf->hooks_modules contains array
@@ -123,9 +125,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member')
- unset($object->fields['fk_soc']);
-else unset($object->fields['fk_member']);
+$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+
+if ($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
// Default sort order (if not yet defined by previous GETPOST)
if (!$sortfield) {
@@ -148,6 +150,11 @@ foreach ($object->fields as $key => $val) {
$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
}
}
+$search_filter = GETPOST("search_filter", 'alpha');
+$filter = GETPOST("filter", 'alpha');
+if ($filter) {
+ $search_filter = $filter; // For backward compatibility
+}
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array();
@@ -178,8 +185,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
-$permissiontoread = $user->rights->partnership->read;
-$permissiontoadd = $user->rights->partnership->write;
+$permissiontoread = $user->rights->partnership->read;
+$permissiontoadd = $user->rights->partnership->write;
$permissiontodelete = $user->rights->partnership->delete;
// Security check
@@ -229,6 +236,7 @@ if (empty($reshook)) {
}
$toselect = '';
$search_array_options = array();
+ $search_filter = "";
}
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
@@ -240,6 +248,38 @@ if (empty($reshook)) {
$objectlabel = 'Partnership';
$uploaddir = $conf->partnership->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+ // Cancel partnership
+ if ($massaction == 'cancel' && $permissiontoadd) {
+ $db->begin();
+
+ $objecttmp = new $objectclass($db);
+ $nbok = 0;
+ foreach ($toselect as $toselectid) {
+ $result = $objecttmp->fetch($toselectid);
+ if ($result > 0) {
+ $result = $objecttmp->cancel($user, 3);
+ if ($result <= 0) {
+ setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+ $error++;
+ break;
+ } else {
+ $nbok++;
+ }
+ } else {
+ setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+ $error++;
+ break;
+ }
+ }
+
+ if (!$error) {
+ setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+ $db->commit();
+ } else {
+ $db->rollback();
+ }
+ }
}
@@ -263,10 +303,13 @@ $morecss = array();
// --------------------------------------------------------------------
$sql = 'SELECT ';
$sql .= $object->getFieldList('t');
+if ($managedfor == 'member') {
+ $sql .= ', d.datefin, d.fk_adherent_type, dty.subscription';
+}
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
- $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
}
}
// Add fields from hooks
@@ -278,6 +321,10 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
}
+if ($managedfor == 'member') {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as d on (d.rowid = t.fk_member)";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_type as dty on (dty.rowid = d.fk_adherent_type)";
+}
// Add table from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -287,6 +334,9 @@ if ($object->ismultientitymanaged == 1) {
} else {
$sql .= " WHERE 1 = 1";
}
+if ($managedfor == 'member')
+ $sql .= " AND fk_member > 0";
+else $sql .= " AND fk_soc > 0";
foreach ($search as $key => $val) {
if (array_key_exists($key, $object->fields)) {
if ($key == 'status' && $search[$key] == -1) {
@@ -316,6 +366,17 @@ foreach ($search as $key => $val) {
}
}
}
+if ($managedfor == 'member') {
+ if ($search_filter == 'withoutsubscription') {
+ $sql .= " AND (d.datefin IS NULL OR dty.subscription = 0)";
+ }
+ if ($search_filter == 'uptodate') {
+ $sql .= " AND (d.datefin >= '".$db->idate($now)."' OR dty.subscription = 0)";
+ }
+ if ($search_filter == 'outofdate') {
+ $sql .= " AND (d.datefin < '".$db->idate($now)."' AND dty.subscription = 1)";
+ }
+}
if ($search_all) {
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
}
@@ -422,6 +483,9 @@ foreach ($search as $key => $val) {
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+if ($search_filter && $search_filter != '-1') {
+ $param .= "&search_filter=".urlencode($search_filter);
+}
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// Add $param from hooks
@@ -431,10 +495,10 @@ $param .= $hookmanager->resPrint;
// List of mass actions available
$arrayofmassactions = array(
- 'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
- //'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
- //'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
- 'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+'cancel'=>img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel"),
+ //'generate_doc'=>img_picto('', 'pdf').$langs->trans("ReGeneratePDF"),
+ //'builddoc'=>img_picto('', 'pdf').$langs->trans("PDFMerge"),
+ 'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendMail"),
);
if ($permissiontodelete) {
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -461,9 +525,9 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
// Add code for pre mass action (confirmation or email presend form)
$topicmail = "SendPartnershipRef";
-$modelmail = "partnership";
+$modelmail = "partnership_send";
$objecttmp = new Partnership($db);
-$trackid = 'xxxx'.$object->id;
+$trackid = 'partnership'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($search_all) {
@@ -500,6 +564,11 @@ print '
';
+ }
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
// Fields from hook
@@ -665,6 +772,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$i++;
}
+if ($managedfor != 'member') $totalarray['nbfield']++; // End of subscription date
// Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
@@ -677,6 +785,7 @@ if ($num == 0) {
$colspan++;
}
}
+ if ($managedfor != 'member') $colspan++; // End of subscription date
print '
'.$langs->trans("NoRecordFound").'
';
}
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index fbbf17628ba..fc89787deda 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -167,9 +167,10 @@ class Products extends DolibarrApi
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
* @param bool $ids_only Return only IDs of product instead of all properties (faster, above all if list is long)
* @param int $variant_filter Use this param to filter list (0 = all, 1=products without variants, 2=parent of variants, 3=variants only)
+ * @param bool $pagination_data If this parameter is set to true the response will include pagination data. Default value is false. Page starts from 0
* @return array Array of product objects
*/
- public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0)
+ public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '', $ids_only = false, $variant_filter = 0, $pagination_data = false)
{
global $db, $conf;
@@ -221,6 +222,9 @@ class Products extends DolibarrApi
$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
+ //this query will return total products with the filters given
+ $sqlTotals = str_replace('SELECT t.rowid, t.ref, t.ref_ext', 'SELECT count(t.rowid) as total', $sql);
+
$sql .= $this->db->order($sortfield, $sortorder);
if ($limit) {
if ($page < 0) {
@@ -254,6 +258,24 @@ class Products extends DolibarrApi
if (!count($obj_ret)) {
throw new RestException(404, 'No product found');
}
+
+ //if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
+ if ($pagination_data) {
+ $totalsResult = $this->db->query($sqlTotals);
+ $total = $this->db->fetch_object($totalsResult)->total;
+
+ $tmp = $obj_ret;
+ $obj_ret = [];
+
+ $obj_ret['data'] = $tmp;
+ $obj_ret['pagination'] = [
+ 'total' => (int) $total,
+ 'page' => $page, //count starts from 0
+ 'page_count' => ceil((int) $total/$limit),
+ 'limit' => $limit
+ ];
+ }
+
return $obj_ret;
}
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index d3f9e6f06bd..70e994d57cd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -67,8 +67,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
+
// Init vars
$errmsg = '';
$num = 0;
@@ -77,15 +82,15 @@ $backtopage = GETPOST('backtopage', 'alpha');
$action = GETPOST('action', 'aZ09');
$email = GETPOST("email");
+$societe = GETPOST("societe");
// Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
$conference = new ConferenceOrBooth($db);
$resultconf = $conference->fetch($id);
if ($resultconf < 0) {
- setEventMessages(null, $object->errors, "errors");
+ setEventMessages(null, $conference->errors, "errors");
}
$project = new Project($db);
@@ -95,16 +100,13 @@ if ($resultproject < 0) {
$errmsg .= $project->error;
}
-// Getting 'securekey'.'id' from Post and decoding it
-$encodedsecurekeyandid = GETPOST('securekey', 'alpha');
-$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
-// Securekey decomposition into pure securekey and id added at the end
-$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
-$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
+// Security check
+$securekeyreceived = GETPOST('securekey', 'alpha');
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
+// We check if the securekey collected is OK
+if ($securekeytocompare != $securekeyreceived) {
print $langs->trans('MissingOrBadSecureKey');
exit;
}
@@ -188,6 +190,7 @@ function llxFooterVierge()
/*
* Actions
*/
+global $mysoc;
$parameters = array();
// Note that $action and $object may have been modified by some hooks
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -223,30 +226,72 @@ if (empty($reshook) && $action == 'add') {
}
if (!$error) {
- // Vérifier si client existe par l'email
- $thirdparty = new Societe($db);
- $resultfetchthirdparty = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+ // Check if attendee already exists (by email and for this event)
+ $confattendee = new ConferenceOrBoothAttendee($db);
+ $resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
+ if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
+ // Found confattendee
+ $confattendee = array_shift($resultfetchconfattendee);
+ } else {
+ // Need to create a confattendee
+ $confattendee->date_subscription = dol_now();
+ $confattendee->email = $email;
+ $confattendee->fk_actioncomm = $id;
+ $resultconfattendee = $confattendee->create($user);
+ if ($resultconfattendee < 0) {
+ $error++;
+ $errmsg .= $confattendee->error;
+ }
+ }
+ // At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
+ // If the attendee has already paid
+ if ($confattendee->status == 1) {
+ $securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+ $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
+ Header("Location: ".$redirection);
+ exit;
+ }
+ // Getting the thirdparty or creating it
+ $thirdparty = new Societe($db);
+ // Fetch using fk_soc if the attendee was already existing
+ if (!empty($confattendee->fk_soc)) {
+ $resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+ } else {
+ // Fetch using the input field by user if we just created the attendee
+ if (!empty($societe)) {
+ $resultfetchthirdparty = $thirdparty->fetch('', $societe);
+ if ($resultfetchthirdparty<=0) {
+ // Need to create a new one (not found or multiple with the same name)
+ $resultfetchthirdparty = 0;
+ } else {
+ // We found an unique result with that name, so we put in in fk_soc of attendee
+ $confattendee->fk_soc = $thirdparty->id;
+ $confattendee->update($user);
+ }
+ } else {
+ // Need to create a thirdparty (put number>0 if we do not want to create a thirdparty for free-conferences)
+ $resultfetchthirdparty = 0;
+ }
+ }
if ($resultfetchthirdparty<0) {
$error++;
$errmsg .= $thirdparty->error;
- $readythirdparty = -1;
} elseif ($resultfetchthirdparty==0) {
// creation of a new thirdparty
- if (!empty(GETPOST("societe"))) {
- $thirdparty->name = GETPOST("societe");
+ if (!empty($societe)) {
+ $thirdparty->name = $societe;
} else {
- $thirdparty->name = $email;
+ $thirdparty->name = $email;
}
-
- $thirdparty->address = GETPOST("address");
- $thirdparty->zip = GETPOST("zipcode");
- $thirdparty->town = GETPOST("town");
- $thirdparty->client = 2;
- $thirdparty->fournisseur = 0;
- $thirdparty->country_id = GETPOST("country_id", 'int');
- $thirdparty->state_id = GETPOST("state_id", 'int');
- $thirdparty->email = $email;
+ $thirdparty->address = GETPOST("address");
+ $thirdparty->zip = GETPOST("zipcode");
+ $thirdparty->town = GETPOST("town");
+ $thirdparty->client = 2;
+ $thirdparty->fournisseur = 0;
+ $thirdparty->country_id = GETPOST("country_id", 'int');
+ $thirdparty->state_id = GETPOST("state_id", 'int');
+ $thirdparty->email = $email;
// Load object modCodeTiers
$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
@@ -267,31 +312,131 @@ if (empty($reshook) && $action == 'add') {
}
$thirdparty->code_client = $tmpcode;
$readythirdparty = $thirdparty->create($user);
- } else {
- // We have an existing thirdparty ready to use
- $readythirdparty = 1;
- }
-
- if ($readythirdparty < 0) {
- $error++;
- $errmsg .= $thirdparty->error;
- } else {
- // creation of an attendee
- $confattendee = new ConferenceOrBoothAttendee($db);
- $confattendee->fk_soc = $thirdparty->id;
- $confattendee->date_subscription = dol_now();
- $confattendee->email = GETPOST("email");
- $confattendee->fk_actioncomm = $id;
- $resultconfattendee = $confattendee->create($user);
- if ($resultconfattendee < 0) {
+ if ($readythirdparty <0) {
$error++;
- $errmsg .= $confattendee->error;
+ $errmsg .= $thirdparty->error;
+ } else {
+ $thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+ $thirdparty->country = getCountry($thirdparty->country_code, 0, $db, $langs);
+ $confattendee->fk_soc = $thirdparty->id;
+ $confattendee->update($user);
}
}
}
if (!$error) {
$db->commit();
+ if (!empty(floatval($project->price_registration))) {
+ $productforinvoicerow = new Product($db);
+ $resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
+ if ($resultprod < 0) {
+ $error++;
+ $errmsg .= $productforinvoicerow->error;
+ } else {
+ $facture = new Facture($db);
+ $facture->type = Facture::TYPE_STANDARD;
+ $facture->socid = $thirdparty->id;
+ $facture->paye = 0;
+ $facture->date = dol_now();
+ $facture->cond_reglement_id = $confattendee->cond_reglement_id;
+ $facture->fk_project = $project->id;
+ if (empty($facture->cond_reglement_id)) {
+ $paymenttermstatic = new PaymentTerm($confattendee->db);
+ $facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+ if (empty($facture->cond_reglement_id)) {
+ $error++;
+ $confattendee->error = 'ErrorNoPaymentTermRECEPFound';
+ $confattendee->errors[] = $confattendee->error;
+ }
+ }
+ $resultfacture = $facture->create($user);
+ if ($resultfacture <= 0) {
+ $confattendee->error = $facture->error;
+ $confattendee->errors = $facture->errors;
+ $error++;
+ } else {
+ $facture->add_object_linked($confattendee->element, $confattendee->id);
+ }
+ }
+
+ if (!$error) {
+ // Add line to draft invoice
+ $vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+ $result = $facture->addline($langs->trans("ConferenceAttendeeFee", $conference->label, dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+ if ($result <= 0) {
+ $confattendee->error = $facture->error;
+ $confattendee->errors = $facture->errors;
+ $error++;
+ }
+ if (!$error) {
+ $valid = true;
+ $sourcetouse = 'conferencesubscription';
+ $reftouse = $facture->id;
+ $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+ 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;
+ }
+ }
+ Header("Location: ".$redirection);
+ exit;
+ }
+ }
+ } else {
+ // No price has been set
+ // Validating the subscription
+ $confattendee->setStatut(1);
+
+ // 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_AFT_SUBS_EVENT;
+ if (!empty($labeltouse)) {
+ $arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $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);
+ $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
+ Header("Location: ".$redirection);
+ exit;
+ }
//Header("Location: ".$urlback);
//exit;
} else {
@@ -307,12 +452,6 @@ if (empty($reshook) && $action == 'add') {
$form = new Form($db);
$formcompany = new FormCompany($db);
-$conference = new ConferenceOrBooth($db);
-$resultconf = $conference->fetch($id);
-if ($resultconf < 0) {
- setEventMessages(null, $object->errors, "errors");
-}
-
llxHeaderVierge($langs->trans("NewSubscription"));
@@ -324,12 +463,9 @@ print '