wip

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

@@ -17,32 +17,7 @@ class CreateVendor extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        /** @var Vendor $vendor */
-        $vendor = parent::handleRecordCreation($data);
-
-        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;
+        return Vendor::createWithRelations($data);
     }
 
     public function getMaxContentWidth(): MaxWidth | string | null

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

@@ -18,36 +18,10 @@ class EditVendor extends EditRecord
 
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
-        /** @var Vendor $vendor */
-        $vendor = parent::handleRecordUpdate($record, $data);
+        /** @var Vendor $record */
+        $record->updateWithRelations($data);
 
-        if (isset($data['contact'], $data['contact']['first_name'])) {
-            $vendor->contact()->updateOrCreate(
-                ['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()->updateOrCreate(
-                ['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;
+        return $record;
     }
 
     protected function getHeaderActions(): array

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

@@ -3,7 +3,6 @@
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
 use App\Concerns\HandlePageRedirect;
-use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Resources\Pages\CreateRecord;
@@ -23,83 +22,6 @@ class CreateClient extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        /** @var Client $record */
-        $record = parent::handleRecordCreation($data);
-
-        if (isset($data['primaryContact'], $data['primaryContact']['first_name'])) {
-            $record->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'] ?? [],
-            ]);
-        }
-
-        if (isset($data['secondaryContacts'])) {
-            foreach ($data['secondaryContacts'] as $contactData) {
-                if (isset($contactData['first_name'])) {
-                    $record->secondaryContacts()->create([
-                        'is_primary' => false,
-                        'first_name' => $contactData['first_name'],
-                        'last_name' => $contactData['last_name'],
-                        'email' => $contactData['email'],
-                        'phones' => $contactData['phones'] ?? [],
-                    ]);
-                }
-            }
-        }
-
-        if (isset($data['billingAddress'], $data['billingAddress']['address_line_1'])) {
-            $record->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,
-            ]);
-        }
-
-        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 = $record->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,
-                    ];
-                    $record->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,
-                ];
-                $record->shippingAddress()->create($shippingAddress);
-            }
-        }
-
-        return $record;
+        return Client::createWithRelations($data);
     }
 }

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

@@ -3,7 +3,6 @@
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
 use App\Concerns\HandlePageRedirect;
-use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Actions;
@@ -32,97 +31,7 @@ class EditClient extends EditRecord
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Client $record */
-        $record = parent::handleRecordUpdate($record, $data);
-
-        if (isset($data['primaryContact'], $data['primaryContact']['first_name'])) {
-            $record->primaryContact()->updateOrCreate(
-                ['is_primary' => true],
-                [
-                    'first_name' => $data['primaryContact']['first_name'],
-                    'last_name' => $data['primaryContact']['last_name'],
-                    'email' => $data['primaryContact']['email'],
-                    'phones' => $data['primaryContact']['phones'] ?? [],
-                ]
-            );
-        }
-
-        if (isset($data['secondaryContacts'])) {
-            // Delete removed contacts
-            $existingIds = collect($data['secondaryContacts'])->pluck('id')->filter()->all();
-            $record->secondaryContacts()->whereNotIn('id', $existingIds)->delete();
-
-            // Update or create contacts
-            foreach ($data['secondaryContacts'] as $contactData) {
-                if (isset($contactData['first_name'])) {
-                    $record->secondaryContacts()->updateOrCreate(
-                        ['id' => $contactData['id'] ?? null],
-                        [
-                            'is_primary' => false,
-                            'first_name' => $contactData['first_name'],
-                            'last_name' => $contactData['last_name'],
-                            'email' => $contactData['email'],
-                            'phones' => $contactData['phones'] ?? [],
-                        ]
-                    );
-                }
-            }
-        }
-
-        if (isset($data['billingAddress'], $data['billingAddress']['address_line_1'])) {
-            $record->billingAddress()->updateOrCreate(
-                ['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,
-                ]
-            );
-        }
-
-        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 = $record->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,
-                    ];
-                }
-            } elseif (isset($shippingData['address_line_1'])) {
-                $shippingAddress = [
-                    ...$shippingAddress,
-                    'parent_address_id' => null,
-                    '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,
-                ];
-            }
-
-            $record->shippingAddress()->updateOrCreate(
-                ['type' => AddressType::Shipping],
-                $shippingAddress
-            );
-        }
+        $record->updateWithRelations($data);
 
         return $record;
     }

app/Filament/Forms/Components/CreateAdjustmentSelect.php

@@ -211,12 +211,12 @@ class CreateAdjustmentSelect extends Select
     {
         $categoryLabel = $this->getCategory()?->getLabel() ?? 'Adjustment';
         $typeLabel = $this->getType()?->getLabel() ?? '';
-        $label = trim($typeLabel . ' ' . $categoryLabel);
+        $label = strtolower(trim($typeLabel . ' ' . $categoryLabel));
 
         return $action
             ->label('Create ' . $label)
             ->slideOver()
             ->modalWidth(MaxWidth::ExtraLarge)
-            ->modalHeading('Create a new ' . strtolower($label));
+            ->modalHeading('Create a new ' . $label);
     }
 }

app/Filament/Forms/Components/CreateClientSelect.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Forms\Components;
 
-use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Models\Common\Client;
 use Filament\Forms\Components\Actions\Action;
@@ -27,86 +26,7 @@ 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,
-                ]);
-
-                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'] ?? [],
-                    ]);
-                }
-
-                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'] ?? [],
-                            ]);
-                        }
-                    }
-                }
-
-                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,
-                    ]);
-                }
-
-                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);
-                    }
-                }
+                $client = Client::createWithRelations($data);
 
                 return $client->getKey();
             });
@@ -121,8 +41,9 @@ class CreateClientSelect extends Select
     protected function createClientAction(Action $action): Action
     {
         return $action
-            ->label('Add client')
+            ->label('Create client')
             ->slideOver()
-            ->modalWidth(MaxWidth::ThreeExtraLarge);
+            ->modalWidth(MaxWidth::ThreeExtraLarge)
+            ->modalHeading('Create a new client');
     }
 }

app/Filament/Forms/Components/CreateCurrencySelect.php

@@ -63,8 +63,9 @@ class CreateCurrencySelect extends Select
     protected function createCurrencyAction(Action $action): Action
     {
         return $action
-            ->label('Add currency')
+            ->label('Create currency')
             ->slideOver()
-            ->modalWidth(MaxWidth::Medium);
+            ->modalWidth(MaxWidth::Medium)
+            ->modalHeading('Create a new currency');
     }
 }

app/Filament/Forms/Components/CreateOfferingSelect.php

@@ -43,15 +43,16 @@ class CreateOfferingSelect extends Select
             ->createOptionAction(fn (Action $action) => $this->createOfferingAction($action));
 
         $this->relationship(
-            $this->isPurchasable() && ! $this->isSellable() ? 'purchasableOffering' :
-            ($this->isSellable() && ! $this->isPurchasable() ? 'sellableOffering' : 'offering'),
-            'name'
+            name: fn () => $this->isPurchasable() && ! $this->isSellable() ? 'purchasableOffering' : ($this->isSellable() && ! $this->isPurchasable() ? 'sellableOffering' : 'offering'),
+            titleAttribute: 'name'
         );
 
-        $this->createOptionUsing(function (array $data) {
+        $this->createOptionUsing(function (array $data, Form $form) {
             if ($this->isSellableAndPurchasable()) {
-                $data['sellable'] = isset($data['attributes']) && in_array('Sellable', $data['attributes'], true);
-                $data['purchasable'] = isset($data['attributes']) && in_array('Purchasable', $data['attributes'], true);
+                $attributes = array_flip($data['attributes'] ?? []);
+
+                $data['sellable'] = isset($attributes['Sellable']);
+                $data['purchasable'] = isset($attributes['Purchasable']);
             } else {
                 $data['sellable'] = $this->isSellable;
                 $data['purchasable'] = $this->isPurchasable;
@@ -61,6 +62,8 @@ class CreateOfferingSelect extends Select
 
             $offering = Offering::create($data);
 
+            $form->model($offering)->saveRelationships();
+
             return $offering->getKey();
         });
     }
@@ -85,9 +88,10 @@ class CreateOfferingSelect extends Select
     protected function createOfferingAction(Action $action): Action
     {
         return $action
-            ->label('Add offering')
+            ->label('Create offering')
             ->slideOver()
-            ->modalWidth(MaxWidth::ThreeExtraLarge);
+            ->modalWidth(MaxWidth::ThreeExtraLarge)
+            ->modalHeading('Create a new offering');
     }
 
     public function isSellable(): bool

app/Filament/Forms/Components/CreateVendorSelect.php

@@ -26,40 +26,7 @@ class CreateVendorSelect extends Select
 
         $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,
-                    ]);
-                }
+                $vendor = Vendor::createWithRelations($data);
 
                 return $vendor->getKey();
             });
@@ -74,8 +41,9 @@ class CreateVendorSelect extends Select
     protected function createVendorAction(Action $action): Action
     {
         return $action
-            ->label('Add vendor')
+            ->label('Create vendor')
             ->slideOver()
-            ->modalWidth(MaxWidth::ThreeExtraLarge);
+            ->modalWidth(MaxWidth::ThreeExtraLarge)
+            ->modalHeading('Create a new vendor');
     }
 }

app/Models/Common/Client.php

@@ -35,6 +35,186 @@ class Client extends Model
         'updated_by',
     ];
 
+    public static function createWithRelations(array $data): self
+    {
+        /** @var Client $client */
+        $client = self::create($data);
+
+        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'] ?? [],
+            ]);
+        }
+
+        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'] ?? [],
+                    ]);
+                }
+            }
+        }
+
+        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,
+            ]);
+        }
+
+        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;
+    }
+
+    public function updateWithRelations(array $data): self
+    {
+        $this->update($data);
+
+        if (isset($data['primaryContact'], $data['primaryContact']['first_name'])) {
+            $this->primaryContact()->updateOrCreate(
+                ['is_primary' => true],
+                [
+                    'first_name' => $data['primaryContact']['first_name'],
+                    'last_name' => $data['primaryContact']['last_name'],
+                    'email' => $data['primaryContact']['email'],
+                    'phones' => $data['primaryContact']['phones'] ?? [],
+                ]
+            );
+        }
+
+        if (isset($data['secondaryContacts'])) {
+            // Delete removed contacts
+            $existingIds = collect($data['secondaryContacts'])->pluck('id')->filter()->all();
+            $this->secondaryContacts()->whereNotIn('id', $existingIds)->delete();
+
+            // Update or create contacts
+            foreach ($data['secondaryContacts'] as $contactData) {
+                if (isset($contactData['first_name'])) {
+                    $this->secondaryContacts()->updateOrCreate(
+                        ['id' => $contactData['id'] ?? null],
+                        [
+                            'is_primary' => false,
+                            'first_name' => $contactData['first_name'],
+                            'last_name' => $contactData['last_name'],
+                            'email' => $contactData['email'],
+                            'phones' => $contactData['phones'] ?? [],
+                        ]
+                    );
+                }
+            }
+        }
+
+        if (isset($data['billingAddress'], $data['billingAddress']['address_line_1'])) {
+            $this->billingAddress()->updateOrCreate(
+                ['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,
+                ]
+            );
+        }
+
+        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 = $this->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,
+                    ];
+                }
+            } elseif (isset($shippingData['address_line_1'])) {
+                $shippingAddress = [
+                    ...$shippingAddress,
+                    'parent_address_id' => null,
+                    '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,
+                ];
+            }
+
+            $this->shippingAddress()->updateOrCreate(
+                ['type' => AddressType::Shipping],
+                $shippingAddress
+            );
+        }
+
+        return $this;
+    }
+
     public function contacts(): MorphMany
     {
         return $this->morphMany(Contact::class, 'contactable');

app/Models/Common/Vendor.php

@@ -44,6 +44,69 @@ class Vendor extends Model
         'ein' => 'encrypted',
     ];
 
+    public static function createWithRelations(array $data): self
+    {
+        /** @var Vendor $vendor */
+        $vendor = self::create($data);
+
+        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;
+    }
+
+    public function updateWithRelations(array $data): self
+    {
+        $this->update($data);
+
+        if (isset($data['contact'], $data['contact']['first_name'])) {
+            $this->contact()->updateOrCreate(
+                ['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'])) {
+            $this->address()->updateOrCreate(
+                ['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 $this;
+    }
+
     public function bills(): HasMany
     {
         return $this->hasMany(Bill::class);