solve conflict

app/Models/CorporateFormularium.php

@@ -6,6 +6,7 @@ use App\Traits\Blameable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Altek\Accountant\Contracts\Recordable;
 
 class CorporateFormularium extends Model
 {
@@ -15,7 +16,7 @@ class CorporateFormularium extends Model
 
     protected $fillable = [
         'corporate_id',
-        'formularium_id',
+        'formularium_template_id',
         'active'
     ];
 
@@ -24,8 +25,8 @@ class CorporateFormularium extends Model
         return $this->belongsTo(Corporate::class);
     }
 
-    public function formularium()
+    public function formularium_template()
     {
-        return $this->belongsTo(Formularium::class);
+        return $this->belongsTo(FormulariumTemplate::class);
     }
 }

app/Models/CorporateHospital.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\Blameable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class CorporateHospital extends Model
+{
+    use HasFactory, SoftDeletes, Blameable;
+
+    protected $fillable = [
+        'corporate_id',
+        'organization_id',
+        'code',
+        'name',
+        'description',
+        'active',
+    ];
+
+    public function corporate()
+    {
+        return $this->belongsTo(Corporate::class);
+    }
+
+    public function scopeFilter($query, array $filters)
+    {
+        $query->when($filters['search'] ?? false, function ($query, $search) {
+            return $query
+                    ->where('code', 'like', "%" . $search . "%")
+                    ->orWhere('name', 'like', "%" . $search . "%");
+        });
+    }
+}

app/Models/CorporatePlan.php

@@ -18,6 +18,10 @@ class CorporatePlan extends Model
         'code',
         'name',
         'description',
+        'corporate_plan_id',
+        'service_code',
+        'type',
+        'limit_rules',
         'active',
         'reason'
     ];

app/Models/Formularium.php

@@ -37,11 +37,6 @@ class Formularium extends Model
         $this->attributes['code'] = !empty($value) ? $value : Str::upper(Str::random('6'));
     }
 
-    public function corporateFormulariums()
-    {
-        return $this->hasMany(CorporateFormularium::class, 'formularium_id', 'id');
-    }
-
     public function items()
     {
         return $this->belongsToMany(Drug::class, 'formularium_items', 'formularium_id', 'item_id');

app/Models/FormulariumTemplate.php

@@ -23,4 +23,9 @@ class FormulariumTemplate extends Model
         'updated_by',
         // 'deleted_by',
     ];
+
+    // public function corporateFormulariums()
+    // {
+    //     return $this->hasMany(CorporateFormularium::class, 'formularium_template_id', 'id');
+    // }
 }

app/Providers/AppServiceProvider.php

@@ -7,6 +7,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
 use App\Models\Corporate;
+use App\Models\CorporateFormularium;
 use App\Models\CorporateService;
 use App\Models\CorporatePlan;
 use App\Models\CorporateBenefit;
@@ -143,6 +144,14 @@ class AppServiceProvider extends ServiceProvider
             $this->logAuditTrail($model, 'deleted');
         });
 
+        // Formualrium Template
+        CorporateFormularium::updated(function ($model) {
+            $this->logAuditTrail($model, 'updated');
+        });
+        CorporateFormularium::deleted(function ($model) {
+            $this->logAuditTrail($model, 'deleted');
+        });
+
 
     }