WIP: SoftDelete Contract/Payment/Customer, collected_by, Notifications, ProjectReport, ExportDebtReport

app/Filament/Resources/Customers/Schemas/CustomerForm.php

@@ -6,8 +6,8 @@ use App\Models\Customer;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Actions\Action;
+use Filament\Schemas\Components\Section;
+use Filament\Actions\Action;
 use Filament\Forms\Components\TagsInput;
 use Filament\Schemas\Schema;
 use Filament\Schemas\Components\Utilities\Set;

app/Filament/Resources/Payments/Schemas/PaymentForm.php

@@ -149,6 +149,14 @@ class PaymentForm
                                     ])
                                     ->default('Chuyển khoản')
                                     ->required(),
+
+                                Select::make('collected_by')
+                                    ->label('Ngườ thu')
+                                    ->relationship('collector', 'name')
+                                    ->searchable()
+                                    ->preload()
+                                    ->default(auth()->id())
+                                    ->required(),
                             ]),
 
                         Section::make('Bổ sung')

app/Filament/Resources/Payments/Tables/PaymentsTable.php

@@ -73,6 +73,11 @@ class PaymentsTable
                     ->money('VND')
                     ->placeholder('-')
                     ->color('danger'),
+
+                Tables\Columns\TextColumn::make('collector.name')
+                    ->label('Ngườ thu')
+                    ->placeholder('-')
+                    ->sortable(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('method')