Merge pull request #120 from devmount/bugs/108-pdf-fixes

PDF fixes

Author: devmount

app/Filament/Resources/SettingResource.php

@@ -4,9 +4,7 @@
 
 use App\Filament\Resources\SettingResource\Pages;
 use App\Models\Setting;
-use Filament\Forms\Components;
 use Filament\Resources\Resource;
-use Filament\Tables\Actions;
 use Filament\Tables\Columns;
 use Filament\Tables\Table;
 
@@ -19,44 +17,14 @@ public static function table(Table $table): Table
     {
         return $table
             ->defaultSort('weight', 'asc')
-            ->reorderable('weight')
             ->columns([
                 Columns\TextColumn::make('field')
                     ->label(__('field'))
                     ->state(fn (Setting $record): string => "{$record->label} (<code>{$record->field}</code>)")
                     ->html(),
-                Columns\TextColumn::make('value')
+                Columns\TextInputColumn::make('value')
                     ->label(__('value'))
-                    ->limit(),
-            ])
-            ->filters([
-                //
-            ])
-            ->actions([
-                Actions\EditAction::make()
-                    ->label('')
-                    ->form(fn (Setting $record) => match ($record->type) {
-                        'text', 'email', 'tel', 'url', 'number' => [
-                            Components\TextInput::make('value')
-                                ->label($record->label)
-                                ->email($record->type === 'email')
-                                ->tel($record->type === 'tel')
-                                ->url($record->type === 'url')
-                                ->numeric($record->type === 'number')
-                                ->autofocus()
-                        ],
-                        'textarea' => [
-                            Components\Textarea::make('value')
-                                ->label($record->label)
-                                ->autosize()
-                                ->autofocus()
-                        ],
-                        default => [
-                            Components\TextInput::make('value')
-                                ->label($record->label)
-                                ->autofocus()
-                        ]
-                    }),
+                    ->grow(),
             ])
             ->paginated(false);
     }

app/Services/InvoiceService.php

@@ -270,7 +270,7 @@ public static function generatePdf(Invoice $invoice): string {
 
                 $posdata = collect([
                     'description' => trim($position->description),
-                    'hours' => Number::format($billedPerProject ? '' : $poshours, 1, locale: $lang),
+                    'hours' => $billedPerProject ? '' : Number::format($poshours, 1, locale: $lang),
                     'price' => $billedPerProject ? '' : Number::currency($invoice->price, 'EUR', locale: $lang),
                     'title' => $invoice->undated ? "{$num}. {$label['position']}" : $posdate,
                     'total' => $billedPerProject ? '' : Number::currency($invoice->price * $poshours, 'EUR', locale: $lang),

app/Services/PdfTemplate.php

@@ -24,7 +24,7 @@ class PdfTemplate extends PdfDocument
     protected int $nFiles;
     protected bool $openAttachmentPane = false;
 
-    public function __construct(string $lang = null, DocumentType $type = DocumentType::INVOICE)
+    public function __construct(?string $lang = null, DocumentType $type = DocumentType::INVOICE)
     {
         // Init
         $this->lang = $lang ?? config('app.locale');