優化公共事業費操作紀錄與新增操作紀錄規範 Skill

app/Http/Controllers/Admin/ActivityLogController.php

@@ -21,6 +21,7 @@ class ActivityLogController extends Controller
             'App\Models\PurchaseOrder' => '採購單',
             'App\Models\Warehouse' => '倉庫',
             'App\Models\Inventory' => '庫存',
+            'App\Models\UtilityFee' => '公共事業費',
         ];
     }
 

app/Http/Controllers/UtilityFeeController.php

@@ -66,7 +66,22 @@ class UtilityFeeController extends Controller
             'description' => 'nullable|string',
         ]);
 
-        UtilityFee::create($validated);
+        $fee = UtilityFee::create($validated);
+
+        // Log activity
+        activity()
+            ->performedOn($fee)
+            ->causedBy(auth()->user())
+            ->event('created')
+            ->withProperties([
+                'attributes' => $fee->getAttributes(),
+                'snapshot' => [
+                    'category' => $fee->category,
+                    'amount' => $fee->amount,
+                    'transaction_date' => $fee->transaction_date->format('Y-m-d'),
+                ]
+            ])
+            ->log('created');
 
         return redirect()->back();
     }
@@ -81,14 +96,81 @@ class UtilityFeeController extends Controller
             'description' => 'nullable|string',
         ]);
 
+        // Capture old attributes before update
+        $oldAttributes = $utility_fee->getAttributes();
+
         $utility_fee->update($validated);
 
+        // Capture new attributes
+        $newAttributes = $utility_fee->getAttributes();
+
+        // Manual logOnlyDirty: Filter attributes to only include changes
+        $changedAttributes = [];
+        $changedOldAttributes = [];
+
+        foreach ($newAttributes as $key => $value) {
+            // Skip timestamps if they are the only change (optional, but good practice)
+            if (in_array($key, ['updated_at'])) continue;
+
+            $oldValue = $oldAttributes[$key] ?? null;
+            
+            // Simple comparison (casting to string to handle date objects vs strings if necessary, 
+            // but Eloquent attributes are usually consistent if casted. 
+            // Using loose comparison != handles most cases correctly)
+            if ($value != $oldValue) {
+                $changedAttributes[$key] = $value;
+                $changedOldAttributes[$key] = $oldValue;
+            }
+        }
+
+        // Only log if there are changes (excluding just updated_at)
+        if (empty($changedAttributes)) {
+            return redirect()->back();
+        }
+
+        // Log activity with before/after comparison
+        activity()
+            ->performedOn($utility_fee)
+            ->causedBy(auth()->user())
+            ->event('updated')
+            ->withProperties([
+                'attributes' => $changedAttributes,
+                'old' => $changedOldAttributes,
+                'snapshot' => [
+                    'category' => $utility_fee->category,
+                    'amount' => $utility_fee->amount,
+                    'transaction_date' => $utility_fee->transaction_date->format('Y-m-d'),
+                ]
+            ])
+            ->log('updated');
+
         return redirect()->back();
     }
 
     public function destroy(UtilityFee $utility_fee)
     {
+        // Capture data snapshot before deletion
+        $snapshot = [
+            'category' => $utility_fee->category,
+            'amount' => $utility_fee->amount,
+            'transaction_date' => $utility_fee->transaction_date->format('Y-m-d'),
+            'invoice_number' => $utility_fee->invoice_number,
+            'description' => $utility_fee->description,
+        ];
+
+        // Log activity before deletion
+        activity()
+            ->performedOn($utility_fee)
+            ->causedBy(auth()->user())
+            ->event('deleted')
+            ->withProperties([
+                'attributes' => $utility_fee->getAttributes(),
+                'snapshot' => $snapshot
+            ])
+            ->log('deleted');
+
         $utility_fee->delete();
+        
         return redirect()->back();
     }
 }

app/Models/UtilityFee.php

@@ -4,12 +4,10 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Spatie\Activitylog\Traits\LogsActivity;
-use Spatie\Activitylog\LogOptions;
 
 class UtilityFee extends Model
 {
-    use HasFactory, LogsActivity;
+    use HasFactory;
 
     protected $fillable = [
         'transaction_date',
@@ -23,12 +21,4 @@ class UtilityFee extends Model
         'transaction_date' => 'date:Y-m-d',
         'amount' => 'decimal:2',
     ];
-
-    public function getActivitylogOptions(): LogOptions
-    {
-        return LogOptions::defaults()
-            ->logAll()
-            ->logOnlyDirty()
-            ->dontSubmitEmptyLogs();
-    }
 }