Merge pull request #158 from andrewdwallo/development-3.x

Development 3.x

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

@@ -201,6 +201,7 @@ class CompanyProfile extends Page
                 Hidden::make('type')
                     ->default('general'),
                 AddressFields::make()
+                    ->required()
                     ->softRequired()
                     ->disabledCountry(is_demo_environment()),
             ])

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

@@ -56,92 +56,107 @@ class OfferingResource extends Resource
 
                         return new HtmlString($output);
                     }),
-                Forms\Components\Section::make('General')
-                    ->schema([
-                        RadioDeck::make('type')
-                            ->options(OfferingType::class)
-                            ->default(OfferingType::Product)
-                            ->icons(OfferingType::class)
-                            ->color('primary')
-                            ->columns()
-                            ->required(),
-                        Forms\Components\TextInput::make('name')
-                            ->autofocus()
-                            ->required()
-                            ->columnStart(1)
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('price')
-                            ->required()
-                            ->money(),
-                        Forms\Components\Textarea::make('description')
-                            ->label('Description')
-                            ->columnSpan(2)
-                            ->rows(3),
-                        Forms\Components\CheckboxList::make('attributes')
-                            ->options([
-                                'Sellable' => 'Sellable',
-                                'Purchasable' => 'Purchasable',
-                            ])
-                            ->hiddenLabel()
-                            ->required()
-                            ->live()
-                            ->bulkToggleable()
-                            ->validationMessages([
-                                'required' => 'The offering must be either sellable or purchasable.',
-                            ]),
-                    ])->columns(),
+                static::getGeneralSection(),
                 // Sellable Section
-                Forms\Components\Section::make('Sale Information')
-                    ->schema([
-                        CreateAccountSelect::make('income_account_id')
-                            ->label('Income account')
-                            ->category(AccountCategory::Revenue)
-                            ->type(AccountType::OperatingRevenue)
-                            ->required()
-                            ->validationMessages([
-                                'required' => 'The income account is required for sellable offerings.',
-                            ]),
-                        CreateAdjustmentSelect::make('salesTaxes')
-                            ->label('Sales tax')
-                            ->category(AdjustmentCategory::Tax)
-                            ->type(AdjustmentType::Sales)
-                            ->multiple(),
-                        CreateAdjustmentSelect::make('salesDiscounts')
-                            ->label('Sales discount')
-                            ->category(AdjustmentCategory::Discount)
-                            ->type(AdjustmentType::Sales)
-                            ->multiple(),
-                    ])
-                    ->columns()
-                    ->visible(static fn (Forms\Get $get) => in_array('Sellable', $get('attributes') ?? [])),
-
+                static::getSellableSection(),
                 // Purchasable Section
-                Forms\Components\Section::make('Purchase Information')
-                    ->schema([
-                        CreateAccountSelect::make('expense_account_id')
-                            ->label('Expense account')
-                            ->category(AccountCategory::Expense)
-                            ->type(AccountType::OperatingExpense)
-                            ->required()
-                            ->validationMessages([
-                                'required' => 'The expense account is required for purchasable offerings.',
-                            ]),
-                        CreateAdjustmentSelect::make('purchaseTaxes')
-                            ->label('Purchase tax')
-                            ->category(AdjustmentCategory::Tax)
-                            ->type(AdjustmentType::Purchase)
-                            ->multiple(),
-                        CreateAdjustmentSelect::make('purchaseDiscounts')
-                            ->label('Purchase discount')
-                            ->category(AdjustmentCategory::Discount)
-                            ->type(AdjustmentType::Purchase)
-                            ->multiple(),
-                    ])
+                static::getPurchasableSection(),
+            ])->columns();
+    }
+
+    public static function getGeneralSection(bool $hasAttributeChoices = true): Forms\Components\Section
+    {
+        return Forms\Components\Section::make('General')
+            ->schema([
+                RadioDeck::make('type')
+                    ->options(OfferingType::class)
+                    ->default(OfferingType::Product)
+                    ->icons(OfferingType::class)
+                    ->color('primary')
                     ->columns()
-                    ->visible(static fn (Forms\Get $get) => in_array('Purchasable', $get('attributes') ?? [])),
+                    ->required(),
+                Forms\Components\TextInput::make('name')
+                    ->autofocus()
+                    ->required()
+                    ->columnStart(1)
+                    ->maxLength(255),
+                Forms\Components\TextInput::make('price')
+                    ->required()
+                    ->money(),
+                Forms\Components\Textarea::make('description')
+                    ->label('Description')
+                    ->columnSpan(2)
+                    ->rows(3),
+                Forms\Components\CheckboxList::make('attributes')
+                    ->options([
+                        'Sellable' => 'Sellable',
+                        'Purchasable' => 'Purchasable',
+                    ])
+                    ->visible($hasAttributeChoices)
+                    ->hiddenLabel()
+                    ->required()
+                    ->live()
+                    ->bulkToggleable()
+                    ->validationMessages([
+                        'required' => 'The offering must be either sellable or purchasable.',
+                    ]),
             ])->columns();
     }
 
+    public static function getSellableSection(bool $showByDefault = false): Forms\Components\Section
+    {
+        return Forms\Components\Section::make('Sale Information')
+            ->schema([
+                CreateAccountSelect::make('income_account_id')
+                    ->label('Income account')
+                    ->category(AccountCategory::Revenue)
+                    ->type(AccountType::OperatingRevenue)
+                    ->required()
+                    ->validationMessages([
+                        'required' => 'The income account is required for sellable offerings.',
+                    ]),
+                CreateAdjustmentSelect::make('salesTaxes')
+                    ->label('Sales tax')
+                    ->category(AdjustmentCategory::Tax)
+                    ->type(AdjustmentType::Sales)
+                    ->multiple(),
+                CreateAdjustmentSelect::make('salesDiscounts')
+                    ->label('Sales discount')
+                    ->category(AdjustmentCategory::Discount)
+                    ->type(AdjustmentType::Sales)
+                    ->multiple(),
+            ])
+            ->columns()
+            ->visible(static fn (Forms\Get $get) => in_array('Sellable', $get('attributes') ?? []));
+    }
+
+    public static function getPurchasableSection(): Forms\Components\Section
+    {
+        return Forms\Components\Section::make('Purchase Information')
+            ->schema([
+                CreateAccountSelect::make('expense_account_id')
+                    ->label('Expense account')
+                    ->category(AccountCategory::Expense)
+                    ->type(AccountType::OperatingExpense)
+                    ->required()
+                    ->validationMessages([
+                        'required' => 'The expense account is required for purchasable offerings.',
+                    ]),
+                CreateAdjustmentSelect::make('purchaseTaxes')
+                    ->label('Purchase tax')
+                    ->category(AdjustmentCategory::Tax)
+                    ->type(AdjustmentType::Purchase)
+                    ->multiple(),
+                CreateAdjustmentSelect::make('purchaseDiscounts')
+                    ->label('Purchase discount')
+                    ->category(AdjustmentCategory::Discount)
+                    ->type(AdjustmentType::Purchase)
+                    ->multiple(),
+            ])
+            ->columns()
+            ->visible(static fn (Forms\Get $get) => in_array('Purchasable', $get('attributes') ?? []));
+    }
+
     public static function table(Table $table): Table
     {
         return $table

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

@@ -14,6 +14,8 @@ 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\CreateOfferingSelect;
+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 +62,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) {
@@ -209,13 +209,11 @@ class BillResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                Forms\Components\Select::make('offering_id')
+                                CreateOfferingSelect::make('offering_id')
                                     ->label('Item')
-                                    ->relationship('purchasableOffering', 'name')
-                                    ->preload()
-                                    ->searchable()
                                     ->required()
                                     ->live()
+                                    ->purchasable()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
                                         $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));

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')
@@ -80,21 +80,21 @@ class VendorResource extends Resource
                             ]),
                         CustomSection::make('Primary Contact')
                             ->relationship('contact')
+                            ->saveRelationshipsUsing(null)
+                            ->saveRelationshipsBeforeChildrenUsing(null)
+                            ->dehydrated(true)
                             ->contained(false)
                             ->schema([
                                 Forms\Components\Hidden::make('is_primary')
                                     ->default(true),
                                 Forms\Components\TextInput::make('first_name')
                                     ->label('First name')
-                                    ->required()
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('last_name')
                                     ->label('Last name')
-                                    ->required()
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('email')
                                     ->label('Email')
-                                    ->required()
                                     ->email()
                                     ->columnSpanFull()
                                     ->maxLength(255),
@@ -110,21 +110,18 @@ class VendorResource extends Resource
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Phone')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('mobile')
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Mobile')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('toll_free')
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Toll free')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('fax')
@@ -143,6 +140,9 @@ class VendorResource extends Resource
                     ])->columns(1),
                 Forms\Components\Section::make('Address Information')
                     ->relationship('address')
+                    ->saveRelationshipsUsing(null)
+                    ->saveRelationshipsBeforeChildrenUsing(null)
+                    ->dehydrated(true)
                     ->schema([
                         Forms\Components\Hidden::make('type')
                             ->default('general'),

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

@@ -4,8 +4,10 @@ namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
 use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Models\Common\Vendor;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateVendor extends CreateRecord
 {
@@ -13,6 +15,11 @@ class CreateVendor extends CreateRecord
 
     protected static string $resource = VendorResource::class;
 
+    protected function handleRecordCreation(array $data): Model
+    {
+        return Vendor::createWithRelations($data);
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::FiveExtraLarge;

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

@@ -4,9 +4,11 @@ namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
 
 use App\Concerns\HandlePageRedirect;
 use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Models\Common\Vendor;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class EditVendor extends EditRecord
 {
@@ -14,6 +16,14 @@ class EditVendor extends EditRecord
 
     protected static string $resource = VendorResource::class;
 
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        /** @var Vendor $record */
+        $record->updateWithRelations($data);
+
+        return $record;
+    }
+
     protected function getHeaderActions(): array
     {
         return [

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

@@ -47,21 +47,21 @@ class ClientResource extends Resource
                             ]),
                         CustomSection::make('Primary Contact')
                             ->relationship('primaryContact')
+                            ->saveRelationshipsUsing(null)
+                            ->saveRelationshipsBeforeChildrenUsing(null)
+                            ->dehydrated(true)
                             ->contained(false)
                             ->schema([
                                 Forms\Components\Hidden::make('is_primary')
                                     ->default(true),
                                 Forms\Components\TextInput::make('first_name')
                                     ->label('First name')
-                                    ->required()
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('last_name')
                                     ->label('Last name')
-                                    ->required()
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('email')
                                     ->label('Email')
-                                    ->required()
                                     ->email()
                                     ->columnSpanFull()
                                     ->maxLength(255),
@@ -77,21 +77,18 @@ class ClientResource extends Resource
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Phone')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('mobile')
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Mobile')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('toll_free')
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Toll free')
-                                                    ->required()
                                                     ->maxLength(15),
                                             ])->maxItems(1),
                                         Forms\Components\Builder\Block::make('fax')
@@ -109,6 +106,9 @@ class ClientResource extends Resource
                             ])->columns(),
                         Forms\Components\Repeater::make('secondaryContacts')
                             ->relationship()
+                            ->saveRelationshipsUsing(null)
+                            ->saveRelationshipsBeforeChildrenUsing(null)
+                            ->dehydrated(true)
                             ->hiddenLabel()
                             ->extraAttributes([
                                 'class' => 'uncontained',
@@ -138,17 +138,14 @@ class ClientResource extends Resource
                             ->schema([
                                 Forms\Components\TextInput::make('first_name')
                                     ->label('First name')
-                                    ->required()
                                     ->live(onBlur: true)
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('last_name')
                                     ->label('Last name')
-                                    ->required()
                                     ->live(onBlur: true)
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('email')
                                     ->label('Email')
-                                    ->required()
                                     ->email()
                                     ->maxLength(255),
                                 PhoneBuilder::make('phones')
@@ -162,7 +159,6 @@ class ClientResource extends Resource
                                             ->schema([
                                                 Forms\Components\TextInput::make('number')
                                                     ->label('Phone')
-                                                    ->required()
                                                     ->maxLength(255),
                                             ])->maxItems(1),
                                     ])
@@ -174,10 +170,12 @@ class ClientResource extends Resource
                     ])->columns(1),
                 Forms\Components\Section::make('Billing')
                     ->schema([
-                        CreateCurrencySelect::make('currency_code'),
+                        CreateCurrencySelect::make('currency_code')
+                            ->softRequired(),
                         CustomSection::make('Billing Address')
                             ->relationship('billingAddress')
                             ->saveRelationshipsUsing(null)
+                            ->saveRelationshipsBeforeChildrenUsing(null)
                             ->dehydrated(true)
                             ->contained(false)
                             ->schema([
@@ -190,17 +188,16 @@ class ClientResource extends Resource
                 Forms\Components\Section::make('Shipping')
                     ->relationship('shippingAddress')
                     ->saveRelationshipsUsing(null)
+                    ->saveRelationshipsBeforeChildrenUsing(null)
                     ->dehydrated(true)
                     ->schema([
                         Forms\Components\Hidden::make('type')
                             ->default('shipping'),
                         Forms\Components\TextInput::make('recipient')
                             ->label('Recipient')
-                            ->required()
                             ->maxLength(255),
                         Forms\Components\TextInput::make('phone')
                             ->label('Phone')
-                            ->required()
                             ->maxLength(255),
                         CustomSection::make('Shipping Address')
                             ->contained(false)

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

@@ -3,9 +3,7 @@
 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\Address;
 use App\Models\Common\Client;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
@@ -24,51 +22,6 @@ class CreateClient extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        /** @var Client $record */
-        $record = parent::handleRecordCreation($data);
-
-        // Create billing address first
-        /** @var Address $billingAddress */
-        $billingAddress = $record->addresses()->create([
-            ...$data['billingAddress'],
-            'type' => AddressType::Billing,
-        ]);
-
-        // Create shipping address with reference to billing if needed
-        $shippingData = $data['shippingAddress'];
-
-        $shippingAddress = [
-            'type' => AddressType::Shipping,
-            'recipient' => $shippingData['recipient'],
-            'phone' => $shippingData['phone'],
-            'notes' => $shippingData['notes'],
-        ];
-
-        if ($shippingData['same_as_billing']) {
-            $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,
-            ];
-        } else {
-            $shippingAddress = [
-                ...$shippingAddress,
-                'address_line_1' => $shippingData['address_line_1'],
-                'address_line_2' => $shippingData['address_line_2'],
-                'country_code' => $shippingData['country_code'],
-                'state_id' => $shippingData['state_id'],
-                'city' => $shippingData['city'],
-                'postal_code' => $shippingData['postal_code'],
-            ];
-        }
-
-        $record->addresses()->create($shippingAddress);
-
-        return $record;
+        return Client::createWithRelations($data);
     }
 }

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

@@ -31,47 +31,7 @@ class EditClient extends EditRecord
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         /** @var Client $record */
-        $record = parent::handleRecordUpdate($record, $data);
-
-        // Update billing address
-        $billingAddress = $record->billingAddress;
-        $billingAddress->update($data['billingAddress']);
-
-        // Update shipping address
-        $shippingAddress = $record->shippingAddress;
-        $shippingData = $data['shippingAddress'];
-
-        $shippingUpdateData = [
-            'recipient' => $shippingData['recipient'],
-            'phone' => $shippingData['phone'],
-            'notes' => $shippingData['notes'],
-        ];
-
-        if ($shippingData['same_as_billing']) {
-            $shippingUpdateData = [
-                ...$shippingUpdateData,
-                '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,
-            ];
-        } else {
-            $shippingUpdateData = [
-                ...$shippingUpdateData,
-                'parent_address_id' => null,
-                'address_line_1' => $shippingData['address_line_1'],
-                'address_line_2' => $shippingData['address_line_2'],
-                'country_code' => $shippingData['country_code'],
-                'state_id' => $shippingData['state_id'],
-                'city' => $shippingData['city'],
-                'postal_code' => $shippingData['postal_code'],
-            ];
-        }
-
-        $shippingAddress->update($shippingUpdateData);
+        $record->updateWithRelations($data);
 
         return $record;
     }

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

@@ -13,7 +13,9 @@ 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\CreateOfferingSelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -61,10 +63,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) {
@@ -207,12 +207,11 @@ class EstimateResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                Forms\Components\Select::make('offering_id')
-                                    ->relationship('sellableOffering', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateOfferingSelect::make('offering_id')
+                                    ->label('Item')
                                     ->required()
                                     ->live()
+                                    ->sellable()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
                                         $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));

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

@@ -15,7 +15,9 @@ use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\Invoice
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
 use App\Filament\Forms\Components\CreateAdjustmentSelect;
+use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
+use App\Filament\Forms\Components\CreateOfferingSelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -67,10 +69,8 @@ class InvoiceResource 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) {
@@ -220,12 +220,11 @@ class InvoiceResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                Forms\Components\Select::make('offering_id')
-                                    ->relationship('sellableOffering', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateOfferingSelect::make('offering_id')
+                                    ->label('Item')
                                     ->required()
                                     ->live()
+                                    ->sellable()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
                                         $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));

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

@@ -12,7 +12,9 @@ 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\CreateOfferingSelect;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -53,10 +55,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) {
@@ -133,12 +133,11 @@ class RecurringInvoiceResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                Forms\Components\Select::make('offering_id')
-                                    ->relationship('sellableOffering', 'name')
-                                    ->preload()
-                                    ->searchable()
+                                CreateOfferingSelect::make('offering_id')
+                                    ->label('Item')
                                     ->required()
                                     ->live()
+                                    ->sellable()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
                                         $offeringId = $state;
                                         $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));

app/Filament/Forms/Components/AddressFields.php

@@ -13,6 +13,8 @@ class AddressFields extends Grid
 
     protected bool | Closure $isCountryDisabled = false;
 
+    protected bool | Closure $isRequired = false;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -20,7 +22,7 @@ class AddressFields extends Grid
         $this->schema([
             TextInput::make('address_line_1')
                 ->label('Address line 1')
-                ->required()
+                ->required(fn () => $this->isRequired())
                 ->maxLength(255),
             TextInput::make('address_line_2')
                 ->label('Address line 2')
@@ -28,11 +30,11 @@ class AddressFields extends Grid
             CountrySelect::make('country_code')
                 ->disabled(fn () => $this->isCountryDisabled())
                 ->clearStateField()
-                ->required(),
+                ->required(fn () => $this->isRequired()),
             StateSelect::make('state_id'),
             TextInput::make('city')
                 ->label('City')
-                ->required()
+                ->required(fn () => $this->isRequired())
                 ->maxLength(255),
             TextInput::make('postal_code')
                 ->label('Postal code')
@@ -60,6 +62,18 @@ class AddressFields extends Grid
         }
     }
 
+    public function required(bool | Closure $condition = true): static
+    {
+        $this->isRequired = $condition;
+
+        return $this;
+    }
+
+    public function isRequired(): bool
+    {
+        return (bool) $this->evaluate($this->isRequired);
+    }
+
     public function disabledCountry(bool | Closure $condition = true): static
     {
         $this->isCountryDisabled = $condition;

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

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Models\Common\Client;
+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 CreateClientSelect extends Select
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->searchable()
+            ->preload()
+            ->createOptionForm(fn (Form $form) => $this->createClientForm($form))
+            ->createOptionAction(fn (Action $action) => $this->createClientAction($action));
+
+        $this->relationship('client', 'name');
+
+        $this->createOptionUsing(static function (array $data) {
+            return DB::transaction(static function () use ($data) {
+                $client = Client::createWithRelations($data);
+
+                return $client->getKey();
+            });
+        });
+    }
+
+    protected function createClientForm(Form $form): Form
+    {
+        return ClientResource::form($form);
+    }
+
+    protected function createClientAction(Action $action): Action
+    {
+        return $action
+            ->label('Create client')
+            ->slideOver()
+            ->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

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Filament\Company\Resources\Common\OfferingResource;
+use App\Models\Common\Offering;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Support\Enums\MaxWidth;
+
+class CreateOfferingSelect extends Select
+{
+    protected bool $isPurchasable = true;
+
+    protected bool $isSellable = true;
+
+    public function purchasable(bool $condition = true): static
+    {
+        $this->isPurchasable = $condition;
+        $this->isSellable = false;
+
+        return $this;
+    }
+
+    public function sellable(bool $condition = true): static
+    {
+        $this->isSellable = $condition;
+        $this->isPurchasable = false;
+
+        return $this;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->searchable()
+            ->preload()
+            ->createOptionForm(fn (Form $form) => $this->createOfferingForm($form))
+            ->createOptionAction(fn (Action $action) => $this->createOfferingAction($action));
+
+        $this->relationship(
+            name: fn () => $this->isPurchasable() && ! $this->isSellable() ? 'purchasableOffering' : ($this->isSellable() && ! $this->isPurchasable() ? 'sellableOffering' : 'offering'),
+            titleAttribute: 'name'
+        );
+
+        $this->createOptionUsing(function (array $data, Form $form) {
+            if ($this->isSellableAndPurchasable()) {
+                $attributes = array_flip($data['attributes'] ?? []);
+
+                $data['sellable'] = isset($attributes['Sellable']);
+                $data['purchasable'] = isset($attributes['Purchasable']);
+            } else {
+                $data['sellable'] = $this->isSellable;
+                $data['purchasable'] = $this->isPurchasable;
+            }
+
+            unset($data['attributes']);
+
+            $offering = Offering::create($data);
+
+            $form->model($offering)->saveRelationships();
+
+            return $offering->getKey();
+        });
+    }
+
+    protected function createOfferingForm(Form $form): Form
+    {
+        return $form->schema([
+            OfferingResource::getGeneralSection($this->isSellableAndPurchasable()),
+            OfferingResource::getSellableSection()->visible(
+                fn (Get $get) => $this->isSellableAndPurchasable()
+                    ? in_array('Sellable', $get('attributes') ?? [])
+                    : $this->isSellable()
+            ),
+            OfferingResource::getPurchasableSection()->visible(
+                fn (Get $get) => $this->isSellableAndPurchasable()
+                    ? in_array('Purchasable', $get('attributes') ?? [])
+                    : $this->isPurchasable()
+            ),
+        ]);
+    }
+
+    protected function createOfferingAction(Action $action): Action
+    {
+        return $action
+            ->label('Create offering')
+            ->slideOver()
+            ->modalWidth(MaxWidth::ThreeExtraLarge)
+            ->modalHeading('Create a new offering');
+    }
+
+    public function isSellable(): bool
+    {
+        return $this->isSellable;
+    }
+
+    public function isPurchasable(): bool
+    {
+        return $this->isPurchasable;
+    }
+
+    public function isSellableAndPurchasable(): bool
+    {
+        return $this->isSellable && $this->isPurchasable;
+    }
+}

app/Filament/Forms/Components/CreateVendorSelect.php

@@ -0,0 +1,49 @@
+<?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) {
+                $vendor = Vendor::createWithRelations($data);
+
+                return $vendor->getKey();
+            });
+        });
+    }
+
+    protected function createVendorForm(Form $form): Form
+    {
+        return VendorResource::form($form);
+    }
+
+    protected function createVendorAction(Action $action): Action
+    {
+        return $action
+            ->label('Create vendor')
+            ->slideOver()
+            ->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);