loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix PEC per variabili email

This commit is contained in:
Dasc3er 2021-01-28 21:13:48 +01:00 committed by Thomas Zilio
parent 475a194234
commit b3af25ede1
10 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail.php
View File

@ -25,15 +25,19 @@ $template = Template::find(get('id'));
$module = $template->module;
$smtp = $template->account;
$body = $module->replacePlaceholders($id_record, $template['body']);
$subject = $module->replacePlaceholders($id_record, $template['subject']);
$placeholder_options = [
'is_pec' => intval($smtp['pec']),
];
$body = $module->replacePlaceholders($id_record, $template['body'], $placeholder_options);
$subject = $module->replacePlaceholders($id_record, $template['subject'], $placeholder_options);
$emails = [];
if ($module->replacePlaceholders($id_record, '{email}')) {
$emails = explode(';', $module->replacePlaceholders($id_record, '{email}'));
$emails = explode(';', $module->replacePlaceholders($id_record, '{email}', $placeholder_options));
}
$id_anagrafica = $module->replacePlaceholders($id_record, '{id_anagrafica}');
$id_anagrafica = $module->replacePlaceholders($id_record, '{id_anagrafica}', $placeholder_options);
// Aggiungo email referenti in base alla mansione impostata nel template
$mansioni = $dbo->select('em_mansioni_template', 'idmansione', ['id_template' => $template->id]);

10
modules/contratti/variables.php
View File

@ -17,14 +17,18 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
$r = $dbo->fetchOne('SELECT *, co_contratti.idanagrafica,
$r = $dbo->fetchOne('SELECT *,
an_anagrafiche.pec,
IF((an_referenti.email IS NOT NULL AND an_referenti.email != ""), an_referenti.email, an_anagrafiche.email) AS email,
an_anagrafiche.ragione_sociale
FROM co_contratti INNER JOIN an_anagrafiche ON co_contratti.idanagrafica=an_anagrafiche.idanagrafica LEFT OUTER JOIN an_referenti ON an_referenti.id=co_contratti.idreferente WHERE co_contratti.id='.prepare($id_record));
FROM co_contratti
INNER JOIN an_anagrafiche ON co_contratti.idanagrafica=an_anagrafiche.idanagrafica
LEFT OUTER JOIN an_referenti ON an_referenti.id=co_contratti.idreferente
WHERE co_contratti.id='.prepare($id_record));
// Variabili da sostituire
return [
'email' => $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'ragione_sociale' => $r['ragione_sociale'],
'numero' => $r['numero'],
'descrizione' => $r['descrizione'],

12
modules/ddt/variables.php
View File

@ -17,13 +17,17 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
$r = $dbo->fetchOne('SELECT *, dt_ddt.idanagrafica,
IF( (an_referenti.email IS NOT NULL AND an_referenti.email!=""), an_referenti.email, an_anagrafiche.email) AS email
FROM dt_ddt INNER JOIN an_anagrafiche ON an_anagrafiche.idanagrafica=dt_ddt.idanagrafica LEFT OUTER JOIN an_referenti ON an_referenti.id=dt_ddt.idreferente WHERE dt_ddt.id='.prepare($id_record));
$r = $dbo->fetchOne('SELECT dt_ddt.*,
IF((an_referenti.email IS NOT NULL AND an_referenti.email != ""), an_referenti.email, an_anagrafiche.email) AS email,
an_anagrafiche.pec
FROM dt_ddt
INNER JOIN an_anagrafiche ON dt_ddt.idanagrafica = an_anagrafiche.idanagrafica
LEFT OUTER JOIN an_referenti ON an_referenti.id = dt_ddt.idreferente
WHERE id='.prepare($id_record));
// Variabili da sostituire
return [
'email' => $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'numero' => empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'],
'note' => $r['note'],
'data' => Translator::dateToLocale($r['data']),

4
modules/emails/src/Mail.php
View File

@ -159,7 +159,7 @@ class Mail extends Model
if (isset($this->template)) {
$module = $this->template->module;
$value = $module->replacePlaceholders($this->id_record, $value);
$value = $module->replacePlaceholders($this->id_record, $value, ['is_pec' => intval($this->account->pec)]);
}
$this->attributes['subject'] = $value;
@ -170,7 +170,7 @@ class Mail extends Model
if (isset($this->template)) {
$module = $this->template->module;
$value = $module->replacePlaceholders($this->id_record, $value);
$value = $module->replacePlaceholders($this->id_record, $value, ['is_pec' => intval($this->account->pec)]);
}
$this->attributes['content'] = $value;

4
modules/fatture/variables.php
View File

@ -18,10 +18,10 @@
*/
$r = $dbo->fetchOne('SELECT co_documenti.*,
an_anagrafiche.pec,
IF( (an_referenti.email IS NOT NULL AND an_referenti.email!=""), an_referenti.email, an_anagrafiche.email) AS email,
an_anagrafiche.idconto_cliente,
an_anagrafiche.idconto_fornitore,
an_anagrafiche.pec,
an_anagrafiche.ragione_sociale,
co_tipidocumento.descrizione AS tipo_documento,
(SELECT pec FROM em_accounts WHERE em_accounts.id='.prepare($template['id_account']).') AS is_pec
@ -54,7 +54,7 @@ $r_company = $dbo->fetchOne('SELECT * FROM an_anagrafiche WHERE idanagrafica='.p
// Variabili da sostituire
return [
'email' => $r['is_pec'] ? $r['pec'] : $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'id_anagrafica' => $r['idanagrafica'],
'ragione_sociale' => $r['ragione_sociale'],
'numero' => empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'],

9
modules/interventi/variables.php
View File

@ -18,14 +18,17 @@
*/
$r = $dbo->fetchOne('SELECT *,
an_anagrafiche.email,
an_anagrafiche.pec,
(SELECT MAX(orario_fine) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS data_fine,
(SELECT email FROM an_anagrafiche WHERE an_anagrafiche.idanagrafica=in_interventi.idanagrafica) AS email,
(SELECT descrizione FROM in_statiintervento WHERE idstatointervento=in_interventi.idstatointervento) AS stato
FROM in_interventi WHERE id='.prepare($id_record));
FROM in_interventi
INNER JOIN an_anagrafiche ON in_interventi.idanagrafica = an_anagrafiche.idanagrafica
WHERE id='.prepare($id_record));
// Variabili da sostituire
return [
'email' => $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'numero' => $r['codice'],
'richiesta' => $r['richiesta'],
'descrizione' => $r['descrizione'],

10
modules/ordini/variables.php
View File

@ -17,13 +17,17 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
$r = $dbo->fetchOne('SELECT *, or_ordini.idanagrafica,
$r = $dbo->fetchOne('SELECT or_ordini.*,
an_anagrafiche.pec,
IF((an_referenti.email IS NOT NULL AND an_referenti.email != ""), an_referenti.email, an_anagrafiche.email) AS email
FROM or_ordini INNER JOIN an_anagrafiche ON an_anagrafiche.idanagrafica=or_ordini.idanagrafica LEFT OUTER JOIN an_referenti ON an_referenti.id=or_ordini.idreferente WHERE or_ordini.id='.prepare($id_record));
FROM or_ordini
INNER JOIN an_anagrafiche ON or_ordini.idanagrafica = an_anagrafiche.idanagrafica
LEFT OUTER JOIN an_referenti ON an_referenti.id = or_ordini.idreferente
WHERE id='.prepare($id_record));
// Variabili da sostituire
return [
'email' => $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'id_anagrafica' => $r['idanagrafica'],
'numero' => empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'],
'note' => $r['note'],

2
modules/preventivi/variables.php
View File

@ -26,7 +26,7 @@ $revisione = $dbo->fetchNum('SELECT * FROM co_preventivi WHERE master_revision =
// Variabili da sostituire
return [
'email' => $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'numero' => $r['numero'],
'ragione_sociale' => $r['ragione_sociale'],
'descrizione' => $r['descrizione'],

2
modules/scadenzario/variables.php
View File

@ -33,7 +33,7 @@ $logo_azienda = str_replace(base_dir(), base_path(), App::filepath('templates/ba
// Variabili da sostituire
return [
'email' => $r['is_pec'] ? $r['pec'] : $r['email'],
'email' => $options['is_pec'] ? $r['pec'] : $r['email'],
'id_anagrafica' => $r['idanagrafica'],
'ragione_sociale' => $r['ragione_sociale'],
'numero' => empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'],

6
src/Models/Module.php
View File

@ -55,16 +55,16 @@ class Module extends Model
'options2',
];
public function replacePlaceholders($id_record, $value)
public function replacePlaceholders($id_record, $value, $options = [])
{
$replaces = $this->getPlaceholders($id_record);
$replaces = $this->getPlaceholders($id_record, $options);
$value = str_replace(array_keys($replaces), array_values($replaces), $value);
return $value;
}
public function getPlaceholders($id_record)
public function getPlaceholders($id_record, $options = [])
{
if (!isset($this->variables[$id_record])) {
$dbo = $database = database();