wip

app/DTO/AccountTransactionDTO.php

@@ -14,6 +14,6 @@ class AccountTransactionDTO
         public string $credit,
         public string $balance,
         public ?TransactionType $type,
-        public ?string $tableAction,
+        public ?array $tableAction,
     ) {}
 }

app/Enums/Accounting/TransactionType.php

@@ -14,8 +14,6 @@ enum TransactionType: string implements HasLabel
     case Journal = 'journal';
     case Transfer = 'transfer';
 
-    case Approval = 'approval';
-
     public function getLabel(): ?string
     {
         return $this->name;

app/Filament/Company/Pages/Reports/AccountTransactions.php

@@ -17,6 +17,7 @@ use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
+use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
@@ -38,16 +39,17 @@ class AccountTransactions extends BaseReportPage
         $this->exportService = $exportService;
     }
 
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return 'max-w-8xl';
+    }
+
     protected function initializeDefaultFilters(): void
     {
         if (empty($this->getFilterState('selectedAccount'))) {
             $this->setFilterState('selectedAccount', 'all');
         }
 
-        if (empty($this->getFilterState('basis'))) {
-            $this->setFilterState('basis', 'accrual');
-        }
-
         if (empty($this->getFilterState('selectedEntity'))) {
             $this->setFilterState('selectedEntity', 'all');
         }
@@ -81,7 +83,7 @@ class AccountTransactions extends BaseReportPage
     public function filtersForm(Form $form): Form
     {
         return $form
-            ->columns(3)
+            ->columns(5)
             ->schema([
                 Select::make('selectedAccount')
                     ->label('Account')
@@ -95,13 +97,6 @@ class AccountTransactions extends BaseReportPage
                 ])->extraFieldWrapperAttributes([
                     'class' => 'report-hidden-label',
                 ]),
-                Select::make('basis')
-                    ->label('Accounting Basis')
-                    ->options([
-                        'accrual' => 'Accrual (Paid & Unpaid)',
-                        'cash' => 'Cash Basis (Paid)',
-                    ])
-                    ->selectablePlaceholder(false),
                 Select::make('selectedEntity')
                     ->label('Entity')
                     ->options($this->getEntityOptions())
@@ -162,7 +157,6 @@ class AccountTransactions extends BaseReportPage
             endDate: $this->getFormattedEndDate(),
             columns: $columns,
             accountId: $this->getFilterState('selectedAccount'),
-            basis: $this->getFilterState('basis'),
             entityId: $this->getFilterState('selectedEntity'),
         );
     }

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

@@ -15,7 +15,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyConverter;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
-use Carbon\CarbonInterface;
 use Closure;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -28,7 +27,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 
 class BillResource extends Resource
@@ -275,45 +273,35 @@ class BillResource extends Resource
     public static function table(Table $table): Table
     {
         return $table
+            ->defaultSort('due_date')
             ->columns([
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),
                 Tables\Columns\TextColumn::make('due_date')
                     ->label('Due')
-                    ->formatStateUsing(function (Tables\Columns\TextColumn $column, mixed $state) {
-                        if (blank($state)) {
-                            return null;
-                        }
-
-                        $date = Carbon::parse($state)
-                            ->setTimezone($timezone ?? $column->getTimezone());
-
-                        if ($date->isToday()) {
-                            return 'Today';
-                        }
-
-                        return $date->diffForHumans([
-                            'options' => CarbonInterface::ONE_DAY_WORDS,
-                        ]);
-                    })
+                    ->asRelativeDay()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('date')
                     ->date()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('bill_number')
                     ->label('Number')
-                    ->searchable(),
+                    ->searchable()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('vendor.name')
                     ->sortable(),
                 Tables\Columns\TextColumn::make('total')
-                    ->currency(),
+                    ->currency()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('amount_paid')
                     ->label('Amount Paid')
-                    ->currency(),
+                    ->currency()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('amount_due')
                     ->label('Amount Due')
-                    ->currency(),
+                    ->currency()
+                    ->sortable(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('vendor')
@@ -562,7 +550,7 @@ class BillResource extends Resource
     public static function getRelations(): array
     {
         return [
-            //
+            BillResource\RelationManagers\PaymentsRelationManager::class,
         ];
     }
 
@@ -571,6 +559,7 @@ class BillResource extends Resource
         return [
             'index' => Pages\ListBills::route('/'),
             'create' => Pages\CreateBill::route('/create'),
+            'view' => Pages\ViewBill::route('/{record}'),
             'edit' => Pages\EditBill::route('/{record}/edit'),
         ];
     }

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

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\BillResource;
+use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Models\Accounting\Bill;
+use Filament\Actions;
+use Filament\Infolists\Components\Section;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Infolists\Infolist;
+use Filament\Resources\Pages\ViewRecord;
+use Filament\Support\Enums\FontWeight;
+use Filament\Support\Enums\IconPosition;
+use Filament\Support\Enums\IconSize;
+
+class ViewBill extends ViewRecord
+{
+    protected static string $resource = BillResource::class;
+
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\ActionGroup::make([
+                Actions\EditAction::make(),
+                Actions\DeleteAction::make(),
+                Bill::getReplicateAction(),
+            ])
+                ->label('Actions')
+                ->button()
+                ->outlined()
+                ->dropdownPlacement('bottom-end')
+                ->icon('heroicon-c-chevron-down')
+                ->iconSize(IconSize::Small)
+                ->iconPosition(IconPosition::After),
+        ];
+    }
+
+    public function infolist(Infolist $infolist): Infolist
+    {
+        return $infolist
+            ->schema([
+                Section::make('Bill Details')
+                    ->columns(4)
+                    ->schema([
+                        TextEntry::make('bill_number')
+                            ->label('Invoice #'),
+                        TextEntry::make('status')
+                            ->badge(),
+                        TextEntry::make('vendor.name')
+                            ->label('Vendor')
+                            ->color('primary')
+                            ->weight(FontWeight::SemiBold)
+                            ->url(static fn (Bill $record) => VendorResource::getUrl('edit', ['record' => $record->vendor_id])),
+                        TextEntry::make('total')
+                            ->label('Total')
+                            ->money(),
+                        TextEntry::make('amount_due')
+                            ->label('Amount Due')
+                            ->money(),
+                        TextEntry::make('date')
+                            ->label('Date')
+                            ->date(),
+                        TextEntry::make('due_date')
+                            ->label('Due')
+                            ->asRelativeDay(),
+                        TextEntry::make('paid_at')
+                            ->label('Paid At')
+                            ->placeholder('Not Paid')
+                            ->date(),
+                    ]),
+            ]);
+    }
+}

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

@@ -0,0 +1,182 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BillResource\RelationManagers;
+
+use App\Enums\Accounting\PaymentMethod;
+use App\Enums\Accounting\TransactionType;
+use App\Filament\Company\Resources\Purchases\BillResource\Pages\ViewBill;
+use App\Models\Accounting\Bill;
+use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Closure;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Support\Colors\Color;
+use Filament\Support\Enums\FontWeight;
+use Filament\Support\Enums\MaxWidth;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'payments';
+
+    protected static ?string $modelLabel = 'Payment';
+
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
+    {
+        return $pageClass === ViewBill::class;
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->columns(1)
+            ->schema([
+                Forms\Components\DatePicker::make('posted_at')
+                    ->label('Date'),
+                Forms\Components\TextInput::make('amount')
+                    ->label('Amount')
+                    ->required()
+                    ->money()
+                    ->live(onBlur: true)
+                    ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
+                        if (! CurrencyConverter::isValidAmount($state)) {
+                            return null;
+                        }
+
+                        /** @var Bill $ownerRecord */
+                        $ownerRecord = $livewire->getOwnerRecord();
+
+                        $amountDue = $ownerRecord->getRawOriginal('amount_due');
+
+                        $amount = CurrencyConverter::convertToCents($state);
+
+                        if ($amount <= 0) {
+                            return 'Please enter a valid positive amount';
+                        }
+
+                        $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+
+                        $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+
+                        return match (true) {
+                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue),
+                            $newAmountDue === 0 => 'Bill will be fully paid',
+                            default => 'Amount exceeds bill total by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue)),
+                        };
+                    })
+                    ->rules([
+                        static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
+                            if (! CurrencyConverter::isValidAmount($value)) {
+                                $fail('Please enter a valid amount');
+                            }
+                        },
+                    ]),
+                Forms\Components\Select::make('payment_method')
+                    ->label('Payment Method')
+                    ->required()
+                    ->options(PaymentMethod::class),
+                Forms\Components\Select::make('bank_account_id')
+                    ->label('Account')
+                    ->required()
+                    ->options(BankAccount::query()
+                        ->get()
+                        ->pluck('account.name', 'id'))
+                    ->searchable(),
+                Forms\Components\Textarea::make('notes')
+                    ->label('Notes'),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('description')
+            ->columns([
+                Tables\Columns\TextColumn::make('posted_at')
+                    ->label('Date')
+                    ->sortable()
+                    ->defaultDateFormat(),
+                Tables\Columns\TextColumn::make('type')
+                    ->label('Type')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('description')
+                    ->label('Description')
+                    ->limit(30)
+                    ->toggleable(),
+                Tables\Columns\TextColumn::make('bankAccount.account.name')
+                    ->label('Account')
+                    ->toggleable(),
+                Tables\Columns\TextColumn::make('amount')
+                    ->label('Amount')
+                    ->weight(static fn (Transaction $transaction) => $transaction->reviewed ? null : FontWeight::SemiBold)
+                    ->color(
+                        static fn (Transaction $transaction) => match ($transaction->type) {
+                            TransactionType::Deposit => Color::rgb('rgb(' . Color::Green[700] . ')'),
+                            TransactionType::Journal => 'primary',
+                            default => null,
+                        }
+                    )
+                    ->sortable()
+                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->label('Record Payment')
+                    ->modalHeading(fn (Tables\Actions\CreateAction $action) => $action->getLabel())
+                    ->modalWidth(MaxWidth::TwoExtraLarge)
+                    ->visible(function () {
+                        return $this->getOwnerRecord()->canRecordPayment();
+                    })
+                    ->mountUsing(function (Form $form) {
+                        $record = $this->getOwnerRecord();
+                        $form->fill([
+                            'posted_at' => now(),
+                            'amount' => $record->amount_due,
+                        ]);
+                    })
+                    ->databaseTransaction()
+                    ->successNotificationTitle('Payment Recorded')
+                    ->action(function (Tables\Actions\CreateAction $action, array $data) {
+                        /** @var Bill $record */
+                        $record = $this->getOwnerRecord();
+
+                        $record->recordPayment($data);
+
+                        $action->success();
+
+                        $this->dispatch('refresh');
+                    }),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make()
+                    ->modalWidth(MaxWidth::TwoExtraLarge)
+                    ->after(fn () => $this->dispatch('refresh')),
+                Tables\Actions\DeleteAction::make()
+                    ->after(fn () => $this->dispatch('refresh')),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

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

@@ -1,50 +0,0 @@
-<?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

@@ -1,21 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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/InvoiceResource.php

@@ -18,7 +18,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyConverter;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
-use Carbon\CarbonInterface;
 use Closure;
 use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
@@ -32,7 +31,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
@@ -346,22 +344,7 @@ class InvoiceResource extends Resource
                     ->searchable(),
                 Tables\Columns\TextColumn::make('due_date')
                     ->label('Due')
-                    ->formatStateUsing(function (Tables\Columns\TextColumn $column, mixed $state) {
-                        if (blank($state)) {
-                            return null;
-                        }
-
-                        $date = Carbon::parse($state)
-                            ->setTimezone($timezone ?? $column->getTimezone());
-
-                        if ($date->isToday()) {
-                            return 'Today';
-                        }
-
-                        return $date->diffForHumans([
-                            'options' => CarbonInterface::ONE_DAY_WORDS,
-                        ]);
-                    })
+                    ->asRelativeDay()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('date')
                     ->date()

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

@@ -5,7 +5,6 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
-use Carbon\CarbonInterface;
 use Filament\Actions;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
@@ -14,7 +13,6 @@ use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
-use Illuminate\Support\Carbon;
 
 class ViewInvoice extends ViewRecord
 {
@@ -59,7 +57,7 @@ class ViewInvoice extends ViewRecord
                             ->label('Client')
                             ->color('primary')
                             ->weight(FontWeight::SemiBold)
-                            ->url(fn (Invoice $record) => ClientResource::getUrl('edit', ['record' => $record->client_id])),
+                            ->url(static fn (Invoice $record) => ClientResource::getUrl('edit', ['record' => $record->client_id])),
                         TextEntry::make('total')
                             ->label('Total')
                             ->money(),
@@ -71,22 +69,7 @@ class ViewInvoice extends ViewRecord
                             ->date(),
                         TextEntry::make('due_date')
                             ->label('Due')
-                            ->formatStateUsing(function (TextEntry $entry, mixed $state) {
-                                if (blank($state)) {
-                                    return null;
-                                }
-
-                                $date = Carbon::parse($state)
-                                    ->setTimezone($timezone ?? $entry->getTimezone());
-
-                                if ($date->isToday()) {
-                                    return 'Today';
-                                }
-
-                                return $date->diffForHumans([
-                                    'options' => CarbonInterface::ONE_DAY_WORDS,
-                                ]);
-                            }),
+                            ->asRelativeDay(),
                         TextEntry::make('approved_at')
                             ->label('Approved At')
                             ->placeholder('Not Approved')

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

@@ -1,50 +0,0 @@
-<?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

@@ -1,21 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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()->label('New Product or Service'),
-        ];
-    }
-
-    public function getHeading(): string | Htmlable
-    {
-        return 'Products & Services (Sales)';
-    }
-}

app/Providers/FilamentCompaniesServiceProvider.php

@@ -126,8 +126,8 @@ class FilamentCompaniesServiceProvider extends PanelProvider
                         ...OfferingResource::getNavigationItems(),
                     ])
                     ->groups([
-                        NavigationGroup::make('Sales & Payments')
-                            ->label('Sales & Payments')
+                        NavigationGroup::make('Sales')
+                            ->label('Sales')
                             ->icon('heroicon-o-currency-dollar')
                             ->items([
                                 ...InvoiceResource::getNavigationItems(),

app/Providers/MacroServiceProvider.php

@@ -10,10 +10,12 @@ use App\Models\Setting\Localization;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use BackedEnum;
+use Carbon\CarbonInterface;
 use Closure;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
+use Filament\Infolists\Components\TextEntry;
 use Filament\Tables\Columns\TextColumn;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
@@ -177,6 +179,48 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        TextColumn::macro('asRelativeDay', function (?string $timezone = null): static {
+            $this->formatStateUsing(function (TextColumn $column, mixed $state) use ($timezone) {
+                if (blank($state)) {
+                    return null;
+                }
+
+                $date = Carbon::parse($state)
+                    ->setTimezone($timezone ?? $column->getTimezone());
+
+                if ($date->isToday()) {
+                    return 'Today';
+                }
+
+                return $date->diffForHumans([
+                    'options' => CarbonInterface::ONE_DAY_WORDS,
+                ]);
+            });
+
+            return $this;
+        });
+
+        TextEntry::macro('asRelativeDay', function (?string $timezone = null): static {
+            $this->formatStateUsing(function (TextEntry $entry, mixed $state) use ($timezone) {
+                if (blank($state)) {
+                    return null;
+                }
+
+                $date = Carbon::parse($state)
+                    ->setTimezone($timezone ?? $entry->getTimezone());
+
+                if ($date->isToday()) {
+                    return 'Today';
+                }
+
+                return $date->diffForHumans([
+                    'options' => CarbonInterface::ONE_DAY_WORDS,
+                ]);
+            });
+
+            return $this;
+        });
+
         Money::macro('swapAmountFor', function ($newCurrency) {
             $oldCurrency = $this->currency->getCurrency();
             $balanceInSubunits = $this->getAmount();

app/Services/AccountService.php

@@ -113,9 +113,9 @@ class AccountService
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 
-    public function getTransactionDetailsSubquery(string $startDate, string $endDate, string $basis = 'accrual', ?string $entityId = null): Closure
+    public function getTransactionDetailsSubquery(string $startDate, string $endDate, ?string $entityId = null): Closure
     {
-        return static function ($query) use ($startDate, $endDate, $basis, $entityId) {
+        return static function ($query) use ($startDate, $endDate, $entityId) {
             $query->select(
                 'journal_entries.id',
                 'journal_entries.account_id',
@@ -128,14 +128,7 @@ class AccountService
                 ->whereBetween('transactions.posted_at', [$startDate, $endDate])
                 ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
                 ->orderBy('transactions.posted_at')
-                ->with('transaction:id,type,description,posted_at');
-
-            if ($basis === 'cash') {
-                $query->where(function ($query) {
-                    $query->whereNull('transactions.transactionable_id')
-                        ->orWhere('transactions.is_payment', true);
-                });
-            }
+                ->with('transaction:id,type,description,posted_at,is_payment,transactionable_id,transactionable_type');
 
             if ($entityId) {
                 $entityId = (int) $entityId;

app/Services/ReportService.php

@@ -12,6 +12,7 @@ use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\Transaction;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -152,7 +153,7 @@ class ReportService
         return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
     }
 
-    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all', ?string $basis = 'accrual', ?string $entityId = 'all'): ReportDTO
+    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all', ?string $entityId = 'all'): ReportDTO
     {
         $columns ??= [];
         $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
@@ -164,7 +165,7 @@ class ReportService
         $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)
             ->orderByRaw('LENGTH(code), code');
 
-        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate, $basis, $entityId)])->get();
+        $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate, $entityId)])->get();
 
         $reportCategories = [];
 
@@ -208,7 +209,7 @@ class ReportService
                     credit: $journalEntry->type->isCredit() ? $formattedAmount : '',
                     balance: money($currentBalance, $defaultCurrency)->format(),
                     type: $transaction->type,
-                    tableAction: $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction'
+                    tableAction: $this->determineTableAction($transaction),
                 );
             }
 
@@ -246,6 +247,23 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
+    private function determineTableAction(Transaction $transaction): array
+    {
+        if ($transaction->transactionable_type === null || $transaction->is_payment) {
+            return [
+                'type' => 'transaction',
+                'action' => $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction',
+                'id' => $transaction->id,
+            ];
+        }
+
+        return [
+            'type' => 'transactionable',
+            'model' => $transaction->transactionable_type,
+            'id' => $transaction->transactionable_id,
+        ];
+    }
+
     public function buildTrialBalanceReport(string $trialBalanceType, string $asOfDate, array $columns = []): ReportDTO
     {
         $asOfDateCarbon = Carbon::parse($asOfDate);

resources/views/components/company/tables/reports/account-transactions.blade.php

@@ -1,3 +1,12 @@
+@php
+    use App\Filament\Company\Pages\Accounting\Transactions;
+    use App\Models\Accounting\Bill;
+    use App\Filament\Company\Resources\Purchases\BillResource\Pages\ViewBill;
+    use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ViewInvoice;
+
+    $iconPosition = \Filament\Support\Enums\IconPosition::After;
+@endphp
+
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
     <x-company.tables.header :headers="$report->getHeaders()" :alignmentClass="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $categoryIndex => $category)
@@ -41,19 +50,34 @@
                         >
                             @if(is_array($cell) && isset($cell['description']))
                                 @if(isset($cell['id']) && $cell['tableAction'])
-                                    <x-filament::link
-                                        :href="\App\Filament\Company\Pages\Accounting\Transactions::getUrl(parameters: [
-                                            'tableAction' => $cell['tableAction'],
-                                            'tableActionRecord' => $cell['id'],
-                                        ])"
-                                        target="_blank"
-                                        color="primary"
-                                        icon="heroicon-o-arrow-top-right-on-square"
-                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
-                                        icon-size="w-4 h-4 min-w-4 min-h-4"
-                                    >
-                                        {{ $cell['description'] }}
-                                    </x-filament::link>
+                                    @if($cell['tableAction']['type'] === 'transaction')
+                                        <x-filament::link
+                                            :href="Transactions::getUrl(parameters: [
+                                                'tableAction' => $cell['tableAction']['action'],
+                                                'tableActionRecord' => $cell['tableAction']['id'],
+                                            ])"
+                                            target="_blank"
+                                            color="primary"
+                                            icon="heroicon-o-arrow-top-right-on-square"
+                                            :icon-position="$iconPosition"
+                                            icon-size="w-4 h-4 min-w-4 min-h-4"
+                                        >
+                                            {{ $cell['description'] }}
+                                        </x-filament::link>
+                                    @else
+                                        <x-filament::link
+                                            :href="$cell['tableAction']['model'] === Bill::class
+                                                ? ViewBill::getUrl(['record' => $cell['tableAction']['id']])
+                                                : ViewInvoice::getUrl(['record' => $cell['tableAction']['id']])"
+                                            target="_blank"
+                                            color="primary"
+                                            icon="heroicon-o-arrow-top-right-on-square"
+                                            :icon-position="$iconPosition"
+                                            icon-size="w-4 h-4 min-w-4 min-h-4"
+                                        >
+                                            {{ $cell['description'] }}
+                                        </x-filament::link>
+                                    @endif
                                 @else
                                     {{ $cell['description'] }}
                                 @endif