diff --git a/.github/DOCKER.md b/.github/DOCKER.md index 4d40d9ac..aa80503c 100644 --- a/.github/DOCKER.md +++ b/.github/DOCKER.md @@ -44,21 +44,38 @@ Visit: http://localhost:8080 (override the port with `APP_PORT` in `.env`). Both PHP images ship the full extension set the app needs: `intl`, `gd`, `pdo_mysql`, `bcmath`, `zip`, `exif`, `soap`, `redis`. The CLI image also has -Composer, a 1G memory limit for the test suite, and bundled `pdo_sqlite` -(the suite runs on an in-memory sqlite database — no db service needed for -tests). +Composer and a 1G memory limit for the test suite. --- ## Running the test suite ```bash -docker compose run --rm cli vendor/bin/phpunit --exclude-group failing,troubleshooting +docker compose run --rm cli php artisan test --exclude-group failing,troubleshooting ``` -`APP_ENV=testing` is the `cli` service default, so `.env.testing` -(sqlite `:memory:`) is picked up automatically. See `RUNNING_TESTS.md` for -filters, groups, and suites. +Use `php artisan test`, not `vendor/bin/phpunit` directly — the two have been observed to behave +differently for this app: a raw `vendor/bin/phpunit` run silently drops some submitted field +values in Livewire form tests. `artisan test` is the proven-reliable path and is what CI uses, so +standardize on it. + +**Known issue (see [#689](https://github.com/InvoicePlane/InvoicePlane-v2/issues/689)):** a +freshly-`docker compose build`'t `cli` image has, at least once, reproduced this same +field-dropping bug at scale (100+ false failures) even under `artisan test`, for reasons not yet +isolated — despite extension/ini parity with a known-good image. Before trusting a full local run +from a rebuilt `cli` image, sanity-check it against a small, known test first, e.g.: +```bash +docker compose run --rm cli php artisan test --filter=ContactsTest +``` +All 11 assertions should pass. If any fail with "field is required" errors on data you know you +supplied, don't trust the rest of that run — see the linked issue. + +`APP_ENV=testing` is the `cli` service default, and it always connects to +the compose stack's real `db` service (MariaDB) for tests — the `cli` +service injects `DB_CONNECTION=mysql`/`DB_HOST=db`/etc. itself, so nothing +in `.env.testing` needs editing. This intentionally does not fall back to +SQLite: SQLite's lenient identifier quoting has masked real bugs before that +only surfaced against MariaDB in CI. ### File ownership on Linux diff --git a/.gitignore b/.gitignore index f81cd96c..f324afa6 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,15 @@ actual-real-resolved-issues.md current-issues.md merge-order.md "saving some issues.md" +issues_full.json +refine-issues.json +/plans/ +feature-parity.md +issues_index.json +parity-results.md +report-2026-07-18.md +results-transcript.md +summary-feature-parity.md +plan-2026-07-19.md +storage/dompdf_log +untouched.json diff --git a/AGENTS.md b/AGENTS.md index ef004d0d..a5a1361b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -10,10 +10,9 @@ Laravel 11 + Filament v4 + Livewire v3 invoicing app. Modular architecture via ` composer install cp .env.example .env && php artisan key:generate php artisan migrate && php artisan db:seed -# Tests (no MySQL locally? use SQLite) +# Tests run against real MariaDB — no SQLite fallback (parity with CI) cp .env.testing.example .env.testing -# set DB_CONNECTION=sqlite, DB_DATABASE=:memory: in .env.testing -php artisan test +docker compose run --rm cli php artisan test --exclude-group failing,troubleshooting ``` --- diff --git a/CLAUDE.md b/CLAUDE.md index 700cbeac..f50c1634 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2,7 +2,15 @@ ## What this is -Laravel 11 + Filament v4 + Livewire v3 invoicing app. Modular architecture via `nwidart/laravel-modules`. PHP 8.1+ enums, Spatie roles/permissions, multi-tenancy via Filament's built-in tenant system scoped to `Company`. +Laravel 13 + Filament v5 + Livewire v4 invoicing app. Modular architecture via `nwidart/laravel-modules` v13. PHP 8.3+ (dev box: 8.4.23), Spatie roles/permissions, multi-tenancy via Filament's built-in tenant system scoped to `Company`. + +**Resolved versions** (from `composer.lock`): +- `laravel/framework` 13.15.0 (PHP ^8.3) +- `filament/filament` 5.6.7 (+ 9 sub-packages @ 5.6.7) +- `livewire/livewire` 4.3.1 +- `nwidart/laravel-modules` 13.0.0 +- `spatie/laravel-permission` 8.0.0 +- `danharrin/livewire-rate-limiting` 2.2.0 --- @@ -187,11 +195,21 @@ User::factory()->create(['is_active' => true, 'email_verified_at' => now()]) ### DB for tests -Tests need a DB. Production CI uses MariaDB 11. For local dev without MySQL, set in `.env.testing`: +Tests need a real MariaDB DB — matching CI (MariaDB 11) — not SQLite. SQLite's lenient identifier +quoting has silently masked real bugs before (e.g. `->latest()` defaulting to a nonexistent +`created_at` column on `$timestamps = false` models passed locally, failed on CI). Run via the +`cli` compose service, which points at the stack's `db` service automatically: ``` -DB_CONNECTION=sqlite -DB_DATABASE=:memory: +docker compose run --rm cli php artisan test --exclude-group failing,troubleshooting ``` +No `.env.testing` edits needed — the `cli` service injects `DB_CONNECTION=mysql`/`DB_HOST=db` etc. +itself. Use `php artisan test`, not `vendor/bin/phpunit` directly — the two have been observed to +behave differently for this app's Livewire form tests; `artisan test` is the reliable one. +**Known issue:** a freshly-rebuilt `cli` image has reproduced false Livewire-form failures at +scale even under `artisan test`, for reasons not yet isolated — see +[#689](https://github.com/InvoicePlane/InvoicePlane-v2/issues/689) and sanity-check with +`--filter=ContactsTest` (should be 11/11 passing) before trusting a full run from a rebuilt image. +See `.github/DOCKER.md`. ### AAA phase comment style diff --git a/Makefile b/Makefile index 754ccdc0..8228ff1a 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,13 @@ ## InvoicePlane v2 — Development Makefile ## ────────────────────────────────────────────────────────────────────────────── ## +## NOTE: `vendor/bin/phpunit` (used by the targets below) and `php artisan +## test` (make artisan-test) have been observed to behave differently for +## this app — a raw phpunit run has silently dropped submitted field values +## in Livewire form tests in some environments. If a target below reports a +## failure that `make artisan-filter FILTER="..."` doesn't reproduce, prefer +## the artisan-test variant; it matches what CI runs. +## ## QUICK START ## make test Run the full PHPUnit suite (all tests) ## make smoke Run only @group smoke tests (fast sanity check) diff --git a/Modules/Core/Database/Factories/CompanyUserFactory.php b/Modules/Core/Database/Factories/CompanyUserFactory.php index 8cba3bca..3a1857bb 100644 --- a/Modules/Core/Database/Factories/CompanyUserFactory.php +++ b/Modules/Core/Database/Factories/CompanyUserFactory.php @@ -2,8 +2,8 @@ namespace Modules\Core\Database\Factories; -use Modules\Core\Models\CompanyUser; use Modules\Core\Models\Company; +use Modules\Core\Models\CompanyUser; use Modules\Core\Models\User; class CompanyUserFactory extends AbstractFactory diff --git a/Modules/Core/Database/Factories/CustomFieldValueFactory.php b/Modules/Core/Database/Factories/CustomFieldValueFactory.php index 4c603c85..b7bf5245 100644 --- a/Modules/Core/Database/Factories/CustomFieldValueFactory.php +++ b/Modules/Core/Database/Factories/CustomFieldValueFactory.php @@ -13,10 +13,10 @@ class CustomFieldValueFactory extends AbstractFactory public function definition(): array { - $company = $this->resolveCompany() ?? Company::factory()->create(); + $company = $this->resolveCompany() ?? Company::factory()->create(); $customField = CustomField::query()->where('company_id', $company->id)->inRandomOrder()->first() ?? CustomField::factory()->for($company)->create(); - $fieldable = Relation::factory()->for($company)->create(); + $fieldable = Relation::factory()->for($company)->create(); return [ 'company_id' => $company->id, diff --git a/Modules/Core/Database/Factories/NoteFactory.php b/Modules/Core/Database/Factories/NoteFactory.php index 484988a2..7d45cb5a 100644 --- a/Modules/Core/Database/Factories/NoteFactory.php +++ b/Modules/Core/Database/Factories/NoteFactory.php @@ -13,8 +13,8 @@ class NoteFactory extends AbstractFactory public function definition(): array { - $company = $this->resolveCompany() ?? Company::factory()->create(); - $notable = Relation::factory()->for($company)->create(); + $company = $this->resolveCompany() ?? Company::factory()->create(); + $notable = Relation::factory()->for($company)->create(); return [ 'company_id' => $company->id, diff --git a/Modules/Core/Filament/Company/Pages/CompanySettings.php b/Modules/Core/Filament/Company/Pages/CompanySettings.php new file mode 100644 index 00000000..202c8a54 --- /dev/null +++ b/Modules/Core/Filament/Company/Pages/CompanySettings.php @@ -0,0 +1,101 @@ + + */ + public array $data = []; + + protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-cog-6-tooth'; + + protected string $view = 'core::filament.company.pages.company-settings'; + + public function mount(): void + { + $this->company = filament()->getTenant(); + $this->form->fill([ + 'show_line_item_position_numbers' => $this->company->getSettingBool('show_line_item_position_numbers', false), + ]); + } + + public function save(): void + { + $data = $this->form->getState(); + + $this->company->setSetting('show_line_item_position_numbers', $data['show_line_item_position_numbers']); + + $this->notifySuccess(); + } + + protected function getFormStatePath(): ?string + { + return 'data'; + } + + protected function getCachedFormActions(): array + { + return $this->getFormActions(); + } + + protected function getFormActions(): array + { + return [ + Action::make('save') + ->label(__('filament-panels::resources/pages/edit-record.form.actions.save.label')) + ->submit('save'), + ]; + } + + protected function hasFullWidthFormActions(): bool + { + return false; + } + + protected function getFormSchema(): array + { + return [ + Tabs::make('Company Settings') + ->tabs([ + Tab::make(trans('ip.invoices')) + ->schema([ + Section::make(trans('ip.invoice_settings')) + ->columns(1) + ->schema([ + Toggle::make('show_line_item_position_numbers') + ->label(trans('ip.show_line_item_position_numbers')) + ->helperText(trans('ip.show_line_item_position_numbers_help')) + ->default(false), + ]), + ]), + ]) + ->vertical(true), + ]; + } + + protected function notifySuccess(): void + { + \Filament\Notifications\Notification::make() + ->success() + ->title(__('filament-panels::resources/pages/edit-record.notifications.saved.title')) + ->send(); + } +} diff --git a/Modules/Core/Models/Company.php b/Modules/Core/Models/Company.php index bf07848c..1735dbcd 100644 --- a/Modules/Core/Models/Company.php +++ b/Modules/Core/Models/Company.php @@ -284,6 +284,28 @@ public function getCurrentTenantLabel(): string return $this->name; } + public function getSetting(string $key, mixed $default = null): mixed + { + $value = Setting::getByKey($this->getSettingKey($key)); + + return $value !== null ? $value : $default; + } + + public function getSettingBool(string $key, bool $default = false): bool + { + return Setting::getBool($this->getSettingKey($key), $default); + } + + public function setSetting(string $key, mixed $value): void + { + Setting::saveByKey($this->getSettingKey($key), $value); + } + + private function getSettingKey(string $key): string + { + return "{$key}_company_{$this->id}"; + } + /* |-------------------------------------------------------------------------- | Accessors diff --git a/Modules/Core/Providers/CompanyPanelProvider.php b/Modules/Core/Providers/CompanyPanelProvider.php index 8279f12a..a5163244 100644 --- a/Modules/Core/Providers/CompanyPanelProvider.php +++ b/Modules/Core/Providers/CompanyPanelProvider.php @@ -24,6 +24,7 @@ use Modules\Clients\Filament\Company\Resources\Relations\RelationResource; use Modules\Core\Enums\UserRole; use Modules\Core\Filament\Company\Pages\Auth\EditProfile; +use Modules\Core\Filament\Company\Pages\CompanySettings; use Modules\Core\Filament\Company\Pages\Dashboard; use Modules\Core\Filament\Company\Pages\MyCompanies; use Modules\Core\Filament\Company\Resources\NoteTemplates\NoteTemplateResource; @@ -179,6 +180,7 @@ public function panel(Panel $panel): Panel Dashboard::class, EditProfile::class, MyCompanies::class, + CompanySettings::class, ]) ->widgets([ RecentQuotesWidget::class, @@ -244,6 +246,10 @@ public function panel(Panel $panel): Panel NavigationGroup::make('Settings') //->icon('heroicon-o-cog-6-tooth') ->items([ + NavigationItem::make('Company Settings') + ->icon('heroicon-o-cog-6-tooth') + ->url(CompanySettings::getUrl(['tenant' => $tenant])) + ->isActiveWhen(fn (): bool => request()->routeIs('filament.company.pages.company-settings')), ...NoteTemplateResource::getNavigationItems(), ]), ]); diff --git a/Modules/Core/Tests/Feature/CompanySettingsTest.php b/Modules/Core/Tests/Feature/CompanySettingsTest.php new file mode 100644 index 00000000..73baeb5d --- /dev/null +++ b/Modules/Core/Tests/Feature/CompanySettingsTest.php @@ -0,0 +1,70 @@ +assertFalse($this->company->getSettingBool('show_line_item_position_numbers')); + + /* Act */ + $component = Livewire::actingAs($this->user) + ->test(CompanySettings::class, [ + 'tenant' => Str::lower($this->company->search_code), + ]) + ->fillForm(['show_line_item_position_numbers' => true]) + ->call('save'); + + /* Assert */ + $component->assertSuccessful(); + $this->assertTrue($this->company->fresh()->getSettingBool('show_line_item_position_numbers')); + } + + #[Test] + public function it_loads_the_setting_value_on_mount(): void + { + /* Arrange */ + $this->company->setSetting('show_line_item_position_numbers', true); + + /* Act */ + $component = Livewire::actingAs($this->user) + ->test(CompanySettings::class, [ + 'tenant' => Str::lower($this->company->search_code), + ]); + + /* Assert */ + $component->assertFormSet([ + 'show_line_item_position_numbers' => true, + ]); + } + + #[Test] + public function it_can_disable_the_setting(): void + { + /* Arrange */ + $this->company->setSetting('show_line_item_position_numbers', true); + $this->assertTrue($this->company->fresh()->getSettingBool('show_line_item_position_numbers')); + + /* Act */ + $component = Livewire::actingAs($this->user) + ->test(CompanySettings::class, [ + 'tenant' => Str::lower($this->company->search_code), + ]) + ->fillForm(['show_line_item_position_numbers' => false]) + ->call('save'); + + /* Assert */ + $component->assertSuccessful(); + $this->assertFalse($this->company->fresh()->getSettingBool('show_line_item_position_numbers')); + } +} diff --git a/Modules/Core/Tests/Feature/Seeders/RoleHasPermissionsSeederTest.php b/Modules/Core/Tests/Feature/Seeders/RoleHasPermissionsSeederTest.php index a7710122..87202027 100644 --- a/Modules/Core/Tests/Feature/Seeders/RoleHasPermissionsSeederTest.php +++ b/Modules/Core/Tests/Feature/Seeders/RoleHasPermissionsSeederTest.php @@ -35,7 +35,7 @@ public function a_role_receives_a_newly_added_default_permission_on_rerun(): voi $newPermission = Permission::create(['name' => 'view-a-brand-new-thing', 'guard_name' => 'web']); app(PermissionRegistrar::class)->forgetCachedPermissions(); - $seeder = new class extends RoleHasPermissionsSeeder { + $seeder = new class () extends RoleHasPermissionsSeeder { protected function getDefaultPermissionsForRole(string $roleName): array { $permissions = parent::getDefaultPermissionsForRole($roleName); diff --git a/Modules/Core/resources/views/filament/company/pages/company-settings.blade.php b/Modules/Core/resources/views/filament/company/pages/company-settings.blade.php new file mode 100644 index 00000000..7bdbbb19 --- /dev/null +++ b/Modules/Core/resources/views/filament/company/pages/company-settings.blade.php @@ -0,0 +1,10 @@ + +
+ {{ $this->form }} + + + +
 diff --git a/Modules/Expenses/Filament/Company/Widgets/RecentExpensesWidget.php b/Modules/Expenses/Filament/Company/Widgets/RecentExpensesWidget.php index 6157587b..d779e5cc 100644 --- a/Modules/Expenses/Filament/Company/Widgets/RecentExpensesWidget.php +++ b/Modules/Expenses/Filament/Company/Widgets/RecentExpensesWidget.php @@ -30,7 +30,7 @@ public function table(Table $table): Table protected function getTableQuery(): Builder|Relation|null { /** @var Builder $query */ - $query = Expense::query()->latest()->limit(10); + $query = Expense::query()->latest('id')->limit(10); return $query; } diff --git a/Modules/Expenses/Observers/ExpenseObserver.php b/Modules/Expenses/Observers/ExpenseObserver.php index a5ee0334..ffdc5d42 100644 --- a/Modules/Expenses/Observers/ExpenseObserver.php +++ b/Modules/Expenses/Observers/ExpenseObserver.php @@ -4,6 +4,4 @@ use Modules\Core\Observers\AbstractObserver; -class ExpenseObserver extends AbstractObserver -{ -} +class ExpenseObserver extends AbstractObserver {} diff --git a/Modules/Invoices/Filament/Company/Resources/Invoices/Schemas/InvoiceForm.php b/Modules/Invoices/Filament/Company/Resources/Invoices/Schemas/InvoiceForm.php index d161568c..34c198b2 100644 --- a/Modules/Invoices/Filament/Company/Resources/Invoices/Schemas/InvoiceForm.php +++ b/Modules/Invoices/Filament/Company/Resources/Invoices/Schemas/InvoiceForm.php @@ -23,6 +23,7 @@ use Modules\Invoices\Support\InvoiceCalculator; use Modules\Invoices\Support\InvoiceNumberGenerator; use Modules\Products\Models\Product; +use function collect; class InvoiceForm { @@ -161,6 +162,7 @@ public static function configure(Schema $schema): Schema ->schema([ Grid::make(6) // Adjust the number of columns as needed ->schema([ + ...self::getPositionNumberSchema(), Select::make('product_id') ->label(trans('ip.product')) ->options(Product::query()->pluck('product_name', 'id')->toArray()) @@ -292,6 +294,45 @@ public static function configure(Schema $schema): Schema ]); } + private static function getPositionNumberSchema(): array + { + $company = Filament::getTenant(); + + if (! $company || ! $company->getSettingBool('show_line_item_position_numbers')) { + return []; + } + + return [ + Placeholder::make('position_number') + ->label(trans('ip.position')) + ->columnSpan(1) + ->content(function ($getParent, $get) { + $items = $getParent('invoiceItems'); + + if (! is_array($items) || empty($items)) { + return '1'; + } + + $currentProductId = $get('product_id'); + $position = 1; + + foreach ($items as $item) { + if (! is_array($item)) { + continue; + } + + if (($item['product_id'] ?? null) === $currentProductId) { + return (string) $position; + } + + $position++; + } + + return (string) $position; + }), + ]; + } + /** * Generate an invoice number for the create form, respecting the * generate_invoice_number_for_draft setting (default true) for draft diff --git a/Modules/Invoices/Tests/Feature/InvoiceDuplicateNumberPreventionTest.php b/Modules/Invoices/Tests/Feature/InvoiceDuplicateNumberPreventionTest.php index 19d39ff2..0549abc7 100644 --- a/Modules/Invoices/Tests/Feature/InvoiceDuplicateNumberPreventionTest.php +++ b/Modules/Invoices/Tests/Feature/InvoiceDuplicateNumberPreventionTest.php @@ -7,7 +7,6 @@ use Modules\Core\Tests\AbstractAdminPanelTestCase; use Modules\Invoices\Enums\InvoiceStatus; use Modules\Invoices\Models\Invoice; -use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\Test; use RuntimeException; diff --git a/Modules/Invoices/Tests/Feature/RecurringInvoicesTest.php b/Modules/Invoices/Tests/Feature/RecurringInvoicesTest.php index 8b05cc67..6ebf0539 100644 --- a/Modules/Invoices/Tests/Feature/RecurringInvoicesTest.php +++ b/Modules/Invoices/Tests/Feature/RecurringInvoicesTest.php @@ -31,11 +31,11 @@ public function it_lists_recurring_invoices(): void $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -66,11 +66,11 @@ public function it_creates_recurring_invoice_with_items(): void $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -106,11 +106,11 @@ public function it_fails_without_items(): void $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -134,11 +134,11 @@ public function it_fails_without_frequency(): void $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -173,11 +173,11 @@ public function it_fails_to_create_recurringinvoice_without_required_start_at(): { $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -207,11 +207,11 @@ public function it_fails_if_end_at_is_before_today(): void $this->markTestIncomplete(); /* arrange */ - $company = $this->user->companies()->first(); - $user = $this->user; - $customer = Relation::factory()->for($company)->customer()->create(); - $invoice = Invoice::factory()->for($company)->create(); - $product = Product::factory()->for($company)->create(); + $company = $this->user->companies()->first(); + $user = $this->user; + $customer = Relation::factory()->for($company)->customer()->create(); + $invoice = Invoice::factory()->for($company)->create(); + $product = Product::factory()->for($company)->create(); /** @payload */ $payload = [ @@ -288,12 +288,12 @@ public function it_fails_to_update_recurringinvoice_when_required_fields_are_mis $record = RecurringInvoice::factory()->create(); $payload = [ - 'company_id' => 'Value', - 'invoice_id' => 'Value', + 'company_id' => 'Value', + 'invoice_id' => 'Value', 'numbering_id' => 'Value', - 'frequency' => 'Value', - 'start_at' => '2025-04-30', - 'end_at' => '2025-04-30', + 'frequency' => 'Value', + 'start_at' => '2025-04-30', + 'end_at' => '2025-04-30', ]; /* act */ diff --git a/Modules/Invoices/resources/views/pdf/invoice.blade.php b/Modules/Invoices/resources/views/pdf/invoice.blade.php index 15e6bc1a..27ecc962 100644 --- a/Modules/Invoices/resources/views/pdf/invoice.blade.php +++ b/Modules/Invoices/resources/views/pdf/invoice.blade.php @@ -31,6 +31,9 @@ + @if ($invoice->company?->getSettingBool('show_line_item_position_numbers')) + + @endif @@ -41,6 +44,9 @@ @foreach ($invoice->invoiceItems as $item) + @if ($invoice->company?->getSettingBool('show_line_item_position_numbers')) + + @endif
{{ trans('ip.position') }}{{ trans('ip.item') }} {{ trans('ip.quantity') }} {{ trans('ip.price') }}
{{ $loop->iteration }} {{ $item->item_name }} @if ($item->description) diff --git a/Modules/Payments/Filament/Company/Widgets/RecentPaymentsWidget.php b/Modules/Payments/Filament/Company/Widgets/RecentPaymentsWidget.php index b8b81a67..b45185e3 100644 --- a/Modules/Payments/Filament/Company/Widgets/RecentPaymentsWidget.php +++ b/Modules/Payments/Filament/Company/Widgets/RecentPaymentsWidget.php @@ -28,7 +28,7 @@ public function table(Table $table): Table protected function getTableQuery(): Builder|Relation|null { /** @var Builder $query */ - $query = Payment::query()->latest()->limit(10); + $query = Payment::query()->latest('id')->limit(10); return $query; } diff --git a/Modules/Payments/Observers/PaymentObserver.php b/Modules/Payments/Observers/PaymentObserver.php index 26abedaf..27d03bbe 100644 --- a/Modules/Payments/Observers/PaymentObserver.php +++ b/Modules/Payments/Observers/PaymentObserver.php @@ -4,6 +4,4 @@ use Modules\Core\Observers\AbstractObserver; -class PaymentObserver extends AbstractObserver -{ -} +class PaymentObserver extends AbstractObserver {} diff --git a/Modules/Projects/Filament/Company/Widgets/RecentProjectsWidget.php b/Modules/Projects/Filament/Company/Widgets/RecentProjectsWidget.php index 5a3b2151..48d50131 100644 --- a/Modules/Projects/Filament/Company/Widgets/RecentProjectsWidget.php +++ b/Modules/Projects/Filament/Company/Widgets/RecentProjectsWidget.php @@ -30,7 +30,7 @@ public function table(Table $table): Table protected function getTableQuery(): Builder|Relation|null { /** @var Builder $query */ - $query = Project::query()->latest()->limit(10); + $query = Project::query()->latest('id')->limit(10); return $query; } diff --git a/Modules/Projects/Filament/Company/Widgets/RecentTasksWidget.php b/Modules/Projects/Filament/Company/Widgets/RecentTasksWidget.php index d98a00de..7dc6cdfc 100644 --- a/Modules/Projects/Filament/Company/Widgets/RecentTasksWidget.php +++ b/Modules/Projects/Filament/Company/Widgets/RecentTasksWidget.php @@ -30,7 +30,7 @@ public function table(Table $table): Table protected function getTableQuery(): Builder|Relation|null { /** @var Builder $query */ - $query = Task::query()->latest()->limit(10); + $query = Task::query()->latest('id')->limit(10); return $query; } diff --git a/Modules/Quotes/Tests/Feature/QuoteDuplicateNumberPreventionTest.php b/Modules/Quotes/Tests/Feature/QuoteDuplicateNumberPreventionTest.php index 6d6715a0..34b4d6a9 100644 --- a/Modules/Quotes/Tests/Feature/QuoteDuplicateNumberPreventionTest.php +++ b/Modules/Quotes/Tests/Feature/QuoteDuplicateNumberPreventionTest.php @@ -8,7 +8,6 @@ use Modules\Quotes\Models\Quote; use Modules\Quotes\Support\QuoteNumberGenerator; use PHPUnit\Framework\Attributes\CoversClass; -use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\Test; use RuntimeException; diff --git a/Modules/Quotes/Tests/Unit/QuoteModelTest.php b/Modules/Quotes/Tests/Unit/QuoteModelTest.php index 249a530a..d66718be 100644 --- a/Modules/Quotes/Tests/Unit/QuoteModelTest.php +++ b/Modules/Quotes/Tests/Unit/QuoteModelTest.php @@ -70,9 +70,9 @@ public function it_allows_creating_a_quote_via_mass_assignment(): void /* Assert */ $this->assertDatabaseHas('quotes', [ - 'id' => $created->id, - 'company_id' => $quote['company_id'], - 'prospect_id' => $quote['prospect_id'], + 'id' => $created->id, + 'company_id' => $quote['company_id'], + 'prospect_id' => $quote['prospect_id'], 'quote_number' => $quote['quote_number'], 'quote_total' => $quote['quote_total'], ]); diff --git a/README.md b/README.md index 6a549e7e..1c6efda1 100644 --- a/README.md +++ b/README.md @@ -239,20 +239,22 @@ docker exec ivpldock-workspace-1 bash -c "cd /var/www/projects/ip2 && vendor/bin Or use the Makefile shorthand (see `Makefile` for available targets). -**Without Docker:** if you don't have the Docker workspace set up, you can run the suite locally against an in-memory SQLite database instead. Create/edit `.env.testing`: - -```env -DB_CONNECTION=sqlite -DB_DATABASE=:memory: -``` - -Then run tests normally: +**Preferred: Docker Compose.** The `cli` service runs the suite against a real MariaDB `db` +service — the same engine CI uses — with no setup beyond `docker compose run`: ```bash -php artisan test +docker compose run --rm cli php artisan test --exclude-group failing,troubleshooting ``` -See [RUNNING_TESTS.md](.github/RUNNING_TESTS.md) for advanced testing. +Use `php artisan test`, not `vendor/bin/phpunit` directly — the two have been observed to behave +differently for this app's Livewire form tests (`vendor/bin/phpunit` silently drops submitted +field values in some environments); `artisan test` is the reliable one and matches CI. A +freshly-rebuilt `cli` image has, at least once, reproduced this same problem even under +`artisan test` for reasons not yet isolated — see +[#689](https://github.com/InvoicePlane/InvoicePlane-v2/issues/689) before trusting a full run. + +SQLite is intentionally not used for this project's tests: its lenient identifier quoting has +masked real bugs that only surfaced on MariaDB in CI. See `.github/DOCKER.md`. ### Code Quality diff --git a/composer.json b/composer.json index 8f1d786a..9ca877c6 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,13 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "^8.2", + "php": "^8.3", "awcodes/mason": "^3.1", "doctrine/dbal": ">=4.4", "dompdf/dompdf": "^3.1", "filament/actions": ">=5.6", "filament/filament": ">=5.6", - "laravel/framework": ">=12.46", + "laravel/framework": "^13.0", "maatwebsite/excel": ">=3.1", "maennchen/zipstream-php": ">=3.2", "nwidart/laravel-modules": ">=12.0", diff --git a/docker-compose.yml b/docker-compose.yml index 19212588..39457943 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,10 @@ services: # by default (profile "tools"). Examples: # docker compose run --rm cli composer install # docker compose run --rm cli php artisan migrate --seed - # docker compose run --rm cli vendor/bin/phpunit --exclude-group failing,troubleshooting + # docker compose run --rm cli php artisan test --exclude-group failing,troubleshooting + # (use `php artisan test`, not `vendor/bin/phpunit` directly — the two + # have been observed to behave differently for this app's Livewire + # form tests; artisan test is the reliable one, matching CI) cli: container_name: 'ivplflmnt_cli' build: @@ -45,6 +48,17 @@ services: tty: true environment: APP_ENV: "${APP_ENV:-testing}" + # Overrides whatever's in .env.testing so the test suite always + # runs against real MariaDB here, matching CI — no per-developer + # sqlite fallback, no edits needed. + DB_CONNECTION: mysql + DB_HOST: db + DB_PORT: 3306 + DB_DATABASE: invoiceplane_test + DB_USERNAME: root + DB_PASSWORD: "" + depends_on: + - db volumes: - .:/var/www/html networks: @@ -61,6 +75,13 @@ services: MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: "yes" MARIADB_DATABASE: "${DB_DATABASE}" TZ: "Europe/London" + volumes: + - database:/var/lib/mysql + # Only runs on first boot of a fresh volume — provisions the + # dedicated invoiceplane_test database the `cli` service tests + # against. Reset with `docker compose down -v` if upgrading an + # existing volume that predates this. + - ./docker-resources/mariadb/init:/docker-entrypoint-initdb.d:ro networks: - laravel diff --git a/docker-resources/mariadb/init/01-create-test-db.sql b/docker-resources/mariadb/init/01-create-test-db.sql new file mode 100644 index 00000000..f99135b6 --- /dev/null +++ b/docker-resources/mariadb/init/01-create-test-db.sql @@ -0,0 +1,6 @@ +-- Runs once, on first boot of a fresh `database` volume (mariadb's +-- entrypoint executes everything under /docker-entrypoint-initdb.d/). +-- Provisions a dedicated test database alongside the dev one (MARIADB_DATABASE) +-- so `docker compose run --rm cli vendor/bin/phpunit` works out of the box +-- against real MariaDB, matching CI, with no per-developer .env.testing edits. +CREATE DATABASE IF NOT EXISTS invoiceplane_test; diff --git a/docker-resources/php-cli/Dockerfile b/docker-resources/php-cli/Dockerfile index 15d25843..d7cb9ec5 100644 --- a/docker-resources/php-cli/Dockerfile +++ b/docker-resources/php-cli/Dockerfile @@ -1,4 +1,10 @@ -FROM php:8.4-cli-alpine +FROM php:8.4-cli + +# Debian base, matching the image proven to run this suite reliably — +# the equivalent Alpine (musl) build was found to silently drop form +# fields during Livewire component testing (a real, reproducible bug, +# not a database or CI issue). Don't switch back to -alpine without +# re-verifying UserProfileTest::it_saves_the_user_data_form first. # Match the host user so files created in mounted volumes (vendor/, # storage/, compiled views) keep sane ownership. Override at build time: @@ -6,53 +12,38 @@ FROM php:8.4-cli-alpine ARG UID=1000 ARG GID=1000 -RUN addgroup -g ${GID} dockeruser \ - && adduser -D -s /bin/bash -u ${UID} -G dockeruser dockeruser +RUN groupadd -g ${GID} dockeruser \ + && useradd -m -s /bin/bash -u ${UID} -g dockeruser dockeruser -# Install build dependencies (temporary) -RUN apk add --no-cache --virtual .build-deps \ - autoconf \ - g++ \ - make \ - pkgconf \ - zstd-dev \ - # Install runtime dependencies (permanent) - && apk add --no-cache \ - bash \ +RUN apt-get update && apt-get install -y --no-install-recommends \ git \ curl \ zip \ unzip \ - icu-dev \ - libxml2-dev \ - oniguruma-dev \ - libzip-dev \ + libicu-dev \ libpng-dev \ - libjpeg-turbo-dev \ - freetype-dev \ - zstd \ - # Configure and install PHP extensions (pdo_sqlite ships with the base - # image — the test suite runs on an in-memory sqlite database) + libjpeg62-turbo-dev \ + libfreetype6-dev \ + libzip-dev \ + # Configure and install PHP extensions — only the ones NOT already + # compiled into the base php:8.4-cli image (which already ships + # mbstring, xml, dom, sodium, opcache, pdo, pdo_sqlite, etc.). + # Re-installing an already-built-in extension via docker-php-ext-install + # was tried and produced a real, reproducible bug: Livewire form tests + # silently lost submitted field values (e.g. + # UserProfileTest::it_saves_the_user_data_form, ContactsTest — required + # fields reported as missing even though fillForm() supplied them). + # Root cause not fully isolated, but the fix is confirmed: stick to this + # minimal set, matching the proven-reliable ip2-test-php:8.4 image. && docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) \ - pdo \ + intl \ + gd \ pdo_mysql \ - mbstring \ - exif \ - pcntl \ bcmath \ - gd \ zip \ - intl \ - xml \ - soap \ - opcache \ - # Install PECL extensions - && pecl install redis \ - && docker-php-ext-enable redis \ - # Remove only build dependencies - && apk del .build-deps \ - && rm -rf /var/cache/apk/* + exif \ + && rm -rf /var/lib/apt/lists/* # PHPUnit needs more than the 128M default on the full suite RUN echo 'memory_limit=1G' > /usr/local/etc/php/conf.d/memory-limit.ini diff --git a/resources/lang/en/ip.php b/resources/lang/en/ip.php index 10b9bc69..351c52fe 100644 --- a/resources/lang/en/ip.php +++ b/resources/lang/en/ip.php @@ -1279,5 +1279,9 @@ 'merge_clients_success' => 'Clients merged successfully.', 'merge_clients_same_record' => 'A client cannot be merged into itself.', 'merge_clients_different_company' => 'Both clients must belong to the same company.', + + 'show_line_item_position_numbers' => 'Show position numbers on line items', + 'show_line_item_position_numbers_help' => 'Display consecutive position numbers (1, 2, 3…) for each invoice line item in the form and PDF.', + 'position' => 'Position', #endregion ];