this makes possible adding extra attributes to models

This commit is contained in:
Sevan Nerse 2021-02-26 15:38:45 +03:00
parent 19093668ec
commit 962e626c9e
16 changed files with 139 additions and 43 deletions

View File

@ -21,6 +21,10 @@ abstract class Model extends Eloquent
'enabled' => 'boolean', 'enabled' => 'boolean',
]; ];
public $extras = [
//
];
public static function observe($classes) public static function observe($classes)
{ {
parent::observe($classes); parent::observe($classes);

View File

@ -0,0 +1,24 @@
<?php
namespace App\Events\Common;
use App\Abstracts\Event;
class ModelCreated extends Event
{
public $model;
public $attributes;
/**
* Create a new event instance.
*
* @param $model
* @param $attributes
*/
public function __construct($model, $attributes)
{
$this->model = $model;
$this->attributes = $attributes;
}
}

View File

@ -3,6 +3,7 @@
namespace App\Imports\Banking; namespace App\Imports\Banking;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Banking\Transaction as Request; use App\Http\Requests\Banking\Transaction as Request;
use App\Models\Banking\Transaction as Model; use App\Models\Banking\Transaction as Model;
@ -10,7 +11,11 @@ class Transactions extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Banking; namespace App\Imports\Banking;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Models\Banking\Transaction; use App\Models\Banking\Transaction;
use App\Models\Banking\Transfer as Model; use App\Models\Banking\Transfer as Model;
use App\Models\Setting\Category; use App\Models\Setting\Category;
@ -15,7 +16,11 @@ class Transfers extends Import
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Common\Sheets; namespace App\Imports\Common\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Common\Item as Request; use App\Http\Requests\Common\Item as Request;
use App\Models\Common\Item as Model; use App\Models\Common\Item as Model;
@ -10,7 +11,11 @@ class Items extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,14 +3,19 @@
namespace App\Imports\Purchases; namespace App\Imports\Purchases;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Models\Banking\Transaction as Model; use App\Events\Common\ModelCreated;
use App\Http\Requests\Banking\Transaction as Request; use App\Http\Requests\Banking\Transaction as Request;
use App\Models\Banking\Transaction as Model;
class Payments extends Import class Payments extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Purchases\Sheets; namespace App\Imports\Purchases\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Document\DocumentItem as Request; use App\Http\Requests\Document\DocumentItem as Request;
use App\Models\Document\Document; use App\Models\Document\Document;
use App\Models\Document\DocumentItem as Model; use App\Models\Document\DocumentItem as Model;
@ -11,7 +12,11 @@ class BillItems extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Purchases\Sheets; namespace App\Imports\Purchases\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Document\Document as Request; use App\Http\Requests\Document\Document as Request;
use App\Models\Document\Document as Model; use App\Models\Document\Document as Model;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -11,7 +12,11 @@ class Bills extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,14 +3,19 @@
namespace App\Imports\Purchases; namespace App\Imports\Purchases;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Models\Common\Contact as Model; use App\Events\Common\ModelCreated;
use App\Http\Requests\Common\Contact as Request; use App\Http\Requests\Common\Contact as Request;
use App\Models\Common\Contact as Model;
class Vendors extends Import class Vendors extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,14 +3,19 @@
namespace App\Imports\Sales; namespace App\Imports\Sales;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Models\Common\Contact as Model; use App\Events\Common\ModelCreated;
use App\Http\Requests\Common\Contact as Request; use App\Http\Requests\Common\Contact as Request;
use App\Models\Common\Contact as Model;
class Customers extends Import class Customers extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Sales; namespace App\Imports\Sales;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Banking\Transaction as Request; use App\Http\Requests\Banking\Transaction as Request;
use App\Models\Banking\Transaction as Model; use App\Models\Banking\Transaction as Model;
@ -10,7 +11,11 @@ class Revenues extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Sales\Sheets; namespace App\Imports\Sales\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Document\DocumentItem as Request; use App\Http\Requests\Document\DocumentItem as Request;
use App\Models\Document\Document; use App\Models\Document\Document;
use App\Models\Document\DocumentItem as Model; use App\Models\Document\DocumentItem as Model;
@ -11,7 +12,11 @@ class InvoiceItems extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Sales\Sheets; namespace App\Imports\Sales\Sheets;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Document\Document as Request; use App\Http\Requests\Document\Document as Request;
use App\Models\Document\Document as Model; use App\Models\Document\Document as Model;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@ -11,7 +12,11 @@ class Invoices extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function map($row): array public function map($row): array

View File

@ -3,6 +3,7 @@
namespace App\Imports\Settings; namespace App\Imports\Settings;
use App\Abstracts\Import; use App\Abstracts\Import;
use App\Events\Common\ModelCreated;
use App\Http\Requests\Setting\Category as Request; use App\Http\Requests\Setting\Category as Request;
use App\Models\Setting\Category as Model; use App\Models\Setting\Category as Model;
@ -10,7 +11,11 @@ class Categories extends Import
{ {
public function model(array $row) public function model(array $row)
{ {
return new Model($row); $model = new Model($row);
event(new ModelCreated($model, $row));
return $model;
} }
public function rules(): array public function rules(): array

View File

@ -28,6 +28,10 @@ class Company extends Eloquent
'enabled' => 'boolean', 'enabled' => 'boolean',
]; ];
public $extras = [
//
];
/** /**
* Sortable columns. * Sortable columns.
* *

View File

@ -13,8 +13,6 @@ class Setting extends Eloquent
protected $tenantable = true; protected $tenantable = true;
public $timestamps = false;
/** /**
* Attributes that should be mass-assignable. * Attributes that should be mass-assignable.
* *
@ -22,6 +20,12 @@ class Setting extends Eloquent
*/ */
protected $fillable = ['company_id', 'key', 'value']; protected $fillable = ['company_id', 'key', 'value'];
public $extras = [
//
];
public $timestamps = false;
public function company() public function company()
{ {
return $this->belongsTo('App\Models\Common\Company'); return $this->belongsTo('App\Models\Common\Company');