Jelajahi Sumber

ModelTimeFormat修改

ajun 5 tahun lalu
induk
melakukan
4d0799d46a
4 mengubah file dengan 14 tambahan dan 12 penghapusan
  1. 2 2
      app/Configuration.php
  2. 2 2
      app/Material.php
  3. 8 6
      app/OwnerMaterial.php
  4. 2 2
      app/Supplier.php

+ 2 - 2
app/Configuration.php

@@ -4,12 +4,12 @@ namespace App;
 
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Configuration extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     use ModelTimeFormat;
     protected $fillable = [
         'name','value','description','operator'

+ 2 - 2
app/Material.php

@@ -5,11 +5,11 @@ namespace App;
 use App\Filters\MaterialFilters;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 
 class Material extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
 
     protected $fillable = ['name','code'];
 

+ 8 - 6
app/OwnerMaterial.php

@@ -5,31 +5,33 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class OwnerMaterial extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     use ModelTimeFormat;
     protected $table = 'owner_material';
     protected $fillable = ['owner_id','material_id','material_code','size','special','specification','initiator'];
 
-    public function owner()
+    public function owner():BelongsTo
     {
         return $this->belongsTo(Owner::class);
     }
 
-    public function material()
+    public function material():BelongsTo
     {
         return $this->belongsTo(Material::class);
     }
 
-    public function initiator()
+    public function initiator():BelongsTo
     {
         return $this->belongsTo(User::class,'initiator','id');
     }
 
-    public function file()
+    public function file():HasOne
     {
         return $this->hasOne(UploadFile::class,'table_id','id')->where('table_name','owner_material');
     }

+ 2 - 2
app/Supplier.php

@@ -5,13 +5,13 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 
-use App\Traits\LogModelChanging;
+use App\Traits\ModelLogChanging;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Supplier extends Model
 {
-    use LogModelChanging;
+    use ModelLogChanging;
     use ModelTimeFormat;
     use SoftDeletes;
     protected $fillable = ['name','contact_man','phone','invoice_title','bank','bank_account','opening_bank'];