feat: updates

This commit is contained in:
JP
2024-08-11 20:03:49 +08:00
parent 140e821e0c
commit 52431a2c61
45 changed files with 1152 additions and 287 deletions

View File

@@ -4,11 +4,7 @@ namespace App\Filament\Resources\ClientResource\Pages;
use App\Filament\Resources\ClientResource;
use App\Filament\Resources\ClientResource\RelationManagers\AccountsRelationManager;
use App\Filament\Resources\ClientResource\RelationManagers\BranchesRelationManager;
use App\Filament\Resources\ClientResource\RelationManagers\TransmittalsRelationManager;
use App\Models\Account;
use App\Models\Transmittal;
use Filament\Actions;
use Filament\Infolists\Components\Grid;
use Filament\Infolists\Components\RepeatableEntry;
use Filament\Infolists\Components\Section;
@@ -41,8 +37,8 @@ class ViewClient extends ViewRecord
TextEntry::make('current_series')->label('Branch Current Series'),
])
->hiddenLabel()
->grid(2)
])->collapsible()
->grid(2),
])->collapsible(),
]);
}

View File

@@ -22,11 +22,11 @@ class AccountsRelationManager extends RelationManager
Forms\Components\TextInput::make('account')->required(),
Forms\Components\Textarea::make('description')->nullable(),
Forms\Components\Select::make('account_type_id')
->relationship('accountType','type')
->relationship('accountType', 'type')
->required(),
Forms\Components\Select::make('normal_balance')->options(
['debit' => 'Debit','credit' => 'Credit']
)->required()
['debit' => 'Debit', 'credit' => 'Credit']
)->required(),
]);
}
@@ -35,7 +35,7 @@ class AccountsRelationManager extends RelationManager
return $table
->recordTitleAttribute('client_id')
->columns([
Tables\Columns\TextColumn::make('account')->description(fn (Account $record): string => $record->description),
Tables\Columns\TextColumn::make('account')->description(fn (Account $record): string => $record->description ?? ''),
Tables\Columns\TextColumn::make('accountType.type'),
Tables\Columns\TextColumn::make('normal_balance'),
])

View File

@@ -2,7 +2,9 @@
namespace App\Filament\Resources\ClientResource\RelationManagers;
use App\DataObjects\CreateBranchDTO;
use App\Filament\Resources\BranchResource\Pages\EditBranch;
use App\Filament\Resources\ClientResource;
use App\Models\Branch;
use App\Processes\Branch\CreateBranchProcess;
use Filament\Forms;
use Filament\Forms\Form;
@@ -10,6 +12,7 @@ use Filament\Resources\RelationManagers\RelationManager;
use Filament\Support\RawJs;
use Filament\Tables;
use Filament\Tables\Table;
use Illuminate\Validation\Rules\Unique;
class BranchesRelationManager extends RelationManager
{
@@ -18,15 +21,24 @@ class BranchesRelationManager extends RelationManager
protected static bool $shouldCheckPolicyExistence = true;
protected CreateBranchProcess $createBranchProcess;
public function __construct() {
$this->createBranchProcess = new CreateBranchProcess();
public function __construct()
{
$this->createBranchProcess = new CreateBranchProcess;
}
public function form(Form $form): Form
{
return $form
->schema([
Forms\Components\TextInput::make('code')->required()->unique('branches','code'),
Forms\Components\Hidden::make('id'),
Forms\Components\TextInput::make('code')->required()
->unique(
'branches',
'code',
ignoreRecord: true,
modifyRuleUsing: fn (Unique $rule) => $rule->where('client_id', $this->getOwnerRecord()->id)
),
Forms\Components\TextInput::make('series')->label('Current Series')
->required()
->numeric()
@@ -35,7 +47,7 @@ class BranchesRelationManager extends RelationManager
->minLength(1)
->mask(RawJs::make(<<<'JS'
'999999'
JS))
JS)),
])->columns(1);
}
@@ -52,17 +64,16 @@ class BranchesRelationManager extends RelationManager
])
->headerActions([
Tables\Actions\CreateAction::make()
->mutateFormDataUsing(function (array $data): array {
$data['client_id'] = $this->ownerRecord->id;
return $data;
})
->using(function($data) {
$payload = new CreateBranchDTO(data: $data);
return $this->createBranchProcess->run($payload)->branch;
}),
->mutateFormDataUsing(fn ($data) => $this->appendCientId($data))
->using(fn ($data) => $this->saveBranch($data)),
])
->actions([
Tables\Actions\EditAction::make(),
// Tables\Actions\ViewAction::make()->url(fn ($record) => EditBranch::getUrl(['record' => $record->id])),
Tables\Actions\EditAction::make()
->fillForm(fn ($record) => ['id' => $record->id, 'code' => $record->code, 'series' => $record->current_series])
->mutateFormDataUsing(fn ($data) => $this->appendCientId($data))
->using(fn ($data) => $this->saveBranch($data))
->url(fn ($record) => EditBranch::getUrl(['record' => $record->id])),
Tables\Actions\DeleteAction::make(),
])
->bulkActions([
@@ -72,5 +83,15 @@ class BranchesRelationManager extends RelationManager
]);
}
public function appendCientId($data): array
{
$data['client_id'] = $this->ownerRecord->id;
return $data;
}
public function saveBranch($data): Branch
{
return ClientResource::saveBranch($data);
}
}

View File

@@ -2,22 +2,7 @@
namespace App\Filament\Resources\ClientResource\RelationManagers;
use App\Commands\Transmittal\GenerateTransmittalSeries;
use App\Commands\Transmittal\StoreTransmittalCommand;
use App\DataObjects\CreateTransmittalDTO;
use App\Filament\Resources\TransmittalResource;
use App\Models\Branch;
use App\Models\Client;
use App\Models\Transmittal;
use App\Processes\Transmittal\CreateTransmittalProcess;
use Filament\Actions\Action;
use Filament\Actions\CreateAction;
use Filament\Forms;
use Filament\Forms\Components\DatePicker;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Textarea;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Tables;
@@ -33,30 +18,23 @@ class TransmittalsRelationManager extends RelationManager
return auth()->user()->can('update_transmittal');
}
protected CreateTransmittalProcess $transmittalProcess;
public function __construct()
{
$this->transmittalProcess = new CreateTransmittalProcess();
}
public function form(Form $form): Form
{
return TransmittalResource::form($form)
->fill(
['client_id' => $this->getOwnerRecord()->id]
);
['client_id' => $this->getOwnerRecord()->id]
);
}
public function table(Table $table): Table
{
return TransmittalResource::table($table)->headerActions([
Tables\Actions\Action::make('New Transmittal')->action('openCreateForm')
Tables\Actions\Action::make('New Transmittal')->action('openCreateForm'),
]);
}
public function openCreateForm() {
public function openCreateForm()
{
return redirect()->route('filament.admin.resources.transmittals.create');
}
}