Fix order activity timeline blank entries (#1317)

lunarphp · Jan 12, 2024 · faeb6db · faeb6db · vercel · Jan 12, 2024
1 parent f7919a4
commit faeb6db
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/packages/core/src/Base/Traits/LogsActivity.php b/packages/core/src/Base/Traits/LogsActivity.php
@@ -2,13 +2,16 @@
 
 namespace Lunar\Base\Traits;
 
+use Illuminate\Support\Arr;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity as SpatieLogsActivity;
 
 trait LogsActivity
 {
     use SpatieLogsActivity;
 
+    public static array $logExcept = [];
+
     /**
      * Get the log options for the activity log.
      */
@@ -17,7 +20,25 @@ public function getActivitylogOptions(): LogOptions
         return LogOptions::defaults()
             ->useLogName('lunar')
             ->logAll()
-            ->dontSubmitEmptyLogs()
-            ->logExcept(['updated_at']);
+            ->logExcept(array_merge(['updated_at'], static::getActivitylogExcept()))
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs();
+    }
+
+    public static function addActivitylogExcept(array|string $fields)
+    {
+        $fields = Arr::wrap($fields);
+
+        static::$logExcept = array_merge(static::$logExcept, $fields);
+    }
+
+    public static function getDefaultLogExcept(): array
+    {
+        return [];
+    }
+
+    public static function getActivitylogExcept(): array
+    {
+        return array_merge(static::getDefaultLogExcept(), static::$logExcept);
     }
 }
diff --git a/packages/core/src/Models/Order.php b/packages/core/src/Models/Order.php
@@ -244,4 +244,11 @@ public function isPlaced(): bool
     {
         return ! blank($this->placed_at);
     }
+
+    public static function getDefaultLogExcept(): array
+    {
+        return [
+            'status',
+        ];
+    }
 }