diff --git a/modules/categorie_articoli/row-list.php b/modules/categorie_articoli/row-list.php
index 3d67c8ca8..473c79e20 100755
--- a/modules/categorie_articoli/row-list.php
+++ b/modules/categorie_articoli/row-list.php
@@ -29,7 +29,7 @@ foreach ($subcategorie as $sub) {
'.$sub['colore'].'
'.$sub['nota'].'
-
+
diff --git a/modules/categorie_documenti/src/Categoria.php b/modules/categorie_documenti/src/Categoria.php
index f3e8182ee..db9c55f27 100755
--- a/modules/categorie_documenti/src/Categoria.php
+++ b/modules/categorie_documenti/src/Categoria.php
@@ -19,18 +19,20 @@
namespace Modules\CategorieDocumentali;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class Categoria extends Model
{
+ use SimpleModelTrait;
use SoftDeletes;
protected $table = 'do_categorie';
public static function build($descrizione)
{
- $model = parent::build();
+ $model = new static();
$model->descrizione = $descrizione;
$model->save();
diff --git a/modules/checklists/src/Check.php b/modules/checklists/src/Check.php
index 48d28b878..53468d796 100755
--- a/modules/checklists/src/Check.php
+++ b/modules/checklists/src/Check.php
@@ -19,7 +19,8 @@
namespace Modules\Checklists;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Models\Group;
use Models\Module;
use Models\Plugin;
@@ -29,6 +30,7 @@ use Traits\HierarchyTrait;
class Check extends Model
{
+ use SimpleModelTrait;
use HierarchyTrait;
protected static $parent_identifier = 'id_parent';
@@ -46,7 +48,7 @@ class Check extends Model
*/
public static function build(User $user, $structure, $id_record, $content, $parent_id = null)
{
- $model = parent::build();
+ $model = new static();
$model->user()->associate($user);
$model->id_parent = $parent_id;
diff --git a/modules/checklists/src/Checklist.php b/modules/checklists/src/Checklist.php
index 6195322d7..98522aa3d 100755
--- a/modules/checklists/src/Checklist.php
+++ b/modules/checklists/src/Checklist.php
@@ -19,13 +19,16 @@
namespace Modules\Checklists;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Models\Module;
use Models\Plugin;
use Models\User;
class Checklist extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'zz_checklists';
/**
@@ -37,7 +40,7 @@ class Checklist extends Model
*/
public static function build($nome)
{
- $model = parent::build();
+ $model = new static();
$model->name = $nome;
$model->save();
diff --git a/modules/checklists/src/ChecklistItem.php b/modules/checklists/src/ChecklistItem.php
index f7bbc910d..9089c11e4 100755
--- a/modules/checklists/src/ChecklistItem.php
+++ b/modules/checklists/src/ChecklistItem.php
@@ -19,11 +19,13 @@
namespace Modules\Checklists;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Traits\HierarchyTrait;
class ChecklistItem extends Model
{
+ use SimpleModelTrait;
use HierarchyTrait;
protected static $parent_identifier = 'id_parent';
@@ -39,7 +41,7 @@ class ChecklistItem extends Model
*/
public static function build(Checklist $checklist, $contenuto, $id_parent = null)
{
- $model = parent::build();
+ $model = new static();
$model->checklist()->associate($checklist);
$model->id_parent = $id_parent;
diff --git a/modules/contratti/actions.php b/modules/contratti/actions.php
index 10a87b48a..63b4059b0 100644
--- a/modules/contratti/actions.php
+++ b/modules/contratti/actions.php
@@ -121,7 +121,7 @@ switch (post('op')) {
$righe = $contratto->getRighe();
foreach ($righe as $riga) {
$new_riga = $riga->replicate();
- $new_riga->setParent($new);
+ $new_riga->setDocument($new);
$new_riga->qta_evasa = 0;
$new_riga->save();
diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php
index ad4af3fdc..b54e61c18 100755
--- a/modules/contratti/edit.php
+++ b/modules/contratti/edit.php
@@ -237,7 +237,7 @@ if (!empty($rs)) {
-
@@ -289,7 +289,7 @@ if (!empty($rs)) {
-
diff --git a/modules/contratti/row-list.php b/modules/contratti/row-list.php
index c333f3bbd..6319d51d2 100755
--- a/modules/contratti/row-list.php
+++ b/modules/contratti/row-list.php
@@ -51,9 +51,9 @@ foreach ($righe as $riga) {
';
// Aggiunta dei riferimenti ai documenti
- if ($riga->hasOriginal()) {
+ if ($riga->hasOriginalComponent()) {
echo '
- '.reference($riga->getOriginal()->parent, tr('Origine')).'';
+ '.reference($riga->getOriginalComponent()->getDocument(), tr('Origine')).'';
}
// Descrizione
diff --git a/modules/contratti/src/Components/Articolo.php b/modules/contratti/src/Components/Articolo.php
index d37f1db50..35a7b28cd 100755
--- a/modules/contratti/src/Components/Articolo.php
+++ b/modules/contratti/src/Components/Articolo.php
@@ -20,24 +20,10 @@
namespace Modules\Contratti\Components;
use Common\Components\Article;
-use Modules\Articoli\Articolo as Original;
-use Modules\Contratti\Contratto;
class Articolo extends Article
{
use RelationTrait;
protected $table = 'co_righe_contratti';
-
- /**
- * Crea un nuovo articolo collegato ad un contratto.
- *
- * @return self
- */
- public static function build(Contratto $contratto, Original $articolo)
- {
- $model = parent::build($contratto, $articolo);
-
- return $model;
- }
}
diff --git a/modules/contratti/src/Components/Descrizione.php b/modules/contratti/src/Components/Descrizione.php
index 70da05f11..4e4614f75 100755
--- a/modules/contratti/src/Components/Descrizione.php
+++ b/modules/contratti/src/Components/Descrizione.php
@@ -20,23 +20,10 @@
namespace Modules\Contratti\Components;
use Common\Components\Description;
-use Modules\Contratti\Contratto;
class Descrizione extends Description
{
use RelationTrait;
protected $table = 'co_righe_contratti';
-
- /**
- * Crea una nuova riga collegata ad un contratto.
- *
- * @return self
- */
- public static function build(Contratto $contratto)
- {
- $model = parent::build($contratto);
-
- return $model;
- }
}
diff --git a/modules/contratti/src/Components/RelationTrait.php b/modules/contratti/src/Components/RelationTrait.php
index d9f44166d..a14497eae 100755
--- a/modules/contratti/src/Components/RelationTrait.php
+++ b/modules/contratti/src/Components/RelationTrait.php
@@ -23,18 +23,18 @@ use Modules\Contratti\Contratto;
trait RelationTrait
{
- public function getParentID()
+ public function getDocumentID()
{
return 'idcontratto';
}
- public function parent()
+ public function document()
{
- return $this->belongsTo(Contratto::class, $this->getParentID());
+ return $this->belongsTo(Contratto::class, $this->getDocumentID());
}
public function contratto()
{
- return $this->parent();
+ return $this->document();
}
}
diff --git a/modules/contratti/src/Components/Riga.php b/modules/contratti/src/Components/Riga.php
index 9734b254d..3553883ad 100755
--- a/modules/contratti/src/Components/Riga.php
+++ b/modules/contratti/src/Components/Riga.php
@@ -20,23 +20,10 @@
namespace Modules\Contratti\Components;
use Common\Components\Row;
-use Modules\Contratti\Contratto;
class Riga extends Row
{
use RelationTrait;
protected $table = 'co_righe_contratti';
-
- /**
- * Crea una nuova riga collegata ad un contratto.
- *
- * @return self
- */
- public static function build(Contratto $contratto)
- {
- $model = parent::build($contratto);
-
- return $model;
- }
}
diff --git a/modules/contratti/src/Components/Sconto.php b/modules/contratti/src/Components/Sconto.php
index a40efa1c0..3b112031e 100755
--- a/modules/contratti/src/Components/Sconto.php
+++ b/modules/contratti/src/Components/Sconto.php
@@ -20,23 +20,10 @@
namespace Modules\Contratti\Components;
use Common\Components\Discount;
-use Modules\Contratti\Contratto;
class Sconto extends Discount
{
use RelationTrait;
protected $table = 'co_righe_contratti';
-
- /**
- * Crea un nuovo sconto collegato ad un contratto.
- *
- * @return self
- */
- public static function build(Contratto $contratto)
- {
- $model = parent::build($contratto);
-
- return $model;
- }
}
diff --git a/modules/contratti/src/Contratto.php b/modules/contratti/src/Contratto.php
index a6e02112c..a97d36a53 100755
--- a/modules/contratti/src/Contratto.php
+++ b/modules/contratti/src/Contratto.php
@@ -21,7 +21,7 @@ namespace Modules\Contratti;
use Carbon\Carbon;
use Carbon\CarbonInterval;
-use Common\Components\Description;
+use Common\Components\Component;
use Common\Document;
use Modules\Anagrafiche\Anagrafica;
use Modules\Interventi\Intervento;
@@ -63,7 +63,7 @@ class Contratto extends Document
*/
public static function build(Anagrafica $anagrafica, $nome)
{
- $model = parent::build();
+ $model = new static();
$stato_documento = Stato::where('descrizione', 'Bozza')->first();
@@ -225,7 +225,7 @@ class Contratto extends Document
* Effettua un controllo sui campi del documento.
* Viene richiamato dalle modifiche alle righe del documento.
*/
- public function triggerEvasione(Description $trigger)
+ public function triggerEvasione(Component $trigger)
{
parent::triggerEvasione($trigger);
diff --git a/modules/contratti/src/Stato.php b/modules/contratti/src/Stato.php
index dcea1da30..8256cd693 100755
--- a/modules/contratti/src/Stato.php
+++ b/modules/contratti/src/Stato.php
@@ -19,10 +19,13 @@
namespace Modules\Contratti;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
class Stato extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'co_staticontratti';
public function preventivi()
diff --git a/modules/dashboard/actions.php b/modules/dashboard/actions.php
index 99049b018..abbf88edb 100755
--- a/modules/dashboard/actions.php
+++ b/modules/dashboard/actions.php
@@ -74,7 +74,7 @@ switch (filter('op')) {
'title' => 'Int. '.$sessione['codice'].' '.$sessione['cliente'].' '.tr('Tecnici').': '.$sessione['nome_tecnico'].' '.(($sessione['have_attachments']) ? '' : ''),
'start' => $sessione['orario_inizio'],
'end' => $sessione['orario_fine'],
- 'url' => ROOTDIR.'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'],
+ 'url' => base_path().'/editor.php?id_module='.$modulo_interventi->id.'&id_record='.$sessione['idintervento'],
'backgroundColor' => $sessione['colore'],
'textColor' => color_inverse($sessione['colore']),
'borderColor' => ($sessione['colore_tecnico'] == '#FFFFFF') ? color_darken($sessione['colore_tecnico'], 100) : $sessione['colore_tecnico'],
diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php
index 9b2d54a2a..5b8f8a547 100755
--- a/modules/dashboard/edit.php
+++ b/modules/dashboard/edit.php
@@ -31,10 +31,11 @@ echo '
';
// Stati intervento
+$stati_sessione = session_get('dashboard.idstatiintervento', []);
$stati_intervento = $dbo->fetchArray('SELECT idstatointervento AS id, descrizione, colore FROM in_statiintervento WHERE deleted_at IS NULL ORDER BY descrizione ASC');
foreach ($stati_intervento as $stato) {
$attr = '';
- if (in_array("'".$stato['id']."'", $_SESSION['dashboard']['idstatiintervento'])) {
+ if (in_array("'".$stato['id']."'", $stati_sessione)) {
$attr = 'checked="checked"';
}
@@ -68,10 +69,11 @@ echo '
';
// Tipi intervento
+$tipi_sessione = session_get('dashboard.idtipiintervento', []);
$tipi_intervento = $dbo->fetchArray('SELECT idtipointervento AS id, descrizione FROM in_tipiintervento ORDER BY descrizione ASC');
foreach ($tipi_intervento as $tipo) {
$attr = '';
- if (in_array("'".$tipo['id']."'", $_SESSION['dashboard']['idtipiintervento'])) {
+ if (in_array("'".$tipo['id']."'", $tipi_sessione)) {
$attr = 'checked="checked"';
}
@@ -104,12 +106,13 @@ echo '
';
+$tecnici_sessione = session_get('dashboard.idtecnici', []);
$tecnici_disponibili = $dbo->fetchArray("SELECT an_anagrafiche.idanagrafica AS id, ragione_sociale, colore FROM an_anagrafiche INNER JOIN (an_tipianagrafiche_anagrafiche INNER JOIN an_tipianagrafiche ON an_tipianagrafiche_anagrafiche.idtipoanagrafica=an_tipianagrafiche.idtipoanagrafica) ON an_anagrafiche.idanagrafica=an_tipianagrafiche_anagrafiche.idanagrafica
LEFT OUTER JOIN in_interventi_tecnici ON in_interventi_tecnici.idtecnico = an_anagrafiche.idanagrafica INNER JOIN in_interventi ON in_interventi_tecnici.idintervento=in_interventi.id
WHERE an_anagrafiche.deleted_at IS NULL AND an_tipianagrafiche.descrizione='Tecnico' ".Modules::getAdditionalsQuery('Interventi').' GROUP BY an_anagrafiche.idanagrafica ORDER BY ragione_sociale ASC');
foreach ($tecnici_disponibili as $tecnico) {
$attr = '';
- if (in_array("'".$tecnico['id']."'", $_SESSION['dashboard']['idtecnici'])) {
+ if (in_array("'".$tecnico['id']."'", $tecnici_sessione)) {
$attr = 'checked="checked"';
}
@@ -143,10 +146,11 @@ echo '
';
// Zone
+$zone_sessione = session_get('dashboard.idzone', []);
$zone = $dbo->fetchArray('(SELECT 0 AS ordine, \'0\' AS id, \'Nessuna zona\' AS descrizione) UNION (SELECT 1 AS ordine, id, descrizione FROM an_zone) ORDER BY ordine, descrizione ASC');
foreach ($zone as $zona) {
$attr = '';
- if (in_array("'".$zona['id']."'", $_SESSION['dashboard']['idzone'])) {
+ if (in_array("'".$zona['id']."'", $zone_sessione)) {
$attr = 'checked="checked"';
}
diff --git a/modules/dashboard/widgets/notifiche.php b/modules/dashboard/widgets/notifiche.php
index 0cbb67359..ffb683734 100755
--- a/modules/dashboard/widgets/notifiche.php
+++ b/modules/dashboard/widgets/notifiche.php
@@ -51,7 +51,7 @@ if (empty($notes)) {
$moduli = $notes->groupBy('id_module')->sortBy('notification_date');
foreach ($moduli as $module_id => $note) {
- $modulo = Module::get($module_id);
+ $modulo = Module::pool($module_id);
echo '
'.$modulo->title.'
diff --git a/modules/ddt/ajax/search.php b/modules/ddt/ajax/search.php
index 5e2c1c645..15658029e 100755
--- a/modules/ddt/ajax/search.php
+++ b/modules/ddt/ajax/search.php
@@ -51,7 +51,7 @@ foreach ($rs as $r) {
$numero = empty($r['numero_esterno']) ? $r['numero'] : $r['numero_esterno'];
- $result['link'] = ROOTDIR.'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
+ $result['link'] = base_path().'/editor.php?id_module='.$link_id.'&id_record='.$r['id'];
$result['title'] = $r['tipologia'].' num. '.$numero.' del '.Translator::dateToLocale($r['data']);
$result['category'] = $r['tipologia'];
diff --git a/modules/ddt/edit.php b/modules/ddt/edit.php
index 0669fbed9..bc84539aa 100755
--- a/modules/ddt/edit.php
+++ b/modules/ddt/edit.php
@@ -324,7 +324,7 @@ if (!$block_edit) {
$ordini = $dbo->fetchArray($ordini_query)[0]['tot'];
echo '
-
+
'.tr('Ordine').'
';
diff --git a/modules/ddt/row-list.php b/modules/ddt/row-list.php
index 3b8672f9d..96f20eac0 100755
--- a/modules/ddt/row-list.php
+++ b/modules/ddt/row-list.php
@@ -76,9 +76,9 @@ foreach ($righe as $riga) {
';
// Aggiunta dei riferimenti ai documenti
- if ($riga->hasOriginal()) {
+ if ($riga->hasOriginalComponent()) {
echo '
- '.reference($riga->getOriginal()->parent, tr('Origine'));
+ '.reference($riga->getOriginalComponent()->getDocument(), tr('Origine'));
}
echo '
';
diff --git a/modules/ddt/src/Components/Articolo.php b/modules/ddt/src/Components/Articolo.php
index 4fc05989c..e3ddb82b6 100755
--- a/modules/ddt/src/Components/Articolo.php
+++ b/modules/ddt/src/Components/Articolo.php
@@ -29,16 +29,4 @@ class Articolo extends Article
protected $table = 'dt_righe_ddt';
protected $serialRowID = 'ddt';
-
- /**
- * Crea un nuovo articolo collegato ad una ddt.
- *
- * @return self
- */
- public static function build(DDT $ddt, Original $articolo)
- {
- $model = parent::build($ddt, $articolo);
-
- return $model;
- }
}
diff --git a/modules/ddt/src/Components/Descrizione.php b/modules/ddt/src/Components/Descrizione.php
index aee3455b7..8e363fd7a 100755
--- a/modules/ddt/src/Components/Descrizione.php
+++ b/modules/ddt/src/Components/Descrizione.php
@@ -27,16 +27,4 @@ class Descrizione extends Description
use RelationTrait;
protected $table = 'dt_righe_ddt';
-
- /**
- * Crea una nuova riga collegata ad una ddt.
- *
- * @return self
- */
- public static function build(DDT $ddt)
- {
- $model = parent::build($ddt);
-
- return $model;
- }
}
diff --git a/modules/ddt/src/Components/RelationTrait.php b/modules/ddt/src/Components/RelationTrait.php
index 26fdb710b..981e3b807 100755
--- a/modules/ddt/src/Components/RelationTrait.php
+++ b/modules/ddt/src/Components/RelationTrait.php
@@ -23,18 +23,18 @@ use Modules\DDT\DDT;
trait RelationTrait
{
- public function getParentID()
+ public function getDocumentID()
{
return 'idddt';
}
- public function parent()
+ public function document()
{
- return $this->belongsTo(DDT::class, $this->getParentID());
+ return $this->belongsTo(DDT::class, $this->getDocumentID());
}
public function ddt()
{
- return $this->parent();
+ return $this->document();
}
}
diff --git a/modules/ddt/src/Components/Riga.php b/modules/ddt/src/Components/Riga.php
index 5007c2d81..f96f85b77 100755
--- a/modules/ddt/src/Components/Riga.php
+++ b/modules/ddt/src/Components/Riga.php
@@ -27,16 +27,4 @@ class Riga extends Row
use RelationTrait;
protected $table = 'dt_righe_ddt';
-
- /**
- * Crea una nuova riga collegata ad una ddt.
- *
- * @return self
- */
- public static function build(DDT $ddt)
- {
- $model = parent::build($ddt);
-
- return $model;
- }
}
diff --git a/modules/ddt/src/Components/Sconto.php b/modules/ddt/src/Components/Sconto.php
index eb2bd5afb..454986066 100755
--- a/modules/ddt/src/Components/Sconto.php
+++ b/modules/ddt/src/Components/Sconto.php
@@ -27,16 +27,4 @@ class Sconto extends Discount
use RelationTrait;
protected $table = 'dt_righe_ddt';
-
- /**
- * Crea un nuovo sconto collegato ad un ddt.
- *
- * @return self
- */
- public static function build(DDT $ddt)
- {
- $model = parent::build($ddt);
-
- return $model;
- }
}
diff --git a/modules/ddt/src/DDT.php b/modules/ddt/src/DDT.php
index fde04e000..f86470dc2 100755
--- a/modules/ddt/src/DDT.php
+++ b/modules/ddt/src/DDT.php
@@ -20,7 +20,7 @@
namespace Modules\DDT;
use Auth;
-use Common\Components\Description;
+use Common\Components\Component;
use Common\Document;
use Modules\Anagrafiche\Anagrafica;
use Traits\RecordTrait;
@@ -53,7 +53,7 @@ class DDT extends Document
*/
public static function build(Anagrafica $anagrafica, Tipo $tipo_documento, $data)
{
- $model = parent::build();
+ $model = new static();
$user = Auth::user();
@@ -204,7 +204,7 @@ class DDT extends Document
* Effettua un controllo sui campi del documento.
* Viene richiamato dalle modifiche alle righe del documento.
*/
- public function triggerEvasione(Description $trigger)
+ public function triggerEvasione(Component $trigger)
{
parent::triggerEvasione($trigger);
diff --git a/modules/ddt/src/Stato.php b/modules/ddt/src/Stato.php
index 207823580..208c85a11 100755
--- a/modules/ddt/src/Stato.php
+++ b/modules/ddt/src/Stato.php
@@ -19,10 +19,13 @@
namespace Modules\DDT;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
class Stato extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'dt_statiddt';
public function ddt()
diff --git a/modules/ddt/src/Tipo.php b/modules/ddt/src/Tipo.php
index 852e72d4f..635bfb940 100755
--- a/modules/ddt/src/Tipo.php
+++ b/modules/ddt/src/Tipo.php
@@ -19,10 +19,13 @@
namespace Modules\DDT;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
class Tipo extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'dt_tipiddt';
public function ddt()
diff --git a/modules/emails/src/Account.php b/modules/emails/src/Account.php
index 2159ed161..d6e57e914 100755
--- a/modules/emails/src/Account.php
+++ b/modules/emails/src/Account.php
@@ -20,14 +20,16 @@
namespace Modules\Emails;
use Carbon\Carbon;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Notifications\EmailNotification;
-use Traits\StoreTrait;
+use Traits\LocalPoolTrait;
class Account extends Model
{
- use StoreTrait;
+ use SimpleModelTrait;
+ use LocalPoolTrait;
use SoftDeletes;
protected $table = 'em_accounts';
diff --git a/modules/emails/src/Mail.php b/modules/emails/src/Mail.php
index 07fe3917e..f504d31cc 100755
--- a/modules/emails/src/Mail.php
+++ b/modules/emails/src/Mail.php
@@ -19,7 +19,8 @@
namespace Modules\Emails;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Models\PrintTemplate;
use Models\Upload;
use Models\User;
@@ -27,13 +28,15 @@ use Modules\Newsletter\Newsletter;
class Mail extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'em_emails';
protected $options = null;
public static function build(User $user, $template = null, $id_record = null, $account = null)
{
- $model = parent::build();
+ $model = new static();
$model->created_by = $user->id;
diff --git a/modules/emails/src/Receiver.php b/modules/emails/src/Receiver.php
index 7e4bc8642..8027fe848 100755
--- a/modules/emails/src/Receiver.php
+++ b/modules/emails/src/Receiver.php
@@ -19,17 +19,20 @@
namespace Modules\Emails;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
class Receiver extends Model
{
+ use SimpleModelTrait;
+
protected $table = 'em_email_receiver';
/* Relazioni Eloquent */
public static function build(Mail $mail, $address, $type = null)
{
- $model = parent::build();
+ $model = new static();
$model->email()->associate($mail);
diff --git a/modules/emails/src/Template.php b/modules/emails/src/Template.php
index e748acc20..58451cd10 100755
--- a/modules/emails/src/Template.php
+++ b/modules/emails/src/Template.php
@@ -19,15 +19,17 @@
namespace Modules\Emails;
-use Common\Model;
+use Common\SimpleModelTrait;
+use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Models\Module;
use Models\PrintTemplate;
-use Traits\StoreTrait;
+use Traits\LocalPoolTrait;
class Template extends Model
{
- use StoreTrait;
+ use SimpleModelTrait;
+ use LocalPoolTrait;
use SoftDeletes;
protected $table = 'em_templates';
diff --git a/modules/fatture/actions.php b/modules/fatture/actions.php
index f8e557d9e..37239e4cd 100755
--- a/modules/fatture/actions.php
+++ b/modules/fatture/actions.php
@@ -143,7 +143,7 @@ switch (post('op')) {
if ($stato_fe && empty($checks)) {
try {
$fattura_pa = new FatturaElettronica($id_record);
- $file = $fattura_pa->save(DOCROOT.'/'.FatturaElettronica::getDirectory());
+ $file = $fattura_pa->save(base_dir().'/'.FatturaElettronica::getDirectory());
flash()->info(tr('Fattura elettronica generata correttamente!'));
@@ -304,7 +304,7 @@ switch (post('op')) {
$righe = $fattura->getRighe();
foreach ($righe as $riga) {
$new_riga = $riga->replicate();
- $new_riga->setParent($new);
+ $new_riga->setDocument($new);
// Rimozione riferimenti (deorecati)
$new_riga->idpreventivo = 0;
diff --git a/modules/fatture/add_intervento.php b/modules/fatture/add_intervento.php
index cc3f9d223..a1624b712 100755
--- a/modules/fatture/add_intervento.php
+++ b/modules/fatture/add_intervento.php
@@ -44,7 +44,7 @@ echo '
'_NUM_' => $numero,
]).'
-