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

Development 3.x

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

@@ -37,7 +37,7 @@ class OfferingResource extends Resource
                     ->label('Inactive adjustments')
                     ->warning()
                     ->icon('heroicon-o-exclamation-triangle')
-                    ->visible(fn (Offering $record) => $record->hasInactiveAdjustments())
+                    ->visible(fn (?Offering $record) => $record?->hasInactiveAdjustments())
                     ->columnSpanFull()
                     ->description(function (Offering $record) {
                         $inactiveAdjustments = collect();

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

@@ -9,6 +9,7 @@ use App\Enums\Accounting\BillStatus;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\PaymentMethod;
+use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Purchases\BillResource\Pages;
 use App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers\BillsRelationManager;
 use App\Filament\Forms\Components\CreateAdjustmentSelect;
@@ -37,8 +38,10 @@ use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 
 class BillResource extends Resource
@@ -83,19 +86,83 @@ class BillResource extends Resource
                                     ->required(),
                                 Forms\Components\TextInput::make('order_number')
                                     ->label('P.O/S.O Number'),
-                                Forms\Components\DatePicker::make('date')
+                                Cluster::make([
+                                    Forms\Components\DatePicker::make('date')
+                                        ->label('Bill date')
+                                        ->live()
+                                        ->default(now())
+                                        ->disabled(function (?Bill $record) {
+                                            return $record?->hasPayments();
+                                        })
+                                        ->columnSpan(2)
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            $date = $state;
+                                            $dueDate = $get('due_date');
+
+                                            if ($date && $dueDate && $date > $dueDate) {
+                                                $set('due_date', $date);
+                                            }
+
+                                            // Update due date based on payment terms if selected
+                                            $paymentTerms = $get('payment_terms');
+                                            if ($date && $paymentTerms && $paymentTerms !== 'custom') {
+                                                $terms = PaymentTerms::parse($paymentTerms);
+                                                $set('due_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                    Forms\Components\Select::make('payment_terms')
+                                        ->label('Payment terms')
+                                        ->options(function () {
+                                            return collect(PaymentTerms::cases())
+                                                ->mapWithKeys(function (PaymentTerms $paymentTerm) {
+                                                    return [$paymentTerm->value => $paymentTerm->getLabel()];
+                                                })
+                                                ->put('custom', 'Custom')
+                                                ->toArray();
+                                        })
+                                        ->selectablePlaceholder(false)
+                                        ->default($settings->payment_terms->value)
+                                        ->live()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            if (! $state || $state === 'custom') {
+                                                return;
+                                            }
+
+                                            $date = $get('date');
+                                            if ($date) {
+                                                $terms = PaymentTerms::parse($state);
+                                                $set('due_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                ])
                                     ->label('Bill date')
-                                    ->default(now())
-                                    ->disabled(function (?Bill $record) {
-                                        return $record?->hasPayments();
-                                    })
-                                    ->required(),
+                                    ->columns(3),
                                 Forms\Components\DatePicker::make('due_date')
                                     ->label('Due date')
                                     ->default(function () use ($company) {
                                         return now()->addDays($company->defaultBill->payment_terms->getDays());
                                     })
-                                    ->required(),
+                                    ->required()
+                                    ->live()
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                        if (! $state) {
+                                            return;
+                                        }
+
+                                        $date = $get('date');
+                                        $paymentTerms = $get('payment_terms');
+
+                                        if (! $date || $paymentTerms === 'custom') {
+                                            return;
+                                        }
+
+                                        $term = PaymentTerms::parse($paymentTerms);
+                                        $expected = Carbon::parse($date)->addDays($term->getDays());
+
+                                        if (! Carbon::parse($state)->isSameDay($expected)) {
+                                            $set('payment_terms', 'custom');
+                                        }
+                                    }),
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)

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

@@ -59,7 +59,7 @@ class ViewBill extends ViewRecord
                             ->label('Vendor')
                             ->color('primary')
                             ->weight(FontWeight::SemiBold)
-                            ->url(static fn (Bill $record) => VendorResource::getUrl('edit', ['record' => $record->vendor_id])),
+                            ->url(static fn (Bill $record) => VendorResource::getUrl('view', ['record' => $record->vendor_id])),
                         TextEntry::make('total')
                             ->label('Total')
                             ->currency(fn (Bill $record) => $record->currency_code),

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

@@ -59,7 +59,8 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
                 ->suffix('days'),
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageInvoiceTotal))
-                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+                ->suffix(CurrencyAccessor::getDefaultCurrency())
+                ->description('Excludes draft and voided invoices'),
         ];
     }
 }

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

@@ -8,6 +8,7 @@ use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\EstimateStatus;
+use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\EstimatesRelationManager;
 use App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
@@ -36,7 +37,9 @@ use Filament\Resources\Resource;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 
 class EstimateResource extends Resource
@@ -83,18 +86,53 @@ class EstimateResource extends Resource
                                     ->default(static fn () => Estimate::getNextDocumentNumber()),
                                 Forms\Components\TextInput::make('reference_number')
                                     ->label('Reference number'),
-                                Forms\Components\DatePicker::make('date')
-                                    ->label('Estimate date')
-                                    ->live()
-                                    ->default(now())
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                        $date = $state;
-                                        $expirationDate = $get('expiration_date');
+                                Cluster::make([
+                                    Forms\Components\DatePicker::make('date')
+                                        ->label('Estimate date')
+                                        ->live()
+                                        ->default(now())
+                                        ->columnSpan(2)
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            $date = $state;
+                                            $expirationDate = $get('expiration_date');
+
+                                            if ($date && $expirationDate && $date > $expirationDate) {
+                                                $set('expiration_date', $date);
+                                            }
 
-                                        if ($date && $expirationDate && $date > $expirationDate) {
-                                            $set('expiration_date', $date);
-                                        }
-                                    }),
+                                            $paymentTerms = $get('payment_terms');
+                                            if ($date && $paymentTerms && $paymentTerms !== 'custom') {
+                                                $terms = PaymentTerms::parse($paymentTerms);
+                                                $set('expiration_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                    Forms\Components\Select::make('payment_terms')
+                                        ->label('Payment terms')
+                                        ->options(function () {
+                                            return collect(PaymentTerms::cases())
+                                                ->mapWithKeys(function (PaymentTerms $paymentTerm) {
+                                                    return [$paymentTerm->value => $paymentTerm->getLabel()];
+                                                })
+                                                ->put('custom', 'Custom')
+                                                ->toArray();
+                                        })
+                                        ->selectablePlaceholder(false)
+                                        ->default($settings->payment_terms->value)
+                                        ->live()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            if (! $state || $state === 'custom') {
+                                                return;
+                                            }
+
+                                            $date = $get('date');
+                                            if ($date) {
+                                                $terms = PaymentTerms::parse($state);
+                                                $set('expiration_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                ])
+                                    ->label('Estimate date')
+                                    ->columns(3),
                                 Forms\Components\DatePicker::make('expiration_date')
                                     ->label('Expiration date')
                                     ->default(function () use ($settings) {
@@ -102,6 +140,26 @@ class EstimateResource extends Resource
                                     })
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
+                                    })
+                                    ->live()
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                        if (! $state) {
+                                            return;
+                                        }
+
+                                        $date = $get('date');
+                                        $paymentTerms = $get('payment_terms');
+
+                                        if (! $date || $paymentTerms === 'custom') {
+                                            return;
+                                        }
+
+                                        $term = PaymentTerms::parse($paymentTerms);
+                                        $expected = Carbon::parse($date)->addDays($term->getDays());
+
+                                        if (! Carbon::parse($state)->isSameDay($expected)) {
+                                            $set('payment_terms', 'custom');
+                                        }
                                     }),
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')

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

@@ -10,6 +10,7 @@ use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
+use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\InvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
@@ -41,8 +42,10 @@ use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 
 class InvoiceResource extends Resource
@@ -92,21 +95,57 @@ class InvoiceResource extends Resource
                                     ->default(static fn () => Invoice::getNextDocumentNumber()),
                                 Forms\Components\TextInput::make('order_number')
                                     ->label('P.O/S.O Number'),
-                                Forms\Components\DatePicker::make('date')
-                                    ->label('Invoice date')
-                                    ->live()
-                                    ->default(now())
-                                    ->disabled(function (?Invoice $record) {
-                                        return $record?->hasPayments();
-                                    })
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                        $date = $state;
-                                        $dueDate = $get('due_date');
+                                Cluster::make([
+                                    Forms\Components\DatePicker::make('date')
+                                        ->label('Invoice date')
+                                        ->live()
+                                        ->default(now())
+                                        ->disabled(function (?Invoice $record) {
+                                            return $record?->hasPayments();
+                                        })
+                                        ->columnSpan(2)
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            $date = $state;
+                                            $dueDate = $get('due_date');
+
+                                            if ($date && $dueDate && $date > $dueDate) {
+                                                $set('due_date', $date);
+                                            }
 
-                                        if ($date && $dueDate && $date > $dueDate) {
-                                            $set('due_date', $date);
-                                        }
-                                    }),
+                                            // Update due date based on payment terms if selected
+                                            $paymentTerms = $get('payment_terms');
+                                            if ($date && $paymentTerms && $paymentTerms !== 'custom') {
+                                                $terms = PaymentTerms::parse($paymentTerms);
+                                                $set('due_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                    Forms\Components\Select::make('payment_terms')
+                                        ->label('Payment terms')
+                                        ->options(function () {
+                                            return collect(PaymentTerms::cases())
+                                                ->mapWithKeys(function (PaymentTerms $paymentTerm) {
+                                                    return [$paymentTerm->value => $paymentTerm->getLabel()];
+                                                })
+                                                ->put('custom', 'Custom')
+                                                ->toArray();
+                                        })
+                                        ->selectablePlaceholder(false)
+                                        ->default($settings->payment_terms->value)
+                                        ->live()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                            if (! $state || $state === 'custom') {
+                                                return;
+                                            }
+
+                                            $date = $get('date');
+                                            if ($date) {
+                                                $terms = PaymentTerms::parse($state);
+                                                $set('due_date', Carbon::parse($date)->addDays($terms->getDays())->toDateString());
+                                            }
+                                        }),
+                                ])
+                                    ->label('Invoice date')
+                                    ->columns(3),
                                 Forms\Components\DatePicker::make('due_date')
                                     ->label('Payment due')
                                     ->default(function () use ($settings) {
@@ -114,6 +153,26 @@ class InvoiceResource extends Resource
                                     })
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
+                                    })
+                                    ->live()
+                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
+                                        if (! $state) {
+                                            return;
+                                        }
+
+                                        $invoiceDate = $get('date');
+                                        $paymentTerms = $get('payment_terms');
+
+                                        if (! $invoiceDate || $paymentTerms === 'custom') {
+                                            return;
+                                        }
+
+                                        $term = PaymentTerms::parse($paymentTerms);
+                                        $expectedDueDate = Carbon::parse($invoiceDate)->addDays($term->getDays());
+
+                                        if (! Carbon::parse($state)->isSameDay($expectedDueDate)) {
+                                            $set('payment_terms', 'custom');
+                                        }
                                     }),
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
@@ -509,7 +568,6 @@ class InvoiceResource extends Resource
                         ->successNotificationTitle('Invoices replicated successfully')
                         ->failureNotificationTitle('Failed to replicate invoices')
                         ->databaseTransaction()
-                        ->deselectRecordsAfterCompletion()
                         ->excludeAttributes([
                             'status',
                             'amount_paid',

resources/data/lang/en.json

@@ -201,5 +201,6 @@
     "Budget Details": "Budget Details",
     "Budget Items": "Budget Items",
     "Budget Allocations": "Budget Allocations",
-    "Account Selection": "Account Selection"
+    "Account Selection": "Account Selection",
+    "Custom": "Custom"
 }