project relationship order

app/Filament/Resources/BadgeResource.php

@@ -34,7 +34,7 @@ class BadgeResource extends Resource
     protected static function booted()
     {
         static::addGlobalScope('ordered', function ($query) {
-            $query->orderBy('order')->orderBy('id');
+            $query->orderBy('badges.order')->orderBy('badges.id');
         });
     }
 

app/Filament/Resources/ProjectResource.php

@@ -20,7 +20,6 @@ use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\ImageColumn;
@@ -108,7 +107,10 @@ class ProjectResource extends Resource
                                 ->searchable()
                                 ->label('')
                                 ->required(),
-                        ])->reorderable(false),
+                        ])
+                            ->relationship('targetBadges')
+                            ->reorderableWithButtons()
+                            ->orderColumn('sort_order'),
                         Repeater::make('badgesAward')->label('取得標章')->schema([
                             Hidden::make('award_type')->default(2),
                             Select::make('badge_id')
@@ -133,7 +135,10 @@ class ProjectResource extends Resource
                                 ->displayFormat('Y年m月')
                                 ->native(false)
                                 ->closeOnDateSelection(),
-                        ])->reorderable(false),
+                        ])
+                            ->relationship('awardBadges')
+                            ->reorderableWithButtons()
+                            ->orderColumn('sort_order'),
                     ]),
                     Tab::make('開發歷程')->schema([
                         Repeater::make('histories')->label('')->schema([
@@ -155,16 +160,16 @@ class ProjectResource extends Resource
                                 ])->columnSpanFull()
                                 ->id(fn ($get) => 'histories_'.$get('histories_item_key')),
                         ])
-                            ->relationship('histories', function ($query, Get $get, $livewire) {
-                                return $query->orderby('operate_date', 'desc');
-                            })
+                            ->relationship('histories')
+                            ->reorderableWithButtons()
+                            ->orderColumn('order')
                             ->collapsible()
                             ->cloneable(),
                     ]),
                     Tab::make('空間資訊')->schema([
                         Group::make()->schema([
                             Translate::make()->schema(fn (string $locale) => [
-//                                TextInput::make('contact_unit')->label('物管單位'),
+                                //                                TextInput::make('contact_unit')->label('物管單位'),
                                 TextInput::make('contact_phone')->label('物管電話'),
                                 TextInput::make('inversment_phone')->label('招商電話'),
                             ])

app/Models/Project.php

@@ -35,7 +35,8 @@ class Project extends Model
     public function badges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-            ->withPivot('award_date', 'award_type')  // ✅ 關鍵
+            ->withPivot('award_date', 'award_type', 'sort_order')
+            ->orderByPivot('sort_order')
             ->withTimestamps();
     }
 
@@ -45,8 +46,9 @@ class Project extends Model
     public function targetBadges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-            ->withPivot('award_type')
+            ->withPivot('award_type', 'sort_order')
             ->wherePivot('award_type', 1)
+            ->orderByPivot('sort_order')
             ->withTimestamps();
     }
 
@@ -56,19 +58,20 @@ class Project extends Model
     public function awardBadges()
     {
         return $this->morphToMany(Badge::class, 'badgeable')
-            ->withPivot('award_type', 'award_date')
+            ->withPivot('award_type', 'award_date', 'sort_order')
             ->wherePivot('award_type', 2)
+            ->orderByPivot('sort_order')
             ->withTimestamps();
     }
 
     public function histories()
     {
-        return $this->hasMany(ProjectHistory::class);
+        return $this->hasMany(ProjectHistory::class)->orderBy('order');
     }
 
     public function spaceInfos()
     {
-        return $this->hasMany(ProjectSpaceInfo::class);
+        return $this->hasMany(ProjectSpaceInfo::class)->orderBy('order');
     }
 
     public function firstListImgUrl(): Attribute

database/migrations/2025_12_02_075717_add_order_column_to_badgeables_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('badgeables', function (Blueprint $table) {
+            $table->integer('order')->default(0)->after('award_type');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('badgeables', function (Blueprint $table) {
+            $table->dropColumn('order');
+        });
+    }
+};

database/migrations/2025_12_02_075722_add_order_column_to_project_histories_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('project_histories', function (Blueprint $table) {
+            $table->integer('order')->default(0)->after('visible');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('project_histories', function (Blueprint $table) {
+            $table->dropColumn('order');
+        });
+    }
+};

database/migrations/2025_12_02_090453_rename_order_to_sort_order_in_badgeables_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('badgeables', function (Blueprint $table) {
+            $table->renameColumn('order', 'sort_order');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('badgeables', function (Blueprint $table) {
+            $table->renameColumn('sort_order', 'order');
+        });
+    }
+};