Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions database/factories/AddressFactory.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

namespace Eclipse\Core\Database\Factories;

use Eclipse\Core\Enums\AddressType;
use Eclipse\Core\Models\User;
use Eclipse\Core\Models\User\Address;
use Eclipse\World\Models\Country;
use Illuminate\Database\Eloquent\Factories\Factory;

class AddressFactory extends Factory
{
/**
* The name of the factory's corresponding model.
*
* @var string
*/
protected $model = Address::class;

/**
* Define the model's default state.
*
* @return array<string, mixed>
*/
public function definition(): array
{
$type = match (fake()->numberBetween(1, 3)) {
1 => [AddressType::COMPANY_ADDRESS->value],
2 => [AddressType::DEFAULT_ADDRESS->value],
3 => [AddressType::COMPANY_ADDRESS->value, AddressType::DEFAULT_ADDRESS->value],
};

$hasCompanyAddress = in_array(AddressType::COMPANY_ADDRESS->value, $type);

return [
'recipient' => fake()->name(),
'company_name' => $hasCompanyAddress ? fake()->company() : null,
'company_vat_id' => $hasCompanyAddress ? fake()->numerify('##########') : null,
'street_address' => [
fake()->streetAddress(),
fake()->streetAddress(),
],
'postal_code' => fake()->postcode(),
'city' => fake()->city(),
'type' => $type,
'country_id' => Country::inRandomOrder()->first()?->id ?? Country::factory()->create()->id,
'user_id' => User::inRandomOrder()->first()?->id ?? User::factory()->create()->id,
];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?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::create('user_addresses', function (Blueprint $table) {
$table->id();
$table->string('recipient', 100);
$table->string('company_name', 100)
->nullable();
$table->string('company_vat_id', 50)
->nullable();
$table->json('street_address');
$table->string('postal_code', 50);
$table->string('city', 100);
$table->json('type')->nullable();
$table->string('country_id', 2);
$table->foreignId('user_id')
->constrained('users')
->cascadeOnDelete();
$table->softDeletes();
$table->timestamps();
$table->foreign('country_id')
->references('id')
->on('world_countries');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('user_addresses');
}
};
5 changes: 5 additions & 0 deletions database/seeders/UserSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Eclipse\Core\Models\Site;
use Eclipse\Core\Models\User;
use Eclipse\Core\Models\User\Address;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Hash;

Expand Down Expand Up @@ -41,6 +42,10 @@ public function run(): void
foreach (Site::all() as $site) {
$user->sites()->attach($site);

Address::factory()->create([
'user_id' => $user->id,
]);

if (isset($preset['role'])) {
setPermissionsTeamId($site->id);
$user->assignRole($preset['role'])->save();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
public function up(): void
{
$this->migrator->add('eclipse.email_verification', false);
$this->migrator->add('eclipse.address_book', false);
}
};
28 changes: 28 additions & 0 deletions src/Enums/AddressType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace Eclipse\Core\Enums;

use Filament\Support\Contracts\HasDescription;
use Filament\Support\Contracts\HasLabel;

enum AddressType: string implements HasDescription, HasLabel
{
case DEFAULT_ADDRESS = 'default_address';
case COMPANY_ADDRESS = 'company_address';

public function getLabel(): ?string
{
return match ($this) {
self::DEFAULT_ADDRESS => 'Default',
self::COMPANY_ADDRESS => 'Company'
};
}

public function getDescription(): ?string
{
return match ($this) {
self::DEFAULT_ADDRESS => 'This is the default address',
self::COMPANY_ADDRESS => 'This is a company address'
};
}
}
2 changes: 2 additions & 0 deletions src/Filament/Pages/ManageEclipse.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public function form(Form $form): Form
->schema([
Forms\Components\Toggle::make('email_verification')
->label('Enable user email verification'),
Forms\Components\Toggle::make('address_book')
->label('Enable address book'),
]);
}

Expand Down
3 changes: 2 additions & 1 deletion src/Filament/Resources/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
use Eclipse\Core\Filament\Exports\TableExport;
use Eclipse\Core\Filament\Resources;
use Eclipse\Core\Filament\Resources\UserResource\RelationManagers\AddressesRelationManager;
use Eclipse\Core\Models\User;
use Filament\Forms;
use Filament\Forms\Components\Actions\Action;
Expand Down Expand Up @@ -287,7 +288,7 @@ public static function infolist(Infolist $infolist): Infolist
public static function getRelations(): array
{
return [
//
AddressesRelationManager::class,
];
}

Expand Down
10 changes: 10 additions & 0 deletions src/Filament/Resources/UserResource/Pages/EditUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ class EditUser extends EditRecord
{
protected static string $resource = UserResource::class;

public function hasCombinedRelationManagerTabsWithContent(): bool
{
return true;
}

public function getContentTabLabel(): ?string
{
return __('Edit User');
}

protected function getHeaderActions(): array
{
return [
Expand Down
10 changes: 10 additions & 0 deletions src/Filament/Resources/UserResource/Pages/ViewUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ class ViewUser extends ViewRecord
{
protected static string $resource = UserResource::class;

public function hasCombinedRelationManagerTabsWithContent(): bool
{
return true;
}

public function getContentTabLabel(): ?string
{
return __('View User');
}

protected function getHeaderActions(): array
{
return [
Expand Down
Loading
Loading