wip

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

@@ -14,6 +14,7 @@ use App\Filament\Company\Resources\Purchases\BillResource\Pages;
 use App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers\BillsRelationManager;
 use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
+use App\Filament\Forms\Components\CreateVendorSelect;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
@@ -60,10 +61,8 @@ class BillResource extends Resource
                     ->schema([
                         Forms\Components\Split::make([
                             Forms\Components\Group::make([
-                                Forms\Components\Select::make('vendor_id')
-                                    ->relationship('vendor', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateVendorSelect::make('vendor_id')
+                                    ->label('Vendor')
                                     ->required()
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

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

@@ -45,7 +45,7 @@ class VendorResource extends Resource
                                     ->default(VendorType::Regular)
                                     ->columnSpanFull(),
                                 CreateCurrencySelect::make('currency_code')
-                                    ->nullable()
+                                    ->softRequired()
                                     ->visible(static fn (Forms\Get $get) => VendorType::parse($get('type')) === VendorType::Regular),
                                 Forms\Components\Select::make('contractor_type')
                                     ->label('Contractor type')

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

@@ -171,8 +171,7 @@ class ClientResource extends Resource
                 Forms\Components\Section::make('Billing')
                     ->schema([
                         CreateCurrencySelect::make('currency_code')
-                            ->required(false)
-                            ->selectablePlaceholder(false),
+                            ->softRequired(),
                         CustomSection::make('Billing Address')
                             ->relationship('billingAddress')
                             ->saveRelationshipsUsing(null)

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

@@ -13,6 +13,7 @@ use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\Estimat
 use App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
 use App\Filament\Forms\Components\CreateAdjustmentSelect;
+use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
@@ -61,10 +62,8 @@ class EstimateResource extends Resource
                     ->schema([
                         Forms\Components\Split::make([
                             Forms\Components\Group::make([
-                                Forms\Components\Select::make('client_id')
-                                    ->relationship('client', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateClientSelect::make('client_id')
+                                    ->label('Client')
                                     ->required()
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

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

@@ -12,6 +12,7 @@ use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\RecurringInvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 use App\Filament\Forms\Components\CreateAdjustmentSelect;
+use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
@@ -53,10 +54,8 @@ class RecurringInvoiceResource extends Resource
                     ->schema([
                         Forms\Components\Split::make([
                             Forms\Components\Group::make([
-                                Forms\Components\Select::make('client_id')
-                                    ->relationship('client', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateClientSelect::make('client_id')
+                                    ->label('Client')
                                     ->required()
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

app/Filament/Forms/Components/CreateClientSelect.php

@@ -2,10 +2,9 @@
 
 namespace App\Filament\Forms\Components;
 
+use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
-use App\Models\Common\Address;
 use App\Models\Common\Client;
-use App\Models\Common\Contact;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
@@ -28,39 +27,86 @@ class CreateClientSelect extends Select
 
         $this->createOptionUsing(static function (array $data) {
             return DB::transaction(static function () use ($data) {
+                /** @var Client $client */
                 $client = Client::create([
                     'name' => $data['name'],
                     'website' => $data['website'] ?? null,
                     'notes' => $data['notes'] ?? null,
                 ]);
 
-                // Create primary contact
-                $primaryContact = $client->contacts()->create([
-                    'first_name' => $data['primary_contact']['first_name'],
-                    'last_name' => $data['primary_contact']['last_name'],
-                    'email' => $data['primary_contact']['email'],
-                    'is_primary' => true,
-                ]);
+                if (isset($data['primaryContact'], $data['primaryContact']['first_name'])) {
+                    $client->primaryContact()->create([
+                        'is_primary' => true,
+                        'first_name' => $data['primaryContact']['first_name'],
+                        'last_name' => $data['primaryContact']['last_name'],
+                        'email' => $data['primaryContact']['email'],
+                        'phones' => $data['primaryContact']['phones'] ?? [],
+                    ]);
+                }
 
-                // Add phone number
-                $primaryContact->phones()->create([
-                    'type' => 'primary',
-                    'number' => $data['primary_contact']['phones'][0]['number'],
-                ]);
+                if (isset($data['secondaryContacts'])) {
+                    foreach ($data['secondaryContacts'] as $contactData) {
+                        if (isset($contactData['first_name'])) {
+                            $client->secondaryContacts()->create([
+                                'is_primary' => false,
+                                'first_name' => $contactData['first_name'],
+                                'last_name' => $contactData['last_name'],
+                                'email' => $contactData['email'],
+                                'phones' => $contactData['phones'] ?? [],
+                            ]);
+                        }
+                    }
+                }
 
-                // Create billing address
-                $client->addresses()->create([
-                    'type' => 'billing',
-                    ...$data['billing_address'],
-                ]);
+                if (isset($data['billingAddress'], $data['billingAddress']['address_line_1'])) {
+                    $client->billingAddress()->create([
+                        'type' => AddressType::Billing,
+                        'address_line_1' => $data['billingAddress']['address_line_1'],
+                        'address_line_2' => $data['billingAddress']['address_line_2'] ?? null,
+                        'country_code' => $data['billingAddress']['country_code'] ?? null,
+                        'state_id' => $data['billingAddress']['state_id'] ?? null,
+                        'city' => $data['billingAddress']['city'] ?? null,
+                        'postal_code' => $data['billingAddress']['postal_code'] ?? null,
+                    ]);
+                }
 
-                // Create shipping address
-                $client->addresses()->create([
-                    'type' => 'shipping',
-                    'recipient' => $data['shipping_address']['recipient'],
-                    'phone' => $data['shipping_address']['phone'],
-                    ...$data['shipping_address'],
-                ]);
+                if (isset($data['shippingAddress'])) {
+                    $shippingData = $data['shippingAddress'];
+                    $shippingAddress = [
+                        'type' => AddressType::Shipping,
+                        'recipient' => $shippingData['recipient'] ?? null,
+                        'phone' => $shippingData['phone'] ?? null,
+                        'notes' => $shippingData['notes'] ?? null,
+                    ];
+
+                    if ($shippingData['same_as_billing'] ?? false) {
+                        $billingAddress = $client->billingAddress;
+                        if ($billingAddress) {
+                            $shippingAddress = [
+                                ...$shippingAddress,
+                                'parent_address_id' => $billingAddress->id,
+                                'address_line_1' => $billingAddress->address_line_1,
+                                'address_line_2' => $billingAddress->address_line_2,
+                                'country_code' => $billingAddress->country_code,
+                                'state_id' => $billingAddress->state_id,
+                                'city' => $billingAddress->city,
+                                'postal_code' => $billingAddress->postal_code,
+                            ];
+                            $client->shippingAddress()->create($shippingAddress);
+                        }
+                    } elseif (isset($shippingData['address_line_1'])) {
+                        $shippingAddress = [
+                            ...$shippingAddress,
+                            'address_line_1' => $shippingData['address_line_1'],
+                            'address_line_2' => $shippingData['address_line_2'] ?? null,
+                            'country_code' => $shippingData['country_code'] ?? null,
+                            'state_id' => $shippingData['state_id'] ?? null,
+                            'city' => $shippingData['city'] ?? null,
+                            'postal_code' => $shippingData['postal_code'] ?? null,
+                        ];
+                        $client->shippingAddress()->create($shippingAddress);
+                    }
+                }
 
                 return $client->getKey();
             });

app/Filament/Forms/Components/CreateVendorSelect.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Models\Common\Vendor;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Form;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\Facades\DB;
+
+class CreateVendorSelect extends Select
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->searchable()
+            ->preload()
+            ->createOptionForm(fn (Form $form) => $this->createVendorForm($form))
+            ->createOptionAction(fn (Action $action) => $this->createVendorAction($action));
+
+        $this->relationship('vendor', 'name');
+
+        $this->createOptionUsing(static function (array $data) {
+            return DB::transaction(static function () use ($data) {
+                /** @var Vendor $vendor */
+                $vendor = Vendor::create([
+                    'name' => $data['name'],
+                    'type' => $data['type'],
+                    'currency_code' => $data['currency_code'] ?? null,
+                    'contractor_type' => $data['contractor_type'] ?? null,
+                    'ssn' => $data['ssn'] ?? null,
+                    'ein' => $data['ein'] ?? null,
+                    'account_number' => $data['account_number'] ?? null,
+                    'website' => $data['website'] ?? null,
+                    'notes' => $data['notes'] ?? null,
+                ]);
+
+                if (isset($data['contact'], $data['contact']['first_name'])) {
+                    $vendor->contact()->create([
+                        'is_primary' => true,
+                        'first_name' => $data['contact']['first_name'],
+                        'last_name' => $data['contact']['last_name'],
+                        'email' => $data['contact']['email'],
+                        'phones' => $data['contact']['phones'] ?? [],
+                    ]);
+                }
+
+                if (isset($data['address'], $data['address']['type'], $data['address']['address_line_1'])) {
+                    $vendor->address()->create([
+                        'type' => $data['address']['type'],
+                        'address_line_1' => $data['address']['address_line_1'],
+                        'address_line_2' => $data['address']['address_line_2'] ?? null,
+                        'country_code' => $data['address']['country_code'] ?? null,
+                        'state_id' => $data['address']['state_id'] ?? null,
+                        'city' => $data['address']['city'] ?? null,
+                        'postal_code' => $data['address']['postal_code'] ?? null,
+                    ]);
+                }
+
+                return $vendor->getKey();
+            });
+        });
+    }
+
+    protected function createVendorForm(Form $form): Form
+    {
+        return VendorResource::form($form);
+    }
+
+    protected function createVendorAction(Action $action): Action
+    {
+        return $action
+            ->label('Add vendor')
+            ->slideOver()
+            ->modalWidth(MaxWidth::ThreeExtraLarge);
+    }
+}