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

Development 3.x

app/DTO/DocumentDTO.php

@@ -72,7 +72,7 @@ readonly class DocumentDTO
             subheader: $document->subheader,
             footer: $document->footer,
             terms: $document->terms,
-            logo: $document->logo,
+            logo: $document->logo_url ?? $settings->logo_url,
             number: $document->documentNumber(),
             referenceNumber: $document->referenceNumber(),
             date: $document->documentDate(),

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

@@ -19,8 +19,6 @@ use Filament\Forms\Set;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class DocumentDefaultResource extends Resource
 {
@@ -88,27 +86,19 @@ class DocumentDefaultResource extends Resource
                 Forms\Components\Grid::make(1)
                     ->schema([
                         Forms\Components\FileUpload::make('logo')
-                            ->openable()
                             ->maxSize(1024)
                             ->localizeLabel()
-                            ->visibility('public')
-                            ->disk('public')
+                            ->openable()
                             ->directory('logos/document')
-                            ->imageResizeMode('contain')
+                            ->image()
                             ->imageCropAspectRatio('3:2')
                             ->panelAspectRatio('3:2')
-                            ->panelLayout('integrated')
-                            ->removeUploadedFileButtonPosition('center bottom')
-                            ->uploadButtonPosition('center bottom')
-                            ->uploadProgressIndicatorPosition('center bottom')
-                            ->getUploadedFileNameForStorageUsing(
-                                static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                    ->prepend(Auth::user()->currentCompany->id . '_'),
-                            )
+                            ->panelLayout('compact')
                             ->extraAttributes([
-                                'class' => 'aspect-[3/2] w-[9.375rem] max-w-full',
+                                'class' => 'es-file-upload document-logo-preview',
                             ])
-                            ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
+                            ->loadingIndicatorPosition('left')
+                            ->removeUploadedFileButtonPosition('right'),
                         Forms\Components\Checkbox::make('show_logo')
                             ->localizeLabel(),
                         Forms\Components\ColorPicker::make('accent_color')

app/Filament/Forms/Components/DocumentHeaderSection.php

@@ -8,9 +8,6 @@ use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Split;
 use Filament\Forms\Components\TextInput;
-use Filament\Support\Enums\MaxWidth;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class DocumentHeaderSection extends Section
 {
@@ -43,25 +40,19 @@ class DocumentHeaderSection extends Section
             Split::make([
                 Group::make([
                     FileUpload::make('logo')
-                        ->openable()
                         ->maxSize(1024)
                         ->localizeLabel()
-                        ->visibility('public')
-                        ->disk('public')
+                        ->openable()
                         ->directory('logos/document')
-                        ->imageResizeMode('contain')
+                        ->image()
                         ->imageCropAspectRatio('3:2')
                         ->panelAspectRatio('3:2')
-                        ->maxWidth(MaxWidth::ExtraSmall)
-                        ->panelLayout('integrated')
-                        ->removeUploadedFileButtonPosition('center bottom')
-                        ->uploadButtonPosition('center bottom')
-                        ->uploadProgressIndicatorPosition('center bottom')
-                        ->getUploadedFileNameForStorageUsing(
-                            static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                ->prepend(Auth::user()->currentCompany->id . '_'),
-                        )
-                        ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
+                        ->panelLayout('compact')
+                        ->extraAttributes([
+                            'class' => 'es-file-upload document-logo',
+                        ])
+                        ->loadingIndicatorPosition('left')
+                        ->removeUploadedFileButtonPosition('right'),
                 ]),
                 Group::make([
                     TextInput::make('header')

app/Models/Accounting/Estimate.php

@@ -28,6 +28,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
 
 #[CollectedBy(DocumentCollection::class)]
@@ -83,6 +84,17 @@ class Estimate extends Document
         'total' => MoneyCast::class,
     ];
 
+    protected $appends = [
+        'logo_url',
+    ];
+
+    protected function logoUrl(): Attribute
+    {
+        return Attribute::get(static function (mixed $value, array $attributes): ?string {
+            return $attributes['logo'] ? Storage::disk('public')->url($attributes['logo']) : null;
+        });
+    }
+
     public function client(): BelongsTo
     {
         return $this->belongsTo(Client::class);

app/Models/Accounting/Invoice.php

@@ -34,6 +34,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\HtmlString;
 use Livewire\Component;
 
@@ -94,6 +95,17 @@ class Invoice extends Document
         'amount_due' => MoneyCast::class,
     ];
 
+    protected $appends = [
+        'logo_url',
+    ];
+
+    protected function logoUrl(): Attribute
+    {
+        return Attribute::get(static function (mixed $value, array $attributes): ?string {
+            return $attributes['logo'] ? Storage::disk('public')->url($attributes['logo']) : null;
+        });
+    }
+
     public function client(): BelongsTo
     {
         return $this->belongsTo(Client::class);

app/Models/Accounting/RecurringInvoice.php

@@ -33,10 +33,12 @@ use Filament\Notifications\Notification;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Storage;
 use Livewire\Component;
 
 #[CollectedBy(DocumentCollection::class)]
@@ -113,6 +115,17 @@ class RecurringInvoice extends Document
         'total' => MoneyCast::class,
     ];
 
+    protected $appends = [
+        'logo_url',
+    ];
+
+    protected function logoUrl(): Attribute
+    {
+        return Attribute::get(static function (mixed $value, array $attributes): ?string {
+            return $attributes['logo'] ? Storage::disk('public')->url($attributes['logo']) : null;
+        });
+    }
+
     public function client(): BelongsTo
     {
         return $this->belongsTo(Client::class);

resources/css/filament/company/theme.css

@@ -10,6 +10,14 @@
 
 @config 'tailwind.config.js';
 
+.es-file-upload.document-logo > div {
+    @apply w-48;
+}
+
+.es-file-upload.document-logo-preview > div {
+    @apply w-40;
+}
+
 .fi-in-text-item .group-hover\/item\:underline, .fi-ta-text-item .group-hover\/item\:underline {
     @apply text-primary-600 dark:text-primary-400 font-semibold;
 }

resources/views/components/company/document-template/logo.blade.php

@@ -1,6 +1,6 @@
 @props([
     'shape' => 'square',
-    'size' => 'md',
+    'size' => 'lg',
 ])
 
 <img {{