wip

app/Enums/Common/AddressType.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Enums\Common;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum AddressType: string implements HasLabel
+{
+    case General = 'general';
+    case Billing = 'billing';
+    case Shipping = 'shipping';
+
+    public function getLabel(): string
+    {
+        return $this->name;
+    }
+}

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

@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Filament\Company\Resources\Common;
+
+use App\Filament\Company\Resources\Common\ClientResource\Pages;
+use App\Filament\Forms\Components\CreateCurrencySelect;
+use App\Models\Common\Client;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class ClientResource extends Resource
+{
+    protected static ?string $model = Client::class;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('General Information')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->label('Client')
+                            ->required()
+                            ->maxLength(255),
+                        CreateCurrencySelect::make('currency_code')
+                            ->disabledOn('edit')
+                            ->relationship('currency', 'name'),
+                        Forms\Components\TextInput::make('account_number')
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('website')
+                            ->maxLength(255),
+                        Forms\Components\Textarea::make('notes')
+                            ->columnSpanFull(),
+                    ])->columns(),
+                Forms\Components\Section::make('Billing')
+                    ->relationship('billingAddress')
+                    ->schema([
+                        Forms\Components\TextInput::make('address_line_1')
+                            ->label('Address Line 1')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('address_line_2')
+                            ->label('Address Line 2')
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('city')
+                            ->label('City')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('state')
+                            ->label('State')
+                            ->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(),
+                Forms\Components\Section::make('Shipping')
+                    ->relationship('shippingAddress')
+                    ->schema([
+                        Forms\Components\TextInput::make('recipient')
+                            ->label('Recipient')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('address_line_1')
+                            ->label('Address Line 1')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('address_line_2')
+                            ->label('Address Line 2')
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('city')
+                            ->label('City')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('state')
+                            ->label('State')
+                            ->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),
+                        Forms\Components\TextInput::make('phone')
+                            ->label('Phone')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\Textarea::make('notes')
+                            ->label('Delivery Instructions')
+                            ->maxLength(255),
+                    ])->columns(),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('company.name')
+                    ->numeric()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('name')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('currency_code')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('account_number')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('website')
+                    ->searchable(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListClients::route('/'),
+            'create' => Pages\CreateClient::route('/create'),
+            'edit' => Pages\EditClient::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Company/Resources/Common/ClientResource/Pages/CreateClient.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Company\Resources\Common\ClientResource\Pages;
+
+use App\Filament\Company\Resources\Common\ClientResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateClient extends CreateRecord
+{
+    protected static string $resource = ClientResource::class;
+}

app/Filament/Company/Resources/Common/ClientResource/Pages/EditClient.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Company\Resources\Common\ClientResource\Pages;
+
+use App\Filament\Company\Resources\Common\ClientResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditClient extends EditRecord
+{
+    protected static string $resource = ClientResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+}

app/Filament/Company/Resources/Common/ClientResource/Pages/ListClients.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Company\Resources\Common\ClientResource\Pages;
+
+use App\Filament\Company\Resources\Common\ClientResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListClients extends ListRecords
+{
+    protected static string $resource = ClientResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Company/Resources/Common/OfferingResource.php

@@ -46,7 +46,7 @@ class OfferingResource extends Resource
                             ->maxLength(255),
                         Forms\Components\TextInput::make('price')
                             ->required()
-                            ->money(CurrencyAccessor::getDefaultCurrency()),
+                            ->money(),
                         Forms\Components\Textarea::make('description')
                             ->label('Description')
                             ->columnSpan(2)
@@ -59,7 +59,6 @@ class OfferingResource extends Resource
                             ->hiddenLabel()
                             ->required()
                             ->live()
-                            ->columnSpan(2)
                             ->bulkToggleable()
                             ->validationMessages([
                                 'required' => 'The offering must be either sellable or purchasable.',
@@ -77,7 +76,7 @@ class OfferingResource extends Resource
                                 ->toArray())
                             ->searchable()
                             ->preload()
-                            ->required(fn (Forms\Get $get) => in_array('Sellable', $get('attributes') ?? []))
+                            ->required()
                             ->validationMessages([
                                 'required' => 'The income account is required for sellable offerings.',
                             ]),
@@ -108,7 +107,7 @@ class OfferingResource extends Resource
                                 ->toArray())
                             ->searchable()
                             ->preload()
-                            ->required(fn (Forms\Get $get) => in_array('Purchasable', $get('attributes') ?? []))
+                            ->required()
                             ->validationMessages([
                                 'required' => 'The expense account is required for purchasable offerings.',
                             ]),
@@ -162,7 +161,7 @@ class OfferingResource extends Resource
 
                         $adjustmentsList = Str::of($adjustments)->limit(40);
 
-                        return "+ $adjustmentsList";
+                        return "+ {$adjustmentsList}";
                     }),
             ])
             ->filters([

app/Models/Common/Address.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models\Common;
+
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Common\AddressType;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+class Address extends Model
+{
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
+    protected $table = 'addresses';
+
+    protected $fillable = [
+        'company_id',
+        'type',
+        'recipient',
+        'phone',
+        'address_line_1',
+        'address_line_2',
+        'city',
+        'state',
+        'postal_code',
+        'country',
+        'notes',
+        'created_by',
+        'updated_by',
+    ];
+
+    protected $casts = [
+        'type' => AddressType::class,
+    ];
+
+    public function addressable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+}

app/Models/Common/Client.php

@@ -2,11 +2,59 @@
 
 namespace App\Models\Common;
 
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Common\AddressType;
+use App\Models\Setting\Currency;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 class Client extends Model
 {
-    /** @use HasFactory<\Database\Factories\Common\ClientFactory> */
+    use Blamable;
+    use CompanyOwned;
     use HasFactory;
+
+    protected $table = 'clients';
+
+    protected $fillable = [
+        'company_id',
+        'name',
+        'currency_code',
+        'account_number',
+        'website',
+        'notes',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function contacts(): MorphMany
+    {
+        return $this->morphMany(Contact::class, 'contactable');
+    }
+
+    public function currency(): BelongsTo
+    {
+        return $this->belongsTo(Currency::class, 'currency_code', 'code');
+    }
+
+    public function addresses(): MorphMany
+    {
+        return $this->morphMany(Address::class, 'addressable');
+    }
+
+    public function billingAddress(): MorphOne
+    {
+        return $this->morphOne(Address::class, 'addressable')
+            ->where('type', AddressType::Billing);
+    }
+
+    public function shippingAddress(): MorphOne
+    {
+        return $this->morphOne(Address::class, 'addressable')
+            ->where('type', AddressType::Shipping);
+    }
 }

app/Models/Common/Contact.php

@@ -5,14 +5,11 @@ namespace App\Models\Common;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Common\ContactType;
-use App\Models\Setting\Currency;
 use Database\Factories\Common\ContactFactory;
 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\HasOne;
-use Wallo\FilamentCompanies\FilamentCompanies;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Contact extends Model
 {
@@ -25,21 +22,11 @@ class Contact extends Model
     protected $fillable = [
         'company_id',
         'type',
-        'name',
+        'first_name',
+        'last_name',
         'email',
-        'address',
-        'city_id',
-        'zip_code',
-        'state_id',
-        'country',
-        'timezone',
-        'language',
-        'contact_method',
-        'phone_number',
-        'tax_id',
-        'currency_code',
-        'website',
-        'reference',
+        'phones',
+        'is_primary',
         'created_by',
         'updated_by',
     ];
@@ -48,14 +35,9 @@ class Contact extends Model
         'type' => ContactType::class,
     ];
 
-    public function currency(): BelongsTo
+    public function contactable(): MorphTo
     {
-        return $this->belongsTo(Currency::class, 'currency_code');
-    }
-
-    public function employeeship(): HasOne
-    {
-        return $this->hasOne(FilamentCompanies::employeeshipModel(), 'contact_id');
+        return $this->morphTo();
     }
 
     protected static function newFactory(): Factory

app/Models/Common/Vendor.php

@@ -2,11 +2,48 @@
 
 namespace App\Models\Common;
 
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Models\Setting\Currency;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 class Vendor extends Model
 {
-    /** @use HasFactory<\Database\Factories\Common\VendorFactory> */
+    use Blamable;
+    use CompanyOwned;
     use HasFactory;
+
+    protected $table = 'vendors';
+
+    protected $fillable = [
+        'company_id',
+        'name',
+        'type',
+        'contractor_type',
+        'ssn',
+        'currency_code',
+        'account_number',
+        'website',
+        'notes',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function currency(): BelongsTo
+    {
+        return $this->belongsTo(Currency::class, 'currency_code', 'code');
+    }
+
+    public function address(): MorphOne
+    {
+        return $this->morphOne(Address::class, 'addressable');
+    }
+
+    public function contact(): MorphOne
+    {
+        return $this->morphOne(Contact::class, 'contactable');
+    }
 }

app/Providers/FilamentCompaniesServiceProvider.php

@@ -26,9 +26,9 @@ use App\Filament\Company\Pages\Reports;
 use App\Filament\Company\Pages\Service\ConnectedAccount;
 use App\Filament\Company\Pages\Service\LiveCurrency;
 use App\Filament\Company\Resources\Banking\AccountResource;
+use App\Filament\Company\Resources\Common\ClientResource;
 use App\Filament\Company\Resources\Common\OfferingResource;
 use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
-use App\Filament\Company\Resources\Sales\SellableOfferingResource;
 use App\Filament\Components\PanelShiftDropdown;
 use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\ConfigureCurrentCompany;
@@ -127,7 +127,7 @@ class FilamentCompaniesServiceProvider extends PanelProvider
                         NavigationGroup::make('Sales & Payments')
                             ->label('Sales & Payments')
                             ->icon('heroicon-o-currency-dollar')
-                            ->items(SellableOfferingResource::getNavigationItems()),
+                            ->items(ClientResource::getNavigationItems()),
                         NavigationGroup::make('Purchases')
                             ->label('Purchases')
                             ->icon('heroicon-o-shopping-cart')

app/Providers/MacroServiceProvider.php

@@ -35,6 +35,8 @@ class MacroServiceProvider extends ServiceProvider
     public function boot(): void
     {
         TextInput::macro('money', function (string | Closure | null $currency = null): static {
+            $currency ??= CurrencyAccessor::getDefaultCurrency();
+
             $this->extraAttributes(['wire:key' => Str::random()])
                 ->prefix(static function (TextInput $component) use ($currency) {
                     $currency = $component->evaluate($currency);

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.328.1",
+            "version": "3.328.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "52d8219935146c3261181de2da4d36bf04c76298"
+                "reference": "63a6366a8011dffec3d1ef838c97ca6b6ddb17a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/52d8219935146c3261181de2da4d36bf04c76298",
-                "reference": "52d8219935146c3261181de2da4d36bf04c76298",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/63a6366a8011dffec3d1ef838c97ca6b6ddb17a2",
+                "reference": "63a6366a8011dffec3d1ef838c97ca6b6ddb17a2",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.328.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.328.2"
             },
-            "time": "2024-11-18T19:13:28+00:00"
+            "time": "2024-11-19T20:28:51+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2982,16 +2982,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.32.0",
+            "version": "v11.33.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927"
+                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/bc2aad63f83ee5089be7b21cf29d645ccf31e927",
-                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6b9832751cf8eed18b3c73df5071f78f0682aa5d",
+                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d",
                 "shasum": ""
             },
             "require": {
@@ -3011,7 +3011,7 @@
                 "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
                 "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
-                "laravel/serializable-closure": "^1.3",
+                "laravel/serializable-closure": "^1.3|^2.0",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
                 "monolog/monolog": "^3.0",
@@ -3094,9 +3094,9 @@
                 "league/flysystem-path-prefixing": "^3.3",
                 "league/flysystem-read-only": "^3.3",
                 "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.6",
+                "mockery/mockery": "^1.6.10",
                 "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^9.5",
+                "orchestra/testbench-core": "^9.6",
                 "pda/pheanstalk": "^5.0",
                 "phpstan/phpstan": "^1.11.5",
                 "phpunit/phpunit": "^10.5|^11.0",
@@ -3187,7 +3187,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-15T17:04:33+00:00"
+            "time": "2024-11-19T22:47:13+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3250,16 +3250,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.3",
+            "version": "v4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab"
+                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/54aea9d13743ae8a6cdd3c28dbef128a17adecab",
-                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/819782c75aaf2b08da1765503893bd2b8023d3b3",
+                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3",
                 "shasum": ""
             },
             "require": {
@@ -3310,36 +3310,36 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-09-27T14:55:41+00:00"
+            "time": "2024-11-15T14:47:23+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.6",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
+                "reference": "0d8d3d8086984996df86596a86dea60398093a81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81",
+                "reference": "0d8d3d8086984996df86596a86dea60398093a81",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "nesbot/carbon": "^2.61|^3.0",
-                "pestphp/pest": "^1.21.3",
-                "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
+                "illuminate/support": "^10.0|^11.0",
+                "nesbot/carbon": "^2.67|^3.0",
+                "pestphp/pest": "^2.36",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^6.2.0|^7.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -3371,7 +3371,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-11-11T17:06:04+00:00"
+            "time": "2024-11-19T01:38:44+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -10507,134 +10507,6 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "php-di/invoker",
-            "version": "2.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-DI/Invoker.git",
-                "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86",
-                "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "psr/container": "^1.0|^2.0"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "mnapoli/hard-mode": "~0.3.0",
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Invoker\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Generic and extensible callable invoker",
-            "homepage": "https://github.com/PHP-DI/Invoker",
-            "keywords": [
-                "callable",
-                "dependency",
-                "dependency-injection",
-                "injection",
-                "invoke",
-                "invoker"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-DI/Invoker/issues",
-                "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-09-08T09:24:21+00:00"
-        },
-        {
-            "name": "php-di/php-di",
-            "version": "7.0.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-DI/PHP-DI.git",
-                "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/e87435e3c0e8f22977adc5af0d5cdcc467e15cf1",
-                "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1",
-                "shasum": ""
-            },
-            "require": {
-                "laravel/serializable-closure": "^1.0",
-                "php": ">=8.0",
-                "php-di/invoker": "^2.0",
-                "psr/container": "^1.1 || ^2.0"
-            },
-            "provide": {
-                "psr/container-implementation": "^1.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3",
-                "friendsofphp/proxy-manager-lts": "^1",
-                "mnapoli/phpunit-easymock": "^1.3",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^4.6"
-            },
-            "suggest": {
-                "friendsofphp/proxy-manager-lts": "Install it if you want to use lazy injection (version ^1)"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "DI\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "The dependency injection container for humans",
-            "homepage": "https://php-di.org/",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interop",
-                "dependency injection",
-                "di",
-                "ioc",
-                "psr11"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-DI/PHP-DI/issues",
-                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.7"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/php-di/php-di",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-07-21T15:55:45+00:00"
-        },
         {
             "name": "phpdocumentor/reflection-common",
             "version": "2.2.0",
@@ -11338,6 +11210,59 @@
             ],
             "time": "2024-10-28T13:07:50+00:00"
         },
+        {
+            "name": "pimple/pimple",
+            "version": "v3.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
+                "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "psr/container": "^1.1 || ^2.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^5.4@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Pimple, a simple Dependency Injection Container",
+            "homepage": "https://pimple.symfony.com",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "support": {
+                "source": "https://github.com/silexphp/Pimple/tree/v3.5.0"
+            },
+            "time": "2021-10-28T11:13:42+00:00"
+        },
         {
             "name": "rector/rector",
             "version": "1.2.10",
@@ -13246,31 +13171,30 @@
         },
         {
             "name": "zbateson/mail-mime-parser",
-            "version": "3.0.3",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zbateson/mail-mime-parser.git",
-                "reference": "e0d4423fe27850c9dd301190767dbc421acc2f19"
+                "reference": "ff49e02f6489b38f7cc3d1bd3971adc0f872569c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zbateson/mail-mime-parser/zipball/e0d4423fe27850c9dd301190767dbc421acc2f19",
-                "reference": "e0d4423fe27850c9dd301190767dbc421acc2f19",
+                "url": "https://api.github.com/repos/zbateson/mail-mime-parser/zipball/ff49e02f6489b38f7cc3d1bd3971adc0f872569c",
+                "reference": "ff49e02f6489b38f7cc3d1bd3971adc0f872569c",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/psr7": "^2.5",
-                "php": ">=8.0",
-                "php-di/php-di": "^6.0|^7.0",
-                "psr/log": "^1|^2|^3",
-                "zbateson/mb-wrapper": "^2.0",
-                "zbateson/stream-decorators": "^2.1"
+                "guzzlehttp/psr7": "^1.7.0|^2.0",
+                "php": ">=7.1",
+                "pimple/pimple": "^3.0",
+                "zbateson/mb-wrapper": "^1.0.1",
+                "zbateson/stream-decorators": "^1.0.6"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "*",
-                "monolog/monolog": "^2|^3",
+                "mikey179/vfsstream": "^1.6.0",
                 "phpstan/phpstan": "*",
-                "phpunit/phpunit": "^9.6"
+                "phpunit/phpunit": "<10"
             },
             "suggest": {
                 "ext-iconv": "For best support/performance",
@@ -13318,24 +13242,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-10T18:44:09+00:00"
+            "time": "2024-04-28T00:58:54+00:00"
         },
         {
             "name": "zbateson/mb-wrapper",
-            "version": "2.0.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zbateson/mb-wrapper.git",
-                "reference": "9e4373a153585d12b6c621ac4a6bb143264d4619"
+                "reference": "09a8b77eb94af3823a9a6623dcc94f8d988da67f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/9e4373a153585d12b6c621ac4a6bb143264d4619",
-                "reference": "9e4373a153585d12b6c621ac4a6bb143264d4619",
+                "url": "https://api.github.com/repos/zbateson/mb-wrapper/zipball/09a8b77eb94af3823a9a6623dcc94f8d988da67f",
+                "reference": "09a8b77eb94af3823a9a6623dcc94f8d988da67f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0",
+                "php": ">=7.1",
                 "symfony/polyfill-iconv": "^1.9",
                 "symfony/polyfill-mbstring": "^1.9"
             },
@@ -13379,7 +13303,7 @@
             ],
             "support": {
                 "issues": "https://github.com/zbateson/mb-wrapper/issues",
-                "source": "https://github.com/zbateson/mb-wrapper/tree/2.0.0"
+                "source": "https://github.com/zbateson/mb-wrapper/tree/1.2.1"
             },
             "funding": [
                 {
@@ -13387,31 +13311,31 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-20T01:38:07+00:00"
+            "time": "2024-03-18T04:31:04+00:00"
         },
         {
             "name": "zbateson/stream-decorators",
-            "version": "2.1.1",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zbateson/stream-decorators.git",
-                "reference": "32a2a62fb0f26313395c996ebd658d33c3f9c4e5"
+                "reference": "783b034024fda8eafa19675fb2552f8654d3a3e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/32a2a62fb0f26313395c996ebd658d33c3f9c4e5",
-                "reference": "32a2a62fb0f26313395c996ebd658d33c3f9c4e5",
+                "url": "https://api.github.com/repos/zbateson/stream-decorators/zipball/783b034024fda8eafa19675fb2552f8654d3a3e9",
+                "reference": "783b034024fda8eafa19675fb2552f8654d3a3e9",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/psr7": "^2.5",
-                "php": ">=8.0",
-                "zbateson/mb-wrapper": "^2.0"
+                "guzzlehttp/psr7": "^1.9 | ^2.0",
+                "php": ">=7.2",
+                "zbateson/mb-wrapper": "^1.0.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "*",
                 "phpstan/phpstan": "*",
-                "phpunit/phpunit": "^9.6|^10.0"
+                "phpunit/phpunit": "<10.0"
             },
             "type": "library",
             "autoload": {
@@ -13442,7 +13366,7 @@
             ],
             "support": {
                 "issues": "https://github.com/zbateson/stream-decorators/issues",
-                "source": "https://github.com/zbateson/stream-decorators/tree/2.1.1"
+                "source": "https://github.com/zbateson/stream-decorators/tree/1.2.1"
             },
             "funding": [
                 {
@@ -13450,7 +13374,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-29T21:42:39+00:00"
+            "time": "2023-05-30T22:51:52+00:00"
         }
     ],
     "aliases": [],

database/factories/Common/AddressFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Database\Factories\Common;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Common\Address>
+ */
+class AddressFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

database/migrations/2023_09_19_050544_create_contacts_table.php

@@ -15,32 +15,15 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->string('type')->nullable();
-            $table->string('name');
-            $table->string('email');
-            $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('timezone')->nullable();
-            $table->string('language')->nullable();
-            $table->string('contact_method')->nullable();
-            $table->string('phone_number', 30)->nullable();
-            $table->string('tax_id', 50)->nullable();
-            $table->string('currency_code', 10);
-            $table->string('website', 255)->nullable();
-            $table->string('reference', 255)->nullable();
+            $table->string('first_name');
+            $table->string('last_name')->nullable();
+            $table->string('email')->nullable();
+            $table->json('phones')->nullable();
+            $table->boolean('is_primary')->default(false);
+            $table->morphs('contactable');
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
-
-            $table->index(['company_id', 'type']);
-            $table->unique(['company_id', 'type', 'email']);
-
-            $table->foreign(['company_id', 'currency_code'])
-                ->references(['company_id', 'code'])
-                ->on('currencies')
-                ->restrictOnDelete();
         });
     }
 

database/migrations/2024_11_13_214358_create_clients_table.php

@@ -13,6 +13,14 @@ return new class extends Migration
     {
         Schema::create('clients', function (Blueprint $table) {
             $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->string('name');
+            $table->string('currency_code')->nullable();
+            $table->string('account_number')->nullable();
+            $table->string('website')->nullable();
+            $table->text('notes')->nullable();
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
         });
     }

database/migrations/2024_11_13_214406_create_vendors_table.php

@@ -13,6 +13,17 @@ return new class extends Migration
     {
         Schema::create('vendors', function (Blueprint $table) {
             $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->string('name');
+            $table->string('type');
+            $table->string('contractor_type')->nullable();
+            $table->string('ssn')->nullable();
+            $table->string('currency_code')->nullable();
+            $table->string('account_number')->nullable();
+            $table->string('website')->nullable();
+            $table->text('notes')->nullable();
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
         });
     }

database/migrations/2024_11_19_225812_create_addresses_table.php

@@ -0,0 +1,41 @@
+<?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('addresses', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->morphs('addressable');
+            $table->string('type'); // billing, shipping, etc.
+            $table->string('recipient')->nullable();
+            $table->string('phone')->nullable();
+            $table->string('address_line_1');
+            $table->string('address_line_2')->nullable();
+            $table->string('city');
+            $table->string('state')->nullable();
+            $table->string('postal_code')->nullable();
+            $table->string('country')->nullable();
+            $table->text('notes')->nullable();
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('addresses');
+    }
+};

package-lock.json

@@ -2765,9 +2765,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
-            "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
             "dev": true,
             "license": "ISC",
             "bin": {

resources/data/lang/en.json

@@ -199,5 +199,8 @@
     "Sellable Configuration": "Sellable Configuration",
     "Purchasable Configuration": "Purchasable Configuration",
     "Sale Information": "Sale Information",
-    "Purchase Information": "Purchase Information"
+    "Purchase Information": "Purchase Information",
+    "Billing": "Billing",
+    "Shipping": "Shipping",
+    "General Information": "General Information"
 }