wip

app/Filament/Company/Clusters/Settings/Pages/CompanyProfile.php

@@ -4,8 +4,7 @@ namespace App\Filament\Company\Clusters\Settings\Pages;
 
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Clusters\Settings;
-use App\Models\Locale\City;
-use App\Models\Locale\Country;
+use App\Filament\Forms\Components\CountrySelect;
 use App\Models\Locale\State;
 use App\Models\Setting\CompanyProfile as CompanyProfileModel;
 use App\Utilities\Localization\Timezone;
@@ -14,12 +13,12 @@ use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Pages\Page;
@@ -95,18 +94,7 @@ class CompanyProfile extends Page
             return;
         }
 
-        $countryChanged = $this->record->wasChanged('country');
-        $stateChanged = $this->record->wasChanged('state_id');
-
         $this->getSavedNotification()->send();
-
-        if ($countryChanged || $stateChanged) {
-            if ($countryChanged) {
-                $this->updateTimezone($this->record->country);
-            }
-
-            $this->getTimezoneChangeNotification()->send();
-        }
     }
 
     protected function updateTimezone(string $countryCode): void
@@ -198,39 +186,36 @@ class CompanyProfile extends Page
 
     protected function getLocationDetailsSection(): Component
     {
-        return Section::make('Location Details')
+        return Section::make('Address Information')
+            ->relationship('address')
             ->schema([
-                Select::make('country')
-                    ->searchable()
-                    ->localizeLabel()
-                    ->live()
-                    ->options(Country::getAvailableCountryOptions())
-                    ->afterStateUpdated(static function (Set $set) {
-                        $set('state_id', null);
-                        $set('city_id', null);
-                    })
+                Hidden::make('type')
+                    ->default('general'),
+                TextInput::make('address_line_1')
+                    ->label('Address Line 1')
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('address_line_2')
+                    ->label('Address Line 2')
+                    ->maxLength(255),
+                CountrySelect::make('country')
+                    ->clearStateField()
                     ->required(),
                 Select::make('state_id')
                     ->localizeLabel('State / Province')
                     ->searchable()
-                    ->live()
                     ->options(static fn (Get $get) => State::getStateOptions($get('country')))
-                    ->afterStateUpdated(static fn (Set $set) => $set('city_id', null))
                     ->nullable(),
-                TextInput::make('address')
-                    ->localizeLabel('Street Address')
-                    ->maxLength(255)
-                    ->nullable(),
-                Select::make('city_id')
+                TextInput::make('city')
                     ->localizeLabel('City / Town')
-                    ->searchable()
-                    ->options(static fn (Get $get) => City::getCityOptions($get('country'), $get('state_id')))
-                    ->nullable(),
-                TextInput::make('zip_code')
-                    ->localizeLabel('Zip / Postal Code')
-                    ->maxLength(20)
-                    ->nullable(),
-            ])->columns();
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('postal_code')
+                    ->label('Postal Code / Zip Code')
+                    ->required()
+                    ->maxLength(255),
+            ])
+            ->columns(2);
     }
 
     protected function getLegalAndComplianceSection(): Component

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -130,7 +130,7 @@ class Localization extends Page
                 Select::make('timezone')
                     ->softRequired()
                     ->localizeLabel()
-                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->country))
+                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->address->country))
                     ->searchable(),
             ])->columns();
     }

app/Filament/Company/Pages/CreateCompany.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Pages;
 
+use App\Enums\Common\AddressType;
 use App\Enums\Setting\EntityType;
 use App\Models\Company;
 use App\Models\Locale\Country;
@@ -66,6 +67,8 @@ class CreateCompany extends FilamentCreateCompany
                     ->live()
                     ->searchable()
                     ->options(Country::getAvailableCountryOptions())
+                    ->getSearchResultsUsing(fn (string $search): array => Country::getSearchResultsUsing($search))
+                    ->getOptionLabelUsing(fn ($value): ?string => Country::find($value)?->name . ' ' . Country::find($value)?->flag)
                     ->softRequired(),
                 Select::make('locale.language')
                     ->label('Language')
@@ -101,9 +104,14 @@ class CreateCompany extends FilamentCreateCompany
                 'personal_company' => $personalCompany,
             ]);
 
-            $company->profile()->create([
+            $profile = $company->profile()->create([
                 'email' => $data['profile']['email'],
                 'entity_type' => $data['profile']['entity_type'],
+            ]);
+
+            $profile->address()->create([
+                'company_id' => $company->id,
+                'type' => AddressType::General,
                 'country' => $data['profile']['country'],
             ]);
 

app/Filament/Company/Resources/Purchases/VendorResource.php

@@ -5,13 +5,16 @@ namespace App\Filament\Company\Resources\Purchases;
 use App\Enums\Common\ContractorType;
 use App\Enums\Common\VendorType;
 use App\Filament\Company\Resources\Purchases\VendorResource\Pages;
+use App\Filament\Forms\Components\CountrySelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CustomSection;
 use App\Filament\Forms\Components\PhoneBuilder;
 use App\Filament\Tables\Columns;
 use App\Models\Common\Vendor;
+use App\Models\Locale\State;
 use Filament\Forms;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -149,22 +152,22 @@ class VendorResource extends Resource
                         Forms\Components\TextInput::make('address_line_2')
                             ->label('Address Line 2')
                             ->maxLength(255),
+                        CountrySelect::make('country')
+                            ->clearStateField()
+                            ->required(),
+                        Forms\Components\Select::make('state_id')
+                            ->localizeLabel('State / Province')
+                            ->searchable()
+                            ->options(static fn (Get $get) => State::getStateOptions($get('country')))
+                            ->nullable(),
                         Forms\Components\TextInput::make('city')
-                            ->label('City')
-                            ->required()
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('state')
-                            ->label('State')
+                            ->localizeLabel('City / Town')
                             ->required()
                             ->maxLength(255),
                         Forms\Components\TextInput::make('postal_code')
                             ->label('Postal Code / Zip Code')
                             ->required()
                             ->maxLength(255),
-                        Forms\Components\TextInput::make('country')
-                            ->label('Country')
-                            ->required()
-                            ->maxLength(255),
                     ])
                     ->columns(2),
             ]);

app/Filament/Company/Resources/Sales/ClientResource.php

@@ -3,13 +3,13 @@
 namespace App\Filament\Company\Resources\Sales;
 
 use App\Filament\Company\Resources\Sales\ClientResource\Pages;
+use App\Filament\Forms\Components\CountrySelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CustomSection;
 use App\Filament\Forms\Components\PhoneBuilder;
 use App\Filament\Tables\Columns;
 use App\Models\Common\Address;
 use App\Models\Common\Client;
-use App\Models\Locale\Country;
 use App\Models\Locale\State;
 use App\Utilities\Currency\CurrencyConverter;
 use Filament\Forms;
@@ -192,14 +192,8 @@ class ClientResource extends Resource
                                 Forms\Components\TextInput::make('address_line_2')
                                     ->label('Address Line 2')
                                     ->maxLength(255),
-                                Forms\Components\Select::make('country')
-                                    ->searchable()
-                                    ->localizeLabel()
-                                    ->live()
-                                    ->options(Country::getAvailableCountryOptions())
-                                    ->afterStateUpdated(static function (Set $set) {
-                                        $set('state_id', null);
-                                    })
+                                CountrySelect::make('country')
+                                    ->clearStateField()
                                     ->required(),
                                 Forms\Components\Select::make('state_id')
                                     ->localizeLabel('State / Province')
@@ -275,14 +269,8 @@ class ClientResource extends Resource
                                         Forms\Components\TextInput::make('address_line_2')
                                             ->label('Address Line 2')
                                             ->maxLength(255),
-                                        Forms\Components\Select::make('country')
-                                            ->searchable()
-                                            ->localizeLabel()
-                                            ->live()
-                                            ->options(Country::getAvailableCountryOptions())
-                                            ->afterStateUpdated(static function (Set $set) {
-                                                $set('state_id', null);
-                                            })
+                                        CountrySelect::make('country')
+                                            ->clearStateField()
                                             ->required(),
                                         Forms\Components\Select::make('state_id')
                                             ->localizeLabel('State / Province')

app/Filament/Forms/Components/CountrySelect.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Models\Locale\Country;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Set;
+
+class CountrySelect extends Select
+{
+    protected ?string $stateFieldName = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->localizeLabel('Country')
+            ->searchable()
+            ->options($options = Country::getAvailableCountryOptions())
+            ->getSearchResultsUsing(static fn (string $search): array => Country::getSearchResultsUsing($search))
+            ->getOptionLabelUsing(static fn (string $value): ?string => $options[$value] ?? $value);
+
+        $this->afterStateUpdated(function (self $component, Set $set) {
+            if ($component->shouldClearStateField()) {
+                $set($component->getStateFieldName(), null);
+            }
+        });
+    }
+
+    public function clearStateField(string $fieldName = 'state_id'): static
+    {
+        $this->stateFieldName = $fieldName;
+
+        $this->live();
+
+        return $this;
+    }
+
+    public function getStateFieldName(): ?string
+    {
+        return $this->stateFieldName;
+    }
+
+    public function shouldClearStateField(): bool
+    {
+        return (bool) $this->stateFieldName;
+    }
+}

app/Filament/Forms/Components/LabeledField.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Filament\Forms\Components;
-
-use Closure;
-use Filament\Forms\Components\Component;
-use Illuminate\Contracts\Support\Htmlable;
-
-class LabeledField extends Component
-{
-    protected string $view = 'filament.forms.components.labeled-field';
-
-    protected string | Htmlable | Closure | null $prefixLabel = null;
-
-    protected string | Htmlable | Closure | null $suffixLabel = null;
-
-    public static function make(): static
-    {
-        return app(static::class);
-    }
-
-    public function prefix(string | Htmlable | Closure | null $label): static
-    {
-        $this->prefixLabel = $label;
-
-        return $this;
-    }
-
-    public function suffix(string | Htmlable | Closure | null $label): static
-    {
-        $this->suffixLabel = $label;
-
-        return $this;
-    }
-
-    public function getPrefixLabel(): string | Htmlable | null
-    {
-        return $this->evaluate($this->prefixLabel);
-    }
-
-    public function getSuffixLabel(): string | Htmlable | null
-    {
-        return $this->evaluate($this->suffixLabel);
-    }
-}

app/Filament/Forms/Components/LineItemRepeater.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Filament\Forms\Components;
-
-use Awcodes\TableRepeater\Components\TableRepeater;
-use Closure;
-use Filament\Forms\ComponentContainer;
-use Filament\Forms\Components\Component;
-
-class LineItemRepeater extends TableRepeater
-{
-    protected array | Closure $nestedSchema = [];
-
-    protected ?string $nestedColumn = null;
-
-    /**
-     * Set nested schema and optionally the column it belongs to.
-     *
-     * @param  array<Component> | Closure  $components
-     */
-    public function withNestedSchema(array | Closure $components, ?string $underColumn = null): static
-    {
-        $this->nestedSchema = $components;
-        $this->nestedColumn = $underColumn;
-
-        return $this;
-    }
-
-    /**
-     * Get the nested schema.
-     *
-     * @return array<Component>
-     */
-    public function getNestedSchema(): array
-    {
-        return $this->evaluate($this->nestedSchema);
-    }
-
-    /**
-     * Get the column under which the nested schema should be rendered.
-     */
-    public function getNestedColumn(): ?string
-    {
-        return $this->nestedColumn;
-    }
-
-    /**
-     * Determine if there is a nested schema defined.
-     */
-    public function hasNestedSchema(): bool
-    {
-        return ! empty($this->getNestedSchema());
-    }
-
-    public function getNestedSchemaMap(): array
-    {
-        return collect($this->getNestedSchema())
-            ->keyBy(fn ($component) => $component->getKey())
-            ->all();
-    }
-
-    /**
-     * Get all child components, including nested schema.
-     *
-     * @return array<Component>
-     */
-    public function getChildComponents(): array
-    {
-        $components = parent::getChildComponents();
-
-        if ($this->hasNestedSchema()) {
-            $components = array_merge($components, $this->getNestedSchema());
-        }
-
-        return $components;
-    }
-
-    public function getChildComponentContainers(bool $withHidden = false): array
-    {
-        if ((! $withHidden) && $this->isHidden()) {
-            return [];
-        }
-
-        $relationship = $this->getRelationship();
-
-        $records = $relationship ? $this->getCachedExistingRecords() : null;
-
-        $containers = [];
-
-        foreach ($this->getState() ?? [] as $itemKey => $itemData) {
-            $containers[$itemKey] = $this
-                ->getChildComponentContainer()
-                ->statePath($itemKey)
-                ->model($relationship ? $records[$itemKey] ?? $this->getRelatedModel() : null)
-                ->inlineLabel(false)
-                ->getClone();
-        }
-
-        return $containers;
-    }
-
-    public function getChildComponentContainersWithoutNestedSchema(bool $withHidden = false): array
-    {
-        if ((! $withHidden) && $this->isHidden()) {
-            return [];
-        }
-
-        $relationship = $this->getRelationship();
-        $records = $relationship ? $this->getCachedExistingRecords() : null;
-
-        $containers = [];
-
-        $childComponentsWithoutNestedSchema = $this->getChildComponentsWithoutNestedSchema();
-
-        foreach ($this->getState() ?? [] as $itemKey => $itemData) {
-            $containers[$itemKey] = ComponentContainer::make($this->getLivewire())
-                ->parentComponent($this)
-                ->statePath($itemKey)
-                ->model($relationship ? $records[$itemKey] ?? $this->getRelatedModel() : null)
-                ->components($childComponentsWithoutNestedSchema)
-                ->inlineLabel(false)
-                ->getClone();
-        }
-
-        return $containers;
-    }
-
-    public function getChildComponentContainer($key = null): ComponentContainer
-    {
-        if (filled($key) && array_key_exists($key, $containers = $this->getChildComponentContainers())) {
-            return $containers[$key];
-        }
-
-        return ComponentContainer::make($this->getLivewire())
-            ->parentComponent($this)
-            ->components($this->getChildComponents());
-    }
-
-    public function getChildComponentsWithoutNestedSchema(): array
-    {
-        // Fetch the nested schema components.
-        $nestedSchema = $this->getNestedSchema();
-
-        // Filter out the nested schema components.
-        return array_filter($this->getChildComponents(), function ($component) use ($nestedSchema) {
-            return ! in_array($component, $nestedSchema, true);
-        });
-    }
-
-    public function getNestedComponents(): array
-    {
-        // Fetch the nested schema components.
-        $nestedSchema = $this->getNestedSchema();
-
-        // Separate and return only the nested schema components.
-        return array_filter($this->getChildComponents(), function ($component) use ($nestedSchema) {
-            return in_array($component, $nestedSchema, true);
-        });
-    }
-
-    public function getView(): string
-    {
-        return 'filament.forms.components.line-item-repeater';
-    }
-}

app/Models/Locale/Country.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Locale;
 
-use App\Models\Setting\CompanyProfile;
+use App\Models\Common\Address;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -49,9 +49,9 @@ class Country extends Model
         return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public function profiles(): HasMany
+    public function addresses(): HasMany
     {
-        return $this->hasMany(CompanyProfile::class, 'country', 'id');
+        return $this->hasMany(Address::class, 'country', 'id');
     }
 
     public function states(): HasMany
@@ -80,14 +80,43 @@ class Country extends Model
 
     public static function getAllCountryCodes(): Collection
     {
-        return self::all()->pluck('id');
+        return self::query()
+            ->select('id')
+            ->pluck('id');
     }
 
     public static function getAvailableCountryOptions(): array
     {
-        return self::all()->mapWithKeys(static function ($country): array {
-            return [$country->id => $country->name . ' ' . $country->flag];
-        })->toArray();
+        return self::query()
+            ->select(['id', 'name', 'flag'])
+            ->orderBy('name')
+            ->get()
+            ->mapWithKeys(static fn ($country) => [
+                $country->id => $country->name . ' ' . $country->flag,
+            ])
+            ->toArray();
+    }
+
+    public static function getSearchResultsUsing(string $search): array
+    {
+        return self::query()
+            ->select(['id', 'name', 'flag'])
+            ->whereLike('name', "%{$search}%")
+            ->orWhereLike('id', "%{$search}%")
+            ->orderByRaw('
+                CASE
+                    WHEN id = ? THEN 1
+                    WHEN id LIKE ? THEN 2
+                    WHEN name LIKE ? THEN 3
+                    ELSE 4
+                END
+            ', [$search, $search . '%', $search . '%'])
+            ->limit(50)
+            ->get()
+            ->mapWithKeys(static fn ($country) => [
+                $country->id => $country->name . ' ' . $country->flag,
+            ])
+            ->toArray();
     }
 
     public static function getLanguagesByCountryCode(?string $code = null): array

app/Models/Setting/CompanyProfile.php

@@ -5,15 +5,13 @@ namespace App\Models\Setting;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Setting\EntityType;
-use App\Models\Locale\City;
-use App\Models\Locale\Country;
-use App\Models\Locale\State;
+use App\Models\Common\Address;
 use Database\Factories\Setting\CompanyProfileFactory;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Facades\Storage;
 
 class CompanyProfile extends Model
@@ -27,11 +25,6 @@ class CompanyProfile extends Model
     protected $fillable = [
         'company_id',
         'logo',
-        'address',
-        'city_id',
-        'zip_code',
-        'state_id',
-        'country',
         'phone_number',
         'email',
         'tax_id',
@@ -59,24 +52,9 @@ class CompanyProfile extends Model
         });
     }
 
-    public function country(): BelongsTo
+    public function address(): MorphOne
     {
-        return $this->belongsTo(Country::class, 'country', 'id');
-    }
-
-    public function city(): BelongsTo
-    {
-        return $this->belongsTo(City::class, 'city_id', 'id');
-    }
-
-    public function state(): BelongsTo
-    {
-        return $this->belongsTo(State::class, 'state_id', 'id');
-    }
-
-    public function getCountryName(): string
-    {
-        return Country::findByIsoCode2($this->country)?->name ?? '';
+        return $this->morphOne(Address::class, 'addressable');
     }
 
     protected static function newFactory(): Factory

config/aws.php

@@ -16,10 +16,7 @@ return [
     | http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html
     |
     */
-    'credentials' => [
-        'key' => env('AWS_ACCESS_KEY_ID', ''),
-        'secret' => env('AWS_SECRET_ACCESS_KEY', ''),
-    ],
+    'credentials' => false,
     'region' => env('AWS_REGION', 'us-east-1'),
     'version' => 'latest',
     'ua_append' => [

database/factories/CompanyFactory.php

@@ -42,7 +42,7 @@ class CompanyFactory extends Factory
     public function withCompanyProfile(): self
     {
         return $this->afterCreating(function (Company $company) {
-            CompanyProfile::factory()->forCompany($company)->withCountry('US')->create();
+            CompanyProfile::factory()->forCompany($company)->withAddress()->create();
         });
     }
 
@@ -52,7 +52,7 @@ class CompanyFactory extends Factory
     public function withCompanyDefaults(): self
     {
         return $this->afterCreating(function (Company $company) {
-            $countryCode = $company->profile->country;
+            $countryCode = $company->profile->address->country;
             $companyDefaultService = app(CompanyDefaultService::class);
             $companyDefaultService->createCompanyDefaults($company, $company->owner, 'USD', $countryCode, 'en');
         });

database/factories/Setting/CompanyProfileFactory.php

@@ -4,6 +4,7 @@ namespace Database\Factories\Setting;
 
 use App\Enums\Setting\EntityType;
 use App\Faker\State;
+use App\Models\Common\Address;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -25,28 +26,13 @@ class CompanyProfileFactory extends Factory
      */
     public function definition(): array
     {
-        $countryCode = $this->faker->countryCode;
-
         return [
-            'address' => $this->faker->streetAddress,
-            'zip_code' => $this->faker->postcode,
-            'state_id' => $this->faker->state($countryCode),
-            'country' => $countryCode,
-            'phone_number' => $this->faker->phoneNumberForCountryCode($countryCode),
+            'phone_number' => $this->faker->phoneNumber,
             'email' => $this->faker->email,
             'entity_type' => $this->faker->randomElement(EntityType::class),
         ];
     }
 
-    public function withCountry(string $code): self
-    {
-        return $this->state([
-            'country' => $code,
-            'state_id' => $this->faker->state($code),
-            'phone_number' => $this->faker->phoneNumberForCountryCode($code),
-        ]);
-    }
-
     public function forCompany(Company $company): self
     {
         return $this->state([
@@ -55,4 +41,9 @@ class CompanyProfileFactory extends Factory
             'updated_by' => $company->owner->id,
         ]);
     }
+
+    public function withAddress(): self
+    {
+        return $this->has(Address::factory()->general());
+    }
 }

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -98,10 +98,10 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('institutions');
-        Schema::dropIfExists('account_subtypes');
-        Schema::dropIfExists('accounts');
-        Schema::dropIfExists('bank_accounts');
         Schema::dropIfExists('connected_bank_accounts');
+        Schema::dropIfExists('bank_accounts');
+        Schema::dropIfExists('accounts');
+        Schema::dropIfExists('account_subtypes');
+        Schema::dropIfExists('institutions');
     }
 };

database/migrations/2023_09_14_034800_create_company_profiles_table.php

@@ -15,11 +15,6 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->string('logo')->nullable();
-            $table->string('address', 255)->nullable();
-            $table->unsignedMediumInteger('city_id')->nullable()->index();
-            $table->string('zip_code', 20)->nullable();
-            $table->unsignedSmallInteger('state_id')->nullable()->index();
-            $table->string('country')->nullable();
             $table->string('phone_number', 30)->nullable();
             $table->string('email', 255)->nullable();
             $table->string('tax_id', 50)->nullable();

database/migrations/2024_11_19_225812_create_addresses_table.php

@@ -19,12 +19,12 @@ return new class extends Migration
             $table->string('type'); // billing, shipping, etc.
             $table->string('recipient')->nullable();
             $table->string('phone')->nullable();
-            $table->string('address_line_1');
+            $table->string('address_line_1')->nullable();
             $table->string('address_line_2')->nullable();
-            $table->string('city');
+            $table->string('city')->nullable();
             $table->smallInteger('state_id')->nullable();
             $table->string('postal_code')->nullable();
-            $table->string('country')->nullable();
+            $table->string('country');
             $table->text('notes')->nullable();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();

resources/data/lang/es.json

@@ -185,5 +185,43 @@
     "Currency List": "Lista de divisas",
     "Available": "Disponible",
     "Parent Department": "Departamento de padres",
-    "Live Rate": "Tarifa en vivo"
+    "Live Rate": "Tarifa en vivo",
+    "Category": "Categoría",
+    "Configuration": "Configuración",
+    "Dates": "Fechas",
+    "Adjustment Details": "Detalles del ajuste",
+    "Adjustments": "Ajustes",
+    "Sellable Configuration": "Configuración apta para venta",
+    "Purchasable Configuration": "Configuración que se puede comprar",
+    "Sale Information": "Información de venta",
+    "Purchase Information": "Información de compra",
+    "Billing": "Facturación",
+    "Shipping": "Envío",
+    "General Information": "Información general",
+    "Primary Contact": "Contacto principal",
+    "Billing Address": "Dirección de facturación",
+    "Shipping Address": "Dirección de envío",
+    "Invoice Header": "Encabezado de factura",
+    "Invoice Details": "Detalles de la factura",
+    "Secondary Contacts": "Contactos secundarios",
+    "Edit": "Editar",
+    "Bill Details": "Detalles de la factura",
+    "Frequency": "Frecuencia",
+    "Scheduling": "Programación",
+    "Notes": "Notas",
+    "Create": "Crear",
+    "Invoice Footer": "Pie de página de la factura",
+    "Time Zone": "Zona horaria",
+    "Footer": "Pie de página",
+    "Estimate Header": "Encabezado de estimación",
+    "Terms": "Términos",
+    "Estimate Footer": "Estimar pie de página",
+    "Scheduling Form": "Formulario de programación",
+    "Default :Type :Category": "Predeterminado :Type :Category",
+    "Approve": "Aprobar",
+    "Dates & Time": "Fechas y hora",
+    "Schedule Bounds": "Límites de programación",
+    "Ending Balance": "Saldo final",
+    "Address Information": "Información de dirección",
+    "Estimate Details": "Detalles de la estimación"
 }

resources/views/filament/forms/components/labeled-field.blade.php

@@ -1,35 +0,0 @@
-@php
-    $prefixLabel = $getPrefixLabel();
-    $suffixLabel = $getSuffixLabel();
-
-    $childComponentContainer = $getChildComponentContainer();
-    $childComponents = $childComponentContainer->getComponents();
-@endphp
-
-<div
-    {{
-        $attributes->class([
-            'flex items-center gap-x-4',
-        ])
-    }}
->
-    @if($prefixLabel)
-        <span class="whitespace-nowrap text-sm font-medium leading-6 text-gray-950 dark:text-white">{{ $prefixLabel }}</span>
-    @endif
-
-    @foreach($childComponents as $component)
-        @if(count($component->getChildComponents()) > 1)
-            <div>
-                {{ $component }}
-            </div>
-        @else
-            <div class="min-w-28 [&_.fi-fo-field-wrp]:m-0 [&_.grid]:!grid-cols-1 [&_.sm\:grid-cols-3]:!grid-cols-1 [&_.sm\:col-span-2]:!col-span-1">
-                {{ $component }}
-            </div>
-        @endif
-    @endforeach
-
-    @if($suffixLabel)
-        <span class="whitespace-nowrap text-sm font-medium leading-6 text-gray-950 dark:text-white">{{ $suffixLabel }}</span>
-    @endif
-</div>

resources/views/filament/forms/components/line-item-repeater.blade.php

@@ -1,251 +0,0 @@
-@php
-    use Filament\Forms\Components\Actions\Action;
-    use Filament\Support\Enums\Alignment;
-    use Filament\Support\Enums\MaxWidth;
-
-    $containers = $getChildComponentContainersWithoutNestedSchema();
-
-    $addAction = $getAction($getAddActionName());
-    $cloneAction = $getAction($getCloneActionName());
-    $deleteAction = $getAction($getDeleteActionName());
-    $moveDownAction = $getAction($getMoveDownActionName());
-    $moveUpAction = $getAction($getMoveUpActionName());
-    $reorderAction = $getAction($getReorderActionName());
-    $isReorderableWithButtons = $isReorderableWithButtons();
-    $extraItemActions = $getExtraItemActions();
-    $extraActions = $getExtraActions();
-    $visibleExtraItemActions = [];
-    $visibleExtraActions = [];
-
-    $headers = $getHeaders();
-    $renderHeader = $shouldRenderHeader();
-    $stackAt = $getStackAt();
-    $hasContainers = count($containers) > 0;
-    $emptyLabel = $getEmptyLabel();
-    $streamlined = $isStreamlined();
-
-    $statePath = $getStatePath();
-
-    foreach ($extraActions as $extraAction) {
-        $visibleExtraActions = array_filter(
-            $extraActions,
-            fn (Action $action): bool => $action->isVisible(),
-        );
-    }
-
-    foreach ($extraItemActions as $extraItemAction) {
-        $visibleExtraItemActions = array_filter(
-            $extraItemActions,
-            fn (Action $action): bool => $action->isVisible(),
-        );
-    }
-
-    $hasActions = $reorderAction->isVisible()
-        || $cloneAction->isVisible()
-        || $deleteAction->isVisible()
-        || $moveUpAction->isVisible()
-        || $moveDownAction->isVisible()
-        || filled($visibleExtraItemActions);
-
-    $hasNestedSchema = $hasNestedSchema();
-
-    $totalColumns = count($headers) + ($hasActions ? 1 : 0);
-    $nestedColspan = 4; // Nested schema spans the last 3 columns.
-    $emptyColspan = $totalColumns - $nestedColspan;
-@endphp
-
-<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
-    <div
-        x-data="{}"
-        {{ $attributes->merge($getExtraAttributes())->class([
-            'table-repeater-component space-y-6 relative',
-            'streamlined' => $streamlined,
-            match ($stackAt) {
-                'sm', MaxWidth::Small => 'break-point-sm',
-                'lg', MaxWidth::Large => 'break-point-lg',
-                'xl', MaxWidth::ExtraLarge => 'break-point-xl',
-                '2xl', MaxWidth::TwoExtraLarge => 'break-point-2xl',
-                default => 'break-point-md',
-            }
-        ]) }}
-    >
-        @if (count($containers) || $emptyLabel !== false)
-            <div class="table-repeater-container rounded-xl relative ring-1 ring-gray-950/5 dark:ring-white/20">
-                <table class="w-full">
-                    <thead @class([
-                        'table-repeater-header-hidden sr-only' => ! $renderHeader,
-                        'table-repeater-header rounded-t-xl overflow-hidden border-b border-gray-950/5 dark:border-white/20' => $renderHeader,
-                    ])>
-                    <tr class="text-xs md:divide-x md:divide-gray-950/5 dark:md:divide-white/20">
-                        @foreach ($headers as $key => $header)
-                            <th
-                                @class([
-                                    'table-repeater-header-column p-2 font-medium first:rounded-tl-xl last:rounded-tr-xl bg-gray-100 dark:text-gray-300 dark:bg-gray-900/60',
-                                    match($header->getAlignment()) {
-                                      'center', Alignment::Center => 'text-center',
-                                      'right', 'end', Alignment::Right, Alignment::End => 'text-end',
-                                      default => 'text-start'
-                                    }
-                                ])
-                                style="width: {{ $header->getWidth() }}"
-                            >
-                                {{ $header->getLabel() }}
-                                @if ($header->isRequired())
-                                    <span class="whitespace-nowrap">
-                                        <sup class="font-medium text-danger-700 dark:text-danger-400">*</sup>
-                                    </span>
-                                @endif
-                            </th>
-                        @endforeach
-                        @if ($hasActions && count($containers))
-                            <th class="table-repeater-header-column w-px last:rounded-tr-xl p-2 bg-gray-100 dark:bg-gray-900/60">
-                                <span class="sr-only">
-                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
-                                </span>
-                            </th>
-                        @endif
-                    </tr>
-                    </thead>
-                    <tbody
-                        x-sortable
-                        wire:end.stop="{{ 'mountFormComponentAction(\'' . $statePath . '\', \'reorder\', { items: $event.target.sortable.toArray() })' }}"
-                        class="table-repeater-rows-wrapper divide-y divide-gray-950/5 dark:divide-white/20"
-                    >
-                    @if (count($containers))
-                        @foreach ($containers as $uuid => $row)
-                            @php
-                                $visibleExtraItemActions = array_filter(
-                                    $extraItemActions,
-                                    fn (Action $action): bool => $action(['item' => $uuid])->isVisible(),
-                                );
-                            @endphp
-                            <tr
-                                wire:key="{{ $this->getId() }}.{{ $row->getStatePath() }}.{{ $field::class }}.item"
-                                x-sortable-item="{{ $uuid }}"
-                                class="table-repeater-row"
-                            >
-                                @php($counter = 0)
-                                @foreach($row->getComponents() as $cell)
-                                    @if($cell instanceof \Filament\Forms\Components\Hidden || $cell->isHidden())
-                                        {{ $cell }}
-                                    @else
-                                        <td
-                                            @class([
-                                                'table-repeater-column',
-                                                'p-2' => ! $streamlined,
-                                                'has-hidden-label' => $cell->isLabelHidden(),
-                                                match($headers[$counter++]->getAlignment()) {
-                                                  'center', Alignment::Center => 'text-center',
-                                                  'right', 'end', Alignment::Right, Alignment::End => 'text-end',
-                                                  default => 'text-start'
-                                                }
-                                            ])
-                                            style="width: {{ $cell->getMaxWidth() ?? 'auto' }}"
-                                        >
-                                            {{ $cell }}
-                                        </td>
-                                    @endif
-                                @endforeach
-
-                                @if ($hasActions)
-                                    <td class="table-repeater-column p-2 w-px">
-                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
-                                            @foreach ($visibleExtraItemActions as $extraItemAction)
-                                                <li>
-                                                    {{ $extraItemAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endforeach
-
-                                            @if ($reorderAction->isVisible())
-                                                <li x-sortable-handle class="shrink-0">
-                                                    {{ $reorderAction }}
-                                                </li>
-                                            @endif
-
-                                            @if ($isReorderableWithButtons)
-                                                @if (! $loop->first)
-                                                    <li>
-                                                        {{ $moveUpAction(['item' => $uuid]) }}
-                                                    </li>
-                                                @endif
-
-                                                @if (! $loop->last)
-                                                    <li>
-                                                        {{ $moveDownAction(['item' => $uuid]) }}
-                                                    </li>
-                                                @endif
-                                            @endif
-
-                                            @if ($cloneAction->isVisible())
-                                                <li>
-                                                    {{ $cloneAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endif
-
-                                            @if ($deleteAction->isVisible())
-                                                <li>
-                                                    {{ $deleteAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endif
-                                        </ul>
-                                    </td>
-                                @endif
-                            </tr>
-                            @if ($hasNestedSchema)
-                                <tr class="table-repeater-nested-row">
-                                    {{-- Empty cells for the columns before the nested schema --}}
-                                    @if ($emptyColspan > 0)
-                                        <td colspan="{{ $emptyColspan }}"></td>
-                                    @endif
-
-                                    {{-- Nested schema spanning the last 3 columns --}}
-                                    <td colspan="{{ $nestedColspan }}" class="p-4 bg-gray-50 dark:bg-gray-900">
-                                        <div class="nested-schema-wrapper">
-                                            @foreach ($getNestedSchema() as $nestedComponent)
-                                                {{ $nestedComponent }}
-                                            @endforeach
-                                        </div>
-                                    </td>
-                                </tr>
-                            @endif
-                        @endforeach
-                    @else
-                        <tr class="table-repeater-row table-repeater-empty-row">
-                            <td colspan="{{ count($headers) + intval($hasActions) }}"
-                                class="table-repeater-column table-repeater-empty-column p-4 w-px text-center italic">
-                                {{ $emptyLabel ?: trans('table-repeater::components.repeater.empty.label') }}
-                            </td>
-                        </tr>
-                    @endif
-                    </tbody>
-                </table>
-            </div>
-        @endif
-
-        @if ($addAction->isVisible() || filled($visibleExtraActions))
-            <ul
-                @class([
-                    'relative flex gap-4',
-                    match ($getAddActionAlignment()) {
-                        Alignment::Start, Alignment::Left => 'justify-start',
-                        Alignment::End, Alignment::Right => 'justify-end',
-                        default =>  'justify-center',
-                    },
-                ])
-            >
-                @if ($addAction->isVisible())
-                    <li>
-                        {{ $addAction }}
-                    </li>
-                @endif
-                @if (filled($visibleExtraActions))
-                    @foreach ($visibleExtraActions as $extraAction)
-                        <li>
-                            {{ ($extraAction) }}
-                        </li>
-                    @endforeach
-                @endif
-            </ul>
-        @endif
-    </div>
-</x-dynamic-component>