refactor

app/Enums/Accounting/AdjustmentCategory.php

@@ -2,10 +2,13 @@
 
 namespace App\Enums\Accounting;
 
+use App\Enums\Concerns\ParsesEnum;
 use Filament\Support\Contracts\HasLabel;
 
 enum AdjustmentCategory: string implements HasLabel
 {
+    use ParsesEnum;
+
     case Tax = 'tax';
     case Discount = 'discount';
 
@@ -13,4 +16,14 @@ enum AdjustmentCategory: string implements HasLabel
     {
         return $this->name;
     }
+
+    public function isTax(): bool
+    {
+        return $this === self::Tax;
+    }
+
+    public function isDiscount(): bool
+    {
+        return $this === self::Discount;
+    }
 }

app/Enums/Accounting/AdjustmentType.php

@@ -2,12 +2,15 @@
 
 namespace App\Enums\Accounting;
 
+use App\Enums\Concerns\ParsesEnum;
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
 enum AdjustmentType: string implements HasColor, HasIcon, HasLabel
 {
+    use ParsesEnum;
+
     case Sales = 'sales';
     case Purchase = 'purchase';
 
@@ -31,4 +34,14 @@ enum AdjustmentType: string implements HasColor, HasIcon, HasLabel
             self::Purchase => 'heroicon-o-shopping-bag',
         };
     }
+
+    public function isSales(): bool
+    {
+        return $this === self::Sales;
+    }
+
+    public function isPurchase(): bool
+    {
+        return $this === self::Purchase;
+    }
 }

app/Enums/Common/OfferingType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Enums\Common;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum OfferingType: string implements HasLabel
+{
+    case Product = 'product';
+    case Service = 'service';
+
+    public function getLabel(): string
+    {
+        return $this->name;
+    }
+}

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource.php

@@ -0,0 +1,130 @@
+<?php
+
+namespace App\Filament\Company\Clusters\Settings\Resources;
+
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentType;
+use App\Filament\Company\Clusters\Settings;
+use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
+use App\Models\Accounting\Adjustment;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Wallo\FilamentSelectify\Components\ToggleButton;
+
+class AdjustmentResource extends Resource
+{
+    protected static ?string $model = Adjustment::class;
+
+    protected static ?string $cluster = Settings::class;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('General')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->autofocus()
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\Textarea::make('description')
+                            ->label('Description')
+                            ->autosize(),
+                    ]),
+                Forms\Components\Section::make('Configuration')
+                    ->schema([
+                        Forms\Components\Select::make('category')
+                            ->localizeLabel()
+                            ->options(AdjustmentCategory::class)
+                            ->default(AdjustmentCategory::Tax)
+                            ->live()
+                            ->required(),
+                        Forms\Components\Select::make('type')
+                            ->localizeLabel()
+                            ->options(AdjustmentType::class)
+                            ->default(AdjustmentType::Sales)
+                            ->live()
+                            ->required(),
+                        ToggleButton::make('recoverable')
+                            ->label('Recoverable')
+                            ->default(false)
+                            ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category')) === AdjustmentCategory::Tax && AdjustmentType::parse($get('type')) === AdjustmentType::Purchase),
+                    ])
+                    ->columns()
+                    ->visibleOn('create'),
+                Forms\Components\Section::make('Adjustment Details')
+                    ->schema([
+                        Forms\Components\Select::make('computation')
+                            ->localizeLabel()
+                            ->options(AdjustmentComputation::class)
+                            ->default(AdjustmentComputation::Percentage)
+                            ->live()
+                            ->required(),
+                        Forms\Components\TextInput::make('rate')
+                            ->localizeLabel()
+                            ->rate(static fn (Forms\Get $get) => $get('computation'))
+                            ->required(),
+                        Forms\Components\Select::make('scope')
+                            ->localizeLabel()
+                            ->options(AdjustmentScope::class),
+                    ])
+                    ->columns(),
+                Forms\Components\Section::make('Dates')
+                    ->schema([
+                        Forms\Components\DateTimePicker::make('start_date'),
+                        Forms\Components\DateTimePicker::make('end_date'),
+                    ])
+                    ->columns()
+                    ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category')) === AdjustmentCategory::Discount),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->label('Name')
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('category')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('type')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('rate')
+                    ->localizeLabel()
+                    ->rate(static fn (Adjustment $record) => $record->computation->value)
+                    ->searchable()
+                    ->sortable(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                //
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListAdjustments::route('/'),
+            'create' => Pages\CreateAdjustment::route('/create'),
+            'edit' => Pages\EditAdjustment::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/CreateAdjustment.php

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

app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/EditAdjustment.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
+
+use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
+use Filament\Resources\Pages\EditRecord;
+
+class EditAdjustment extends EditRecord
+{
+    protected static string $resource = AdjustmentResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            //
+        ];
+    }
+}

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/ListTaxes.php → app/Filament/Company/Clusters/Settings/Resources/AdjustmentResource/Pages/ListAdjustments.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
+namespace App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 
-use App\Filament\Company\Clusters\Settings\Resources\TaxResource;
+use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Support\Enums\MaxWidth;
 
-class ListTaxes extends ListRecords
+class ListAdjustments extends ListRecords
 {
-    protected static string $resource = TaxResource::class;
+    protected static string $resource = AdjustmentResource::class;
 
     protected function getHeaderActions(): array
     {

app/Filament/Company/Clusters/Settings/Resources/DiscountResource.php

@@ -1,189 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources;
-
-use App\Concerns\NotifiesOnDelete;
-use App\Enums\Setting\DateFormat;
-use App\Enums\Setting\DiscountComputation;
-use App\Enums\Setting\DiscountScope;
-use App\Enums\Setting\DiscountType;
-use App\Enums\Setting\TimeFormat;
-use App\Filament\Company\Clusters\Settings;
-use App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
-use App\Models\Setting\Discount;
-use App\Models\Setting\Localization;
-use Closure;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Support\Enums\FontWeight;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Wallo\FilamentSelectify\Components\ToggleButton;
-
-class DiscountResource extends Resource
-{
-    use NotifiesOnDelete;
-
-    protected static ?string $model = Discount::class;
-
-    protected static ?string $modelLabel = 'Discount';
-
-    protected static ?string $cluster = Settings::class;
-
-    public static function getModelLabel(): string
-    {
-        $modelLabel = static::$modelLabel;
-
-        return translate($modelLabel);
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Section::make('General')
-                    ->schema([
-                        Forms\Components\TextInput::make('name')
-                            ->autofocus()
-                            ->required()
-                            ->localizeLabel()
-                            ->maxLength(255)
-                            ->rule(static function (Forms\Get $get, Forms\Components\Component $component): Closure {
-                                return static function (string $attribute, $value, Closure $fail) use ($component, $get) {
-                                    $existingDiscount = Discount::where('name', $value)
-                                        ->whereKeyNot($component->getRecord()?->getKey())
-                                        ->where('type', $get('type'))
-                                        ->first();
-
-                                    if ($existingDiscount) {
-                                        $message = translate('The :Type :record ":name" already exists.', [
-                                            'Type' => $existingDiscount->type->getLabel(),
-                                            'record' => strtolower(static::getModelLabel()),
-                                            'name' => $value,
-                                        ]);
-
-                                        $fail($message);
-                                    }
-                                };
-                            }),
-                        Forms\Components\TextInput::make('description')
-                            ->localizeLabel(),
-                        Forms\Components\Select::make('computation')
-                            ->localizeLabel()
-                            ->options(DiscountComputation::class)
-                            ->default(DiscountComputation::Percentage)
-                            ->live()
-                            ->required(),
-                        Forms\Components\TextInput::make('rate')
-                            ->localizeLabel()
-                            ->rate(static fn (Forms\Get $get) => $get('computation'))
-                            ->required(),
-                        Forms\Components\Select::make('type')
-                            ->localizeLabel()
-                            ->options(DiscountType::class)
-                            ->default(DiscountType::Sales)
-                            ->required(),
-                        Forms\Components\Select::make('scope')
-                            ->localizeLabel()
-                            ->options(DiscountScope::class)
-                            ->nullable(),
-                        Forms\Components\DateTimePicker::make('start_date')
-                            ->localizeLabel()
-                            ->beforeOrEqual('end_date')
-                            ->seconds(false)
-                            ->disabled(static fn (string $operation, ?Discount $record = null) => $operation === 'edit' && $record?->start_date?->isPast() ?? false)
-                            ->helperText(static fn (Forms\Components\DateTimePicker $component) => $component->isDisabled() ? 'Start date cannot be changed after the discount has begun.' : null),
-                        Forms\Components\DateTimePicker::make('end_date')
-                            ->localizeLabel()
-                            ->afterOrEqual('start_date')
-                            ->seconds(false),
-                        ToggleButton::make('enabled')
-                            ->localizeLabel('Default')
-                            ->onLabel(Discount::enabledLabel())
-                            ->offLabel(Discount::disabledLabel()),
-                    ])->columns(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->localizeLabel()
-                    ->weight(FontWeight::Medium)
-                    ->icon(static fn (Discount $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
-                    ->tooltip(static function (Discount $record) {
-                        if ($record->isDisabled()) {
-                            return null;
-                        }
-
-                        return translate('Default :Type :Record', [
-                            'Type' => $record->type->getLabel(),
-                            'Record' => static::getModelLabel(),
-                        ]);
-                    })
-                    ->iconPosition('after')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('rate')
-                    ->localizeLabel()
-                    ->rate(static fn (Discount $record) => $record->computation->value)
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->localizeLabel()
-                    ->badge()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('start_date')
-                    ->localizeLabel()
-                    ->formatStateUsing(static function (Discount $record) {
-                        $dateFormat = Localization::firstOrFail()->date_format->value ?? DateFormat::DEFAULT;
-                        $timeFormat = Localization::firstOrFail()->time_format->value ?? TimeFormat::DEFAULT;
-
-                        return $record->start_date ? $record->start_date->format("{$dateFormat} {$timeFormat}") : 'N/A';
-                    })
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('end_date')
-                    ->localizeLabel()
-                    ->formatStateUsing(static function (Discount $record) {
-                        $dateFormat = Localization::firstOrFail()->date_format->value ?? DateFormat::DEFAULT;
-                        $timeFormat = Localization::firstOrFail()->time_format->value ?? TimeFormat::DEFAULT;
-
-                        return $record->end_date ? $record->end_date->format("{$dateFormat} {$timeFormat}") : 'N/A';
-                    })
-                    ->color(static fn (Discount $record) => $record->end_date?->isPast() ? 'danger' : null)
-                    ->searchable()
-                    ->sortable(),
-            ])
-            ->filters([
-                //
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
-            ])
-            ->checkIfRecordIsSelectableUsing(static function (Discount $record) {
-                return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListDiscounts::route('/'),
-            'create' => Pages\CreateDiscount::route('/create'),
-            'edit' => Pages\EditDiscount::route('/{record}/edit'),
-        ];
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
-
-use App\Filament\Company\Clusters\Settings\Resources\DiscountResource;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateDiscount extends CreateRecord
-{
-    protected static string $resource = DiscountResource::class;
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/EditDiscount.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
-
-use App\Filament\Company\Clusters\Settings\Resources\DiscountResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditDiscount extends EditRecord
-{
-    protected static string $resource = DiscountResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make(),
-        ];
-    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/ListDiscounts.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
-
-use App\Filament\Company\Clusters\Settings\Resources\DiscountResource;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-use Filament\Support\Enums\MaxWidth;
-
-class ListDiscounts extends ListRecords
-{
-    protected static string $resource = DiscountResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make(),
-        ];
-    }
-
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return MaxWidth::ScreenTwoExtraLarge;
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/TaxResource.php

@@ -1,158 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources;
-
-use App\Concerns\NotifiesOnDelete;
-use App\Enums\Setting\TaxComputation;
-use App\Enums\Setting\TaxScope;
-use App\Enums\Setting\TaxType;
-use App\Filament\Company\Clusters\Settings;
-use App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
-use App\Models\Setting\Tax;
-use Closure;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Support\Enums\FontWeight;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Wallo\FilamentSelectify\Components\ToggleButton;
-
-class TaxResource extends Resource
-{
-    use NotifiesOnDelete;
-
-    protected static ?string $model = Tax::class;
-
-    protected static ?string $modelLabel = 'Tax';
-
-    protected static ?string $cluster = Settings::class;
-
-    public static function getModelLabel(): string
-    {
-        $modelLabel = static::$modelLabel;
-
-        return translate($modelLabel);
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Forms\Components\Section::make('General')
-                    ->schema([
-                        Forms\Components\TextInput::make('name')
-                            ->autofocus()
-                            ->required()
-                            ->localizeLabel()
-                            ->maxLength(255)
-                            ->rule(static function (Forms\Get $get, Forms\Components\Component $component): Closure {
-                                return static function (string $attribute, $value, Closure $fail) use ($component, $get) {
-                                    $existingTax = Tax::where('name', $value)
-                                        ->whereKeyNot($component->getRecord()?->getKey())
-                                        ->where('type', $get('type'))
-                                        ->first();
-
-                                    if ($existingTax) {
-                                        $message = translate('The :Type :record ":name" already exists.', [
-                                            'Type' => $existingTax->type->getLabel(),
-                                            'record' => strtolower(static::getModelLabel()),
-                                            'name' => $value,
-                                        ]);
-
-                                        $fail($message);
-                                    }
-                                };
-                            }),
-                        Forms\Components\TextInput::make('description'),
-                        Forms\Components\Select::make('computation')
-                            ->localizeLabel()
-                            ->options(TaxComputation::class)
-                            ->default(TaxComputation::Percentage)
-                            ->live()
-                            ->required(),
-                        Forms\Components\TextInput::make('rate')
-                            ->localizeLabel()
-                            ->rate(static fn (Forms\Get $get) => $get('computation'))
-                            ->required(),
-                        Forms\Components\Select::make('type')
-                            ->localizeLabel()
-                            ->options(TaxType::class)
-                            ->default(TaxType::Sales)
-                            ->required(),
-                        Forms\Components\Select::make('scope')
-                            ->localizeLabel()
-                            ->options(TaxScope::class),
-                        ToggleButton::make('enabled')
-                            ->localizeLabel('Default')
-                            ->onLabel(Tax::enabledLabel())
-                            ->offLabel(Tax::disabledLabel()),
-                    ])->columns(),
-            ]);
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                Tables\Columns\TextColumn::make('name')
-                    ->localizeLabel()
-                    ->weight(FontWeight::Medium)
-                    ->icon(static fn (Tax $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
-                    ->tooltip(static function (Tax $record) {
-                        if ($record->isDisabled()) {
-                            return null;
-                        }
-
-                        return translate('Default :Type :Record', [
-                            'Type' => $record->type->getLabel(),
-                            'Record' => static::getModelLabel(),
-                        ]);
-                    })
-                    ->iconPosition('after')
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('computation')
-                    ->localizeLabel()
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('rate')
-                    ->localizeLabel()
-                    ->rate(static fn (Tax $record) => $record->computation->value)
-                    ->searchable()
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->localizeLabel()
-                    ->badge()
-                    ->searchable()
-                    ->sortable(),
-            ])
-            ->filters([
-                //
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-                Tables\Actions\DeleteAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
-            ])
-            ->checkIfRecordIsSelectableUsing(static function (Tax $record) {
-                return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListTaxes::route('/'),
-            'create' => Pages\CreateTax::route('/create'),
-            'edit' => Pages\EditTax::route('/{record}/edit'),
-        ];
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/CreateTax.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
-
-use App\Filament\Company\Clusters\Settings\Resources\TaxResource;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateTax extends CreateRecord
-{
-    protected static string $resource = TaxResource::class;
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/EditTax.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
-
-use App\Filament\Company\Clusters\Settings\Resources\TaxResource;
-use Filament\Actions;
-use Filament\Resources\Pages\EditRecord;
-
-class EditTax extends EditRecord
-{
-    protected static string $resource = TaxResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make(),
-        ];
-    }
-
-    protected function getRedirectUrl(): string
-    {
-        return $this->getResource()::getUrl('index');
-    }
-}

app/Filament/Company/Pages/Accounting/AccountChart.php

@@ -46,6 +46,8 @@ class AccountChart extends Page
     public function categories(): Collection
     {
         return AccountSubtype::withCount('accounts')
+            ->with('accounts')
+            ->with('accounts.adjustment')
             ->get()
             ->groupBy('category');
     }

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

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Filament\Company\Resources\Common;
+
+use App\Enums\Common\OfferingType;
+use App\Filament\Company\Resources\Common\OfferingResource\Pages;
+use App\Models\Common\Offering;
+use App\Utilities\Currency\CurrencyAccessor;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class OfferingResource extends Resource
+{
+    protected static ?string $model = Offering::class;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('General')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->autofocus()
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\Textarea::make('description')
+                            ->label('Description')
+                            ->autosize(),
+                        Forms\Components\Select::make('type')
+                            ->options(OfferingType::class)
+                            ->searchable()
+                            ->required(),
+                        Forms\Components\TextInput::make('price')
+                            ->required()
+                            ->money(CurrencyAccessor::getDefaultCurrency()),
+                        Forms\Components\Checkbox::make('sellable')
+                            ->label('Sellable')
+                            ->live()
+                            ->dehydrated(false)
+                            ->default(false),
+                        Forms\Components\Checkbox::make('purchasable')
+                            ->label('Purchasable')
+                            ->live()
+                            ->dehydrated(false)
+                            ->default(false),
+                    ]),
+                // Sellable Section
+                Forms\Components\Section::make('Sellable Configuration')
+                    ->schema([
+                        Forms\Components\Select::make('income_account_id')
+                            ->relationship('incomeAccount', 'name')
+                            ->searchable()
+                            ->preload(),
+                        Forms\Components\Select::make('sales_taxes')
+                            ->relationship('salesTaxes', 'name')
+                            ->preload()
+                            ->multiple(),
+                        Forms\Components\Select::make('sales_discounts')
+                            ->relationship('salesDiscounts', 'name')
+                            ->preload()
+                            ->multiple(),
+                    ])
+                    ->columns(2)
+                    ->visible(fn (Forms\Get $get) => $get('sellable')),
+
+                // Purchasable Section
+                Forms\Components\Section::make('Purchasable Configuration')
+                    ->schema([
+                        Forms\Components\Select::make('expense_account_id')
+                            ->relationship('expenseAccount', 'name')
+                            ->searchable()
+                            ->preload(),
+                        Forms\Components\Select::make('purchase_taxes')
+                            ->relationship('purchaseTaxes', 'name')
+                            ->preload()
+                            ->multiple(),
+                        Forms\Components\Select::make('purchase_discounts')
+                            ->relationship('purchaseDiscounts', 'name')
+                            ->preload()
+                            ->multiple(),
+                    ])
+                    ->columns(2)
+                    ->visible(fn (Forms\Get $get) => $get('purchasable')),
+            ])->columns(1);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\ViewColumn::make('name')
+                    ->label('Name')
+                    ->view('filament.company.components.tables.columns.offering-status'),
+                Tables\Columns\TextColumn::make('type')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('price')
+                    ->money()
+                    ->sortable(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListOfferings::route('/'),
+            'create' => Pages\CreateOffering::route('/create'),
+            'edit' => Pages\EditOffering::route('/{record}/edit'),
+        ];
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases;
+
+use App\Filament\Company\Resources\Common\OfferingResource;
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource\Pages;
+use App\Models\Common\Offering;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+
+class BuyableOfferingResource extends Resource
+{
+    protected static ?string $model = Offering::class;
+
+    protected static ?string $pluralModelLabel = 'Products & Services';
+
+    public static function getEloquentQuery(): Builder
+    {
+        return parent::getEloquentQuery()
+            ->whereNotNull('expense_account_id');
+    }
+
+    public static function form(Form $form): Form
+    {
+        return OfferingResource::form($form);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return OfferingResource::table($table);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListBuyableOfferings::route('/'),
+            'create' => Pages\CreateBuyableOffering::route('/create'),
+            'edit' => Pages\EditBuyableOffering::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Company/Resources/Purchases/BuyableOfferingResource/Pages/CreateBuyableOffering.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BuyableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateBuyableOffering extends CreateRecord
+{
+    protected static string $resource = BuyableOfferingResource::class;
+
+    protected function getRedirectUrl(): string
+    {
+        if ($this->record->income_account_id && ! $this->record->expense_account_id) {
+            return SellableOfferingResource::getUrl();
+        } else {
+            return $this->getResource()::getUrl('index');
+        }
+    }
+}

app/Filament/Company/Resources/Purchases/BuyableOfferingResource/Pages/EditBuyableOffering.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BuyableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditBuyableOffering extends EditRecord
+{
+    protected static string $resource = BuyableOfferingResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+
+    protected function getRedirectUrl(): string
+    {
+        if ($this->record->income_account_id && ! $this->record->expense_account_id) {
+            return SellableOfferingResource::getUrl();
+        } else {
+            return $this->getResource()::getUrl('index');
+        }
+    }
+}

app/Filament/Company/Resources/Purchases/BuyableOfferingResource/Pages/ListBuyableOfferings.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BuyableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+use Illuminate\Contracts\Support\Htmlable;
+
+class ListBuyableOfferings extends ListRecords
+{
+    protected static string $resource = BuyableOfferingResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+
+    public function getHeading(): string | Htmlable
+    {
+        return 'Products & Services (Purchases)';
+    }
+}

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales;
+
+use App\Filament\Company\Resources\Common\OfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource\Pages;
+use App\Models\Common\Offering;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+
+class SellableOfferingResource extends Resource
+{
+    protected static ?string $model = Offering::class;
+
+    protected static ?string $pluralModelLabel = 'Products & Services';
+
+    public static function getEloquentQuery(): Builder
+    {
+        return parent::getEloquentQuery()
+            ->whereNotNull('income_account_id');
+    }
+
+    public static function form(Form $form): Form
+    {
+        return OfferingResource::form($form);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return OfferingResource::table($table);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListSellableOfferings::route('/'),
+            'create' => Pages\CreateSellableOffering::route('/create'),
+            'edit' => Pages\EditSellableOffering::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Company/Resources/Sales/SellableOfferingResource/Pages/CreateSellableOffering.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\SellableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateSellableOffering extends CreateRecord
+{
+    protected static string $resource = SellableOfferingResource::class;
+
+    protected function getRedirectUrl(): string
+    {
+        if ($this->record->expense_account_id && ! $this->record->income_account_id) {
+            return BuyableOfferingResource::getUrl();
+        } else {
+            return $this->getResource()::getUrl('index');
+        }
+    }
+}

app/Filament/Company/Resources/Sales/SellableOfferingResource/Pages/EditSellableOffering.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\SellableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditSellableOffering extends EditRecord
+{
+    protected static string $resource = SellableOfferingResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+
+    protected function getRedirectUrl(): string
+    {
+        if ($this->record->expense_account_id && ! $this->record->income_account_id) {
+            return BuyableOfferingResource::getUrl();
+        } else {
+            return $this->getResource()::getUrl('index');
+        }
+    }
+}

app/Filament/Company/Resources/Sales/SellableOfferingResource/Pages/ListSellableOfferings.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\SellableOfferingResource\Pages;
+
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+use Illuminate\Contracts\Support\Htmlable;
+
+class ListSellableOfferings extends ListRecords
+{
+    protected static string $resource = SellableOfferingResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+
+    public function getHeading(): string | Htmlable
+    {
+        return 'Products & Services (Sales)';
+    }
+}

app/Models/Accounting/Adjustment.php

@@ -5,23 +5,25 @@ namespace App\Models\Accounting;
 use App\Casts\RateCast;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
-use App\Concerns\HasDefault;
 use App\Enums\Accounting\AdjustmentCategory;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\AdjustmentScope;
 use App\Enums\Accounting\AdjustmentType;
+use App\Models\Common\Offering;
+use App\Observers\AdjustmentObserver;
 use Database\Factories\Accounting\AdjustmentFactory;
+use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
+#[ObservedBy(AdjustmentObserver::class)]
 class Adjustment extends Model
 {
     use Blamable;
     use CompanyOwned;
-    use HasDefault;
     use HasFactory;
 
     protected $table = 'adjustments';
@@ -29,14 +31,16 @@ class Adjustment extends Model
     protected $fillable = [
         'company_id',
         'account_id',
+        'name',
+        'description',
         'category',
         'type',
+        'recoverable',
         'rate',
         'computation',
         'scope',
         'start_date',
         'end_date',
-        'enabled',
         'created_by',
         'updated_by',
     ];
@@ -44,12 +48,12 @@ class Adjustment extends Model
     protected $casts = [
         'category' => AdjustmentCategory::class,
         'type' => AdjustmentType::class,
+        'recoverable' => 'boolean',
         'rate' => RateCast::class,
         'computation' => AdjustmentComputation::class,
         'scope' => AdjustmentScope::class,
         'start_date' => 'datetime',
         'end_date' => 'datetime',
-        'enabled' => 'boolean',
     ];
 
     public function account(): BelongsTo
@@ -57,9 +61,34 @@ class Adjustment extends Model
         return $this->belongsTo(Account::class, 'account_id');
     }
 
-    public function adjustmentables(): MorphTo
+    public function offerings(): MorphToMany
     {
-        return $this->morphTo();
+        return $this->morphedByMany(Offering::class, 'adjustmentable', 'adjustmentables');
+    }
+
+    public function isSalesTax(): bool
+    {
+        return $this->category->isTax() && $this->type->isSales();
+    }
+
+    public function isNonRecoverablePurchaseTax(): bool
+    {
+        return $this->category->isTax() && $this->type->isPurchase() && $this->recoverable === false;
+    }
+
+    public function isRecoverablePurchaseTax(): bool
+    {
+        return $this->category->isTax() && $this->type->isPurchase() && $this->recoverable === true;
+    }
+
+    public function isSalesDiscount(): bool
+    {
+        return $this->category->isDiscount() && $this->type->isSales();
+    }
+
+    public function isPurchaseDiscount(): bool
+    {
+        return $this->category->isDiscount() && $this->type->isPurchase();
     }
 
     protected static function newFactory(): Factory

app/Models/Common/Offering.php

@@ -2,10 +2,14 @@
 
 namespace App\Models\Common;
 
+use App\Casts\MoneyCast;
+use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentType;
+use App\Enums\Common\OfferingType;
 use App\Models\Accounting\Account;
-use App\Models\Setting\Discount;
-use App\Models\Setting\Tax;
+use App\Models\Accounting\Adjustment;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -13,6 +17,7 @@ use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
 class Offering extends Model
 {
+    use Blamable;
     use CompanyOwned;
     use HasFactory;
 
@@ -24,6 +29,13 @@ class Offering extends Model
         'price',
         'income_account_id',
         'expense_account_id',
+        'created_by',
+        'updated_by',
+    ];
+
+    protected $casts = [
+        'type' => OfferingType::class,
+        'price' => MoneyCast::class,
     ];
 
     public function incomeAccount(): BelongsTo
@@ -36,15 +48,28 @@ class Offering extends Model
         return $this->belongsTo(Account::class, 'expense_account_id');
     }
 
-    public function taxes(): MorphToMany
+    public function adjustments(): MorphToMany
+    {
+        return $this->morphToMany(Adjustment::class, 'adjustmentable', 'adjustmentables');
+    }
+
+    public function salesTaxes(): MorphToMany
+    {
+        return $this->adjustments()->where('category', AdjustmentCategory::Tax)->where('type', AdjustmentType::Sales);
+    }
+
+    public function purchaseTaxes(): MorphToMany
+    {
+        return $this->adjustments()->where('category', AdjustmentCategory::Tax)->where('type', AdjustmentType::Purchase);
+    }
+
+    public function salesDiscounts(): MorphToMany
     {
-        return $this->morphToMany(Tax::class, 'adjustmentable', 'adjustmentables')
-            ->wherePivot('adjustment_type', Tax::class);
+        return $this->adjustments()->where('category', AdjustmentCategory::Discount)->where('type', AdjustmentType::Sales);
     }
 
-    public function discounts(): MorphToMany
+    public function purchaseDiscounts(): MorphToMany
     {
-        return $this->morphToMany(Discount::class, 'adjustmentable', 'adjustmentables')
-            ->wherePivot('adjustment_type', Discount::class);
+        return $this->adjustments()->where('category', AdjustmentCategory::Discount)->where('type', AdjustmentType::Purchase);
     }
 }

app/Models/Company.php

@@ -7,6 +7,7 @@ use App\Models\Accounting\AccountSubtype;
 use App\Models\Banking\BankAccount;
 use App\Models\Banking\ConnectedBankAccount;
 use App\Models\Common\Contact;
+use App\Models\Common\Offering;
 use App\Models\Core\Department;
 use App\Models\Setting\Appearance;
 use App\Models\Setting\CompanyDefault;
@@ -139,4 +140,9 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
     {
         return $this->hasMany(Accounting\Transaction::class, 'company_id');
     }
+
+    public function offerings(): HasMany
+    {
+        return $this->hasMany(Offering::class, 'company_id');
+    }
 }

app/Observers/AdjustmentObserver.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Accounting\Account;
+use App\Models\Accounting\Adjustment;
+
+class AdjustmentObserver
+{
+    public function creating(Adjustment $adjustment): void
+    {
+        if ($adjustment->account_id === null && ! $adjustment->isNonRecoverablePurchaseTax()) {
+            $account = null;
+
+            if ($adjustment->isSalesTax()) {
+                $account = Account::factory()->forSalesTax($adjustment->name, $adjustment->description)->create();
+            } elseif ($adjustment->isRecoverablePurchaseTax()) {
+                $account = Account::factory()->forPurchaseTax($adjustment->name, $adjustment->description)->create();
+            } elseif ($adjustment->isSalesDiscount()) {
+                $account = Account::factory()->forSalesDiscount($adjustment->name, $adjustment->description)->create();
+            } elseif ($adjustment->isPurchaseDiscount()) {
+                $account = Account::factory()->forPurchaseDiscount($adjustment->name, $adjustment->description)->create();
+            }
+
+            if ($account) {
+                $adjustment->account()->associate($account);
+            }
+        }
+    }
+
+    public function updating(Adjustment $adjustment): void
+    {
+        if ($adjustment->account) {
+            $adjustment->account->update([
+                'name' => $adjustment->name,
+                'description' => $adjustment->description,
+            ]);
+        }
+    }
+}

app/Providers/FilamentCompaniesServiceProvider.php

@@ -27,6 +27,8 @@ use App\Filament\Company\Pages\Service\ConnectedAccount;
 use App\Filament\Company\Pages\Service\LiveCurrency;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use App\Filament\Company\Resources\Core\DepartmentResource;
+use App\Filament\Company\Resources\Purchases\BuyableOfferingResource;
+use App\Filament\Company\Resources\Sales\SellableOfferingResource;
 use App\Filament\Components\PanelShiftDropdown;
 use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\ConfigureCurrentCompany;
@@ -121,6 +123,14 @@ class FilamentCompaniesServiceProvider extends PanelProvider
                         ...Settings::getNavigationItems(),
                     ])
                     ->groups([
+                        NavigationGroup::make('Sales & Payments')
+                            ->label('Sales & Payments')
+                            ->icon('heroicon-o-currency-dollar')
+                            ->items(SellableOfferingResource::getNavigationItems()),
+                        NavigationGroup::make('Purchases')
+                            ->label('Purchases')
+                            ->icon('heroicon-o-shopping-cart')
+                            ->items(BuyableOfferingResource::getNavigationItems()),
                         NavigationGroup::make('Accounting')
                             ->localizeLabel()
                             ->icon('heroicon-o-clipboard-document-list')

app/Services/ChartOfAccountsService.php

@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Enums\Accounting\AccountType;
 use App\Enums\Banking\BankAccountType;
+use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Accounting\Adjustment;
 use App\Models\Banking\BankAccount;
@@ -17,6 +18,9 @@ class ChartOfAccountsService
     {
         $chartOfAccounts = config('chart-of-accounts.default');
 
+        // Always create a non-recoverable "Purchase Tax" adjustment, even without an account
+        $this->createAdjustmentForAccount($company, 'tax', 'purchase', false);
+
         foreach ($chartOfAccounts as $type => $subtypes) {
             foreach ($subtypes as $subtypeName => $subtypeConfig) {
                 $subtype = $company->accountSubtypes()
@@ -57,6 +61,7 @@ class ChartOfAccountsService
 
             foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
                 // Create the Account without directly setting bank_account_id
+                /** @var Account $account */
                 $account = $company->accounts()->createQuietly([
                     'subtype_id' => $subtype->id,
                     'category' => $subtype->type->getCategory()->value,
@@ -79,11 +84,16 @@ class ChartOfAccountsService
                     $bankAccount->saveQuietly();
                 }
 
-                if (isset($subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type'])) {
-                    $adjustment = $this->createAdjustmentForAccount($company, $subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type']);
+                if (isset($subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type'], $subtypeConfig['adjustment_recoverable'])) {
+                    $adjustment = $this->createAdjustmentForAccount($company, $subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type'], $subtypeConfig['adjustment_recoverable']);
 
                     // Associate the Adjustment with the Account
                     $adjustment->account()->associate($account);
+
+                    $adjustment->name = $account->name;
+
+                    $adjustment->description = $account->description;
+
                     $adjustment->saveQuietly();
                 }
             }
@@ -102,27 +112,27 @@ class ChartOfAccountsService
         ]);
     }
 
-    private function createAdjustmentForAccount(Company $company, string $category, string $type): Adjustment
+    private function createAdjustmentForAccount(Company $company, string $category, string $type, bool $recoverable): Adjustment
     {
-        $noDefaultAdjustmentType = $company->adjustments()->where('category', $category)
-            ->where('type', $type)
-            ->where('enabled', true)
-            ->doesntExist();
-
         $defaultRate = match ([$category, $type]) {
-            ['tax', 'sales'] => 8,          // Default 8% for Sales Tax
-            ['tax', 'purchase'] => 8,       // Default 8% for Purchase Tax
-            ['discount', 'sales'] => 5,     // Default 5% for Sales Discount
-            ['discount', 'purchase'] => 5,  // Default 5% for Purchase Discount
-            default => 0,                   // Default to 0 if unspecified
+            ['tax', 'sales'], ['tax', 'purchase'] => '8',
+            ['discount', 'sales'], ['discount', 'purchase'] => '5',
+            default => '0',
         };
 
+        if ($category === 'tax' && $type === 'purchase' && $recoverable === false) {
+            $name = 'Purchase Tax';
+            $description = 'This tax is non-recoverable and is included as part of the total cost of the purchase. The tax amount is embedded into the associated expense or asset account based on the type of purchase.';
+        }
+
         return $company->adjustments()->createQuietly([
+            'name' => $name ?? null,
+            'description' => $description ?? null,
             'category' => $category,
             'type' => $type,
+            'recoverable' => $recoverable,
             'rate' => $defaultRate,
             'computation' => 'percentage',
-            'enabled' => $noDefaultAdjustmentType,
             'created_by' => $company->owner->id,
             'updated_by' => $company->owner->id,
         ]);

composer.lock

@@ -302,16 +302,16 @@
         },
         {
             "name": "anourvalar/eloquent-serialize",
-            "version": "1.2.25",
+            "version": "1.2.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AnourValar/eloquent-serialize.git",
-                "reference": "6d7a868ae4218b9d7796334ff9a17e1539bad48a"
+                "reference": "756c1232ff0d02321fd90f4fe3c221d6a7b8d697"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/6d7a868ae4218b9d7796334ff9a17e1539bad48a",
-                "reference": "6d7a868ae4218b9d7796334ff9a17e1539bad48a",
+                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/756c1232ff0d02321fd90f4fe3c221d6a7b8d697",
+                "reference": "756c1232ff0d02321fd90f4fe3c221d6a7b8d697",
                 "shasum": ""
             },
             "require": {
@@ -362,9 +362,9 @@
             ],
             "support": {
                 "issues": "https://github.com/AnourValar/eloquent-serialize/issues",
-                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.25"
+                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.26"
             },
-            "time": "2024-09-16T12:59:37+00:00"
+            "time": "2024-11-16T12:29:47+00:00"
         },
         {
             "name": "awcodes/filament-table-repeater",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.327.0",
+            "version": "3.328.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "ba4a7ac2544de61b33f693c461f8b09c0353298f"
+                "reference": "a99b58e166ae367f2b067937afb04e843e900745"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ba4a7ac2544de61b33f693c461f8b09c0353298f",
-                "reference": "ba4a7ac2544de61b33f693c461f8b09c0353298f",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a99b58e166ae367f2b067937afb04e843e900745",
+                "reference": "a99b58e166ae367f2b067937afb04e843e900745",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.327.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.328.0"
             },
-            "time": "2024-11-14T19:06:19+00:00"
+            "time": "2024-11-15T19:06:57+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2908,16 +2908,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.31.0",
+            "version": "v11.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40"
+                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40",
-                "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/bc2aad63f83ee5089be7b21cf29d645ccf31e927",
+                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927",
                 "shasum": ""
             },
             "require": {
@@ -3113,7 +3113,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-12T15:36:15+00:00"
+            "time": "2024-11-15T17:04:33+00:00"
         },
         {
             "name": "laravel/prompts",

config/chart-of-accounts.php

@@ -26,6 +26,20 @@ return [
                     ],
                 ],
             ],
+            'Input Tax Recoverable' => [
+                'description' => 'The amount of sales tax paid on purchases that can be recovered from the government.',
+                'multi_currency' => false,
+                'base_code' => '1150',
+                'inverse_cash_flow' => true,
+                'adjustment_category' => 'tax',
+                'adjustment_type' => 'purchase',
+                'adjustment_recoverable' => true,
+                'accounts' => [
+                    'Input Tax' => [
+                        'description' => null,
+                    ],
+                ],
+            ],
             'Inventory' => [
                 'description' => 'The raw materials, work-in-progress goods and completely finished goods that are considered to be the portion of a business\'s assets that are ready or will be ready for sale.',
                 'multi_currency' => true,
@@ -126,6 +140,7 @@ return [
                 'inverse_cash_flow' => false,
                 'adjustment_category' => 'tax',
                 'adjustment_type' => 'sales',
+                'adjustment_recoverable' => false,
                 'accounts' => [
                     'Sales Tax' => [
                         'description' => null,
@@ -288,6 +303,7 @@ return [
                 'inverse_cash_flow' => false,
                 'adjustment_category' => 'discount',
                 'adjustment_type' => 'sales',
+                'adjustment_recoverable' => false,
                 'accounts' => [
                     'Sales Discount' => [
                         'description' => null,
@@ -430,19 +446,6 @@ return [
                 'base_code' => '5600',
                 'inverse_cash_flow' => true,
             ],
-            'Purchase Taxes' => [
-                'description' => 'Taxes paid on purchases of goods or services, such as value-added tax (VAT), goods and services tax (GST), or customs duties.',
-                'multi_currency' => false,
-                'base_code' => '5650',
-                'inverse_cash_flow' => true,
-                'adjustment_category' => 'tax',
-                'adjustment_type' => 'purchase',
-                'accounts' => [
-                    'Purchase Tax' => [
-                        'description' => null,
-                    ],
-                ],
-            ],
             'Other Non-Operating Expense' => [
                 'description' => 'Expenses not related to primary business activities, like losses from asset disposals, legal settlements, restructuring costs, or foreign exchange losses.',
                 'multi_currency' => false,
@@ -474,6 +477,7 @@ return [
                 'inverse_cash_flow' => true,
                 'adjustment_category' => 'discount',
                 'adjustment_type' => 'purchase',
+                'adjustment_recoverable' => false,
                 'accounts' => [
                     'Purchase Discount' => [
                         'description' => null,

database/factories/Accounting/AccountFactory.php

@@ -92,7 +92,7 @@ class AccountFactory extends Factory
 
     public function forPurchaseTax(?string $name = null, ?string $description = null): static
     {
-        $accountSubtype = AccountSubtype::where('name', 'Purchase Taxes')->first();
+        $accountSubtype = AccountSubtype::where('name', 'Input Tax Recoverable')->first();
 
         return $this->state([
             'name' => $name,

database/factories/Accounting/AdjustmentFactory.php

@@ -44,7 +44,6 @@ class AdjustmentFactory extends Factory
             'scope' => $this->faker->randomElement(AdjustmentScope::class),
             'start_date' => $startDate,
             'end_date' => $endDate,
-            'enabled' => false,
         ];
     }
 

database/migrations/2024_11_13_214149_create_offerings_table.php

@@ -20,6 +20,8 @@ return new class extends Migration
             $table->integer('price')->default(0);
             $table->foreignId('income_account_id')->nullable()->constrained('accounts')->nullOnDelete(); // income account e.g. sales/invoice
             $table->foreignId('expense_account_id')->nullable()->constrained('accounts')->nullOnDelete(); // expense account e.g. purchase/bill
+            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
+            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
         });
     }

database/migrations/2024_11_14_230753_create_adjustments_table.php

@@ -15,14 +15,16 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->foreignId('account_id')->nullable()->constrained('accounts')->nullOnDelete();
+            $table->string('name')->nullable();
+            $table->text('description')->nullable();
             $table->string('category')->default('tax');
             $table->string('type')->default('sales');
+            $table->boolean('recoverable')->default(false);
             $table->integer('rate')->default(0);
             $table->string('computation')->default('percentage');
             $table->string('scope')->nullable();
             $table->dateTime('start_date')->nullable();
             $table->dateTime('end_date')->nullable();
-            $table->boolean('enabled')->default(true);
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();

database/migrations/2024_11_13_225714_create_adjustmentables_table.php → database/migrations/2024_11_15_225714_create_adjustmentables_table.php

@@ -13,13 +13,9 @@ return new class extends Migration
     {
         Schema::create('adjustmentables', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('adjustment_id');   // No foreign key constraint due to polymorphism
-            $table->string('adjustment_type');             // Type of adjustment (e.g., "App\Models\Tax" or "App\Models\Discount")
-            $table->morphs('adjustmentable');              // Creates adjustmentable_id and adjustmentable_type
-            $table->timestamps();
+            $table->foreignId('adjustment_id')->constrained()->cascadeOnDelete();
+            $table->morphs('adjustmentable');
 
-            // Optional indexes for efficient querying
-            $table->index(['adjustment_id', 'adjustment_type']);
             $table->index(['adjustmentable_id', 'adjustmentable_type']);
         });
     }

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
-            "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz",
+            "integrity": "sha512-Tj+j7Pyzd15wAdSJswvs5CJzJNV+qqSUcr/aCD+jpQSBtXvGnV0pnrjoc8zFTe9fcKCatkpFpOO7yAzpO998HA==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
-            "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.2.tgz",
+            "integrity": "sha512-xsPeJgh2ThBpUqlLgRfiVYBEf/P1nWlWvReG+aBWfNv3XEBpa6ZCmxSVnxJgLgkNz4IbxpLy64h2gCmAAQLneQ==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
-            "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.2.tgz",
+            "integrity": "sha512-KnXU4m9MywuZFedL35Z3PuwiTSn/yqRIhrEA9j+7OSkji39NzVkgxuxTYg5F8ryGysq4iFADaU5osSizMXhU2A==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
-            "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.2.tgz",
+            "integrity": "sha512-Hj77A3yTvUeCIx/Vi+4d4IbYhyTwtHj07lVzUgpUq9YpJSEiGJj4vXMKwzJ3w5zp5v3PFvpJNgc/J31smZey6g==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
-            "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.2.tgz",
+            "integrity": "sha512-RjgKf5C3xbn8gxvCm5VgKZ4nn0pRAIe90J0/fdHUsgztd3+Zesb2lm2+r6uX4prV2eUByuxJNdt647/1KPRq5g==",
             "cpu": [
                 "arm64"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
-            "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.2.tgz",
+            "integrity": "sha512-duq21FoXwQtuws+V9H6UZ+eCBc7fxSpMK1GQINKn3fAyd9DFYKPJNcUhdIKOrMFjLEJgQskoMoiuizMt+dl20g==",
             "cpu": [
                 "x64"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
-            "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.2.tgz",
+            "integrity": "sha512-6npqOKEPRZkLrMcvyC/32OzJ2srdPzCylJjiTJT2c0bwwSGm7nz2F9mNQ1WrAqCBZROcQn91Fno+khFhVijmFA==",
             "cpu": [
                 "arm"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
-            "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.2.tgz",
+            "integrity": "sha512-V9Xg6eXtgBtHq2jnuQwM/jr2mwe2EycnopO8cbOvpzFuySCGtKlPCI3Hj9xup/pJK5Q0388qfZZy2DqV2J8ftw==",
             "cpu": [
                 "arm"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
-            "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.2.tgz",
+            "integrity": "sha512-uCFX9gtZJoQl2xDTpRdseYuNqyKkuMDtH6zSrBTA28yTfKyjN9hQ2B04N5ynR8ILCoSDOrG/Eg+J2TtJ1e/CSA==",
             "cpu": [
                 "arm64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
-            "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.2.tgz",
+            "integrity": "sha512-/PU9P+7Rkz8JFYDHIi+xzHabOu9qEWR07L5nWLIUsvserrxegZExKCi2jhMZRd0ATdboKylu/K5yAXbp7fYFvA==",
             "cpu": [
                 "arm64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
-            "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.2.tgz",
+            "integrity": "sha512-eCHmol/dT5odMYi/N0R0HC8V8QE40rEpkyje/ZAXJYNNoSfrObOvG/Mn+s1F/FJyB7co7UQZZf6FuWnN6a7f4g==",
             "cpu": [
                 "ppc64"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
-            "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.2.tgz",
+            "integrity": "sha512-DEP3Njr9/ADDln3kNi76PXonLMSSMiCir0VHXxmGSHxCxDfQ70oWjHcJGfiBugzaqmYdTC7Y+8Int6qbnxPBIQ==",
             "cpu": [
                 "riscv64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
-            "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.2.tgz",
+            "integrity": "sha512-NHGo5i6IE/PtEPh5m0yw5OmPMpesFnzMIS/lzvN5vknnC1sXM5Z/id5VgcNPgpD+wHmIcuYYgW+Q53v+9s96lQ==",
             "cpu": [
                 "s390x"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
-            "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz",
+            "integrity": "sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg==",
             "cpu": [
                 "x64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
-            "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz",
+            "integrity": "sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ==",
             "cpu": [
                 "x64"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
-            "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.2.tgz",
+            "integrity": "sha512-euMIv/4x5Y2/ImlbGl88mwKNXDsvzbWUlT7DFky76z2keajCtcbAsN9LUdmk31hAoVmJJYSThgdA0EsPeTr1+w==",
             "cpu": [
                 "arm64"
             ],
@@ -765,9 +765,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
-            "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.2.tgz",
+            "integrity": "sha512-RsnE6LQkUHlkC10RKngtHNLxb7scFykEbEwOFDjr3CeCMG+Rr+cKqlkKc2/wJ1u4u990urRHCbjz31x84PBrSQ==",
             "cpu": [
                 "ia32"
             ],
@@ -779,9 +779,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
-            "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.2.tgz",
+            "integrity": "sha512-foJM5vv+z2KQmn7emYdDLyTbkoO5bkHZE1oth2tWbQNGW7mX32d46Hz6T0MqXdWS2vBZhaEtHqdy9WYwGfiliA==",
             "cpu": [
                 "x64"
             ],
@@ -1187,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.59",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.59.tgz",
-            "integrity": "sha512-faAXB6+gEbC8FsiRdpOXgOe4snP49YwjiXynEB8Mp7sUx80W5eN+BnnBHJ/F7eIeLzs+QBfDD40bJMm97oEFcw==",
+            "version": "1.5.62",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.62.tgz",
+            "integrity": "sha512-t8c+zLmJHa9dJy96yBZRXGQYoiCEnHYgFwn1asvSPZSUdVxnB62A4RASd7k41ytG3ErFBA0TpHlKg9D9SQBmLg==",
             "dev": true,
             "license": "ISC"
         },
@@ -2199,9 +2199,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.26.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
-            "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
+            "version": "4.27.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.2.tgz",
+            "integrity": "sha512-KreA+PzWmk2yaFmZVwe6GB2uBD86nXl86OsDkt1bJS9p3vqWuEQ6HnJJ+j/mZi/q0920P99/MVRlB4L3crpF5w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2215,24 +2215,24 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.26.0",
-                "@rollup/rollup-android-arm64": "4.26.0",
-                "@rollup/rollup-darwin-arm64": "4.26.0",
-                "@rollup/rollup-darwin-x64": "4.26.0",
-                "@rollup/rollup-freebsd-arm64": "4.26.0",
-                "@rollup/rollup-freebsd-x64": "4.26.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.26.0",
-                "@rollup/rollup-linux-arm64-musl": "4.26.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.26.0",
-                "@rollup/rollup-linux-x64-gnu": "4.26.0",
-                "@rollup/rollup-linux-x64-musl": "4.26.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.26.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.26.0",
-                "@rollup/rollup-win32-x64-msvc": "4.26.0",
+                "@rollup/rollup-android-arm-eabi": "4.27.2",
+                "@rollup/rollup-android-arm64": "4.27.2",
+                "@rollup/rollup-darwin-arm64": "4.27.2",
+                "@rollup/rollup-darwin-x64": "4.27.2",
+                "@rollup/rollup-freebsd-arm64": "4.27.2",
+                "@rollup/rollup-freebsd-x64": "4.27.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.27.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.27.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.27.2",
+                "@rollup/rollup-linux-arm64-musl": "4.27.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.27.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.27.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.27.2",
+                "@rollup/rollup-linux-x64-gnu": "4.27.2",
+                "@rollup/rollup-linux-x64-musl": "4.27.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.27.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.27.2",
+                "@rollup/rollup-win32-x64-msvc": "4.27.2",
                 "fsevents": "~2.3.2"
             }
         },

resources/data/lang/en.json

@@ -189,5 +189,13 @@
     "Edit": "Edit",
     "Notes": "Notes",
     "Terms": "Terms",
-    "Ending Balance": "Ending Balance"
+    "Ending Balance": "Ending Balance",
+    "Default :Type :Category": "Default :Type :Category",
+    "Category": "Category",
+    "Configuration": "Configuration",
+    "Dates": "Dates",
+    "Adjustment Details": "Adjustment Details",
+    "Adjustments": "Adjustments",
+    "Sellable Configuration": "Sellable Configuration",
+    "Purchasable Configuration": "Purchasable Configuration"
 }

resources/views/filament/company/components/tables/columns/offering-status.blade.php

@@ -0,0 +1,8 @@
+<div class="flex items-center space-x-2 text-sm leading-6">
+    <span>{{ $getState() }}</span>
+    @if ($getRecord()->income_account_id && $getRecord()->expense_account_id)
+        <x-filament::badge>
+            Sell & Buy
+        </x-filament::badge>
+    @endif
+</div>

resources/views/filament/company/pages/accounting/chart.blade.php

@@ -76,7 +76,7 @@
                                         </td>
                                         <td colspan="1" class="es-table__cell px-4 py-4">
                                             <div>
-                                                @if($account->default === false)
+                                                @if($account->default === false && !$account->adjustment)
                                                     {{ ($this->editChartAction)(['chart' => $account->id]) }}
                                                 @endif
                                             </div>