diff --git a/app/Abstracts/View/Components/Documents/Show.php b/app/Abstracts/View/Components/Documents/Show.php index 2831b20f9..96c7a617b 100644 --- a/app/Abstracts/View/Components/Documents/Show.php +++ b/app/Abstracts/View/Components/Documents/Show.php @@ -11,7 +11,6 @@ use App\Abstracts\View\Component; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Intervention\Image\Exception\NotReadableException; use Image; @@ -928,7 +927,7 @@ abstract class Show extends Component if (! empty($media)) { $path = $media->getDiskPath(); - if (Storage::missing($path)) { + if (! $media->fileExists()) { return $logo; } } else { @@ -941,7 +940,7 @@ abstract class Show extends Component $height = setting('invoice.logo_size_height'); if ($media) { - $image->make(Storage::get($path))->resize($width, $height)->encode(); + $image->make($media->contents())->resize($width, $height)->encode(); } else { $image->make($path)->resize($width, $height)->encode(); } diff --git a/app/Abstracts/View/Components/Documents/Template.php b/app/Abstracts/View/Components/Documents/Template.php index f169dc0e6..fd5ec1281 100644 --- a/app/Abstracts/View/Components/Documents/Template.php +++ b/app/Abstracts/View/Components/Documents/Template.php @@ -10,7 +10,6 @@ use App\Traits\Tailwind; use App\Traits\ViewComponents; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Intervention\Image\Exception\NotReadableException; use Image; @@ -193,7 +192,7 @@ abstract class Template extends Component $this->textQuantity = $this->getTextQuantity($type, $textQuantity); $this->textPrice = $this->getTextPrice($type, $textPrice); $this->textAmount = $this->getTextAmount($type, $textAmount); - + $this->print = $this->getPrint($print); // Set Parent data @@ -228,7 +227,7 @@ abstract class Template extends Component if (! empty($media)) { $path = $media->getDiskPath(); - if (Storage::missing($path)) { + if (! $media->fileExists()) { return $logo; } } else { @@ -241,7 +240,7 @@ abstract class Template extends Component $height = setting('invoice.logo_size_height'); if ($media) { - $image->make(Storage::get($path))->resize($width, $height)->encode(); + $image->make($media->contents())->resize($width, $height)->encode(); } else { $image->make($path)->resize($width, $height)->encode(); } diff --git a/app/Abstracts/View/Components/Transactions/Show.php b/app/Abstracts/View/Components/Transactions/Show.php index 3abb1b785..509d6a839 100644 --- a/app/Abstracts/View/Components/Transactions/Show.php +++ b/app/Abstracts/View/Components/Transactions/Show.php @@ -9,7 +9,6 @@ use App\Traits\Transactions; use App\Utilities\Modules; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\URL; use Illuminate\Support\Str; use Intervention\Image\Facades\Image; @@ -501,7 +500,7 @@ abstract class Show extends Component if (! empty($media)) { $path = $media->getDiskPath(); - if (Storage::missing($path)) { + if (! $media->fileExists()) { return $logo; } } else { @@ -514,7 +513,7 @@ abstract class Show extends Component $height = setting('invoice.logo_size_height'); if ($media) { - $image->make(Storage::get($path))->resize($width, $height)->encode(); + $image->make($media->contents())->resize($width, $height)->encode(); } else { $image->make($path)->resize($width, $height)->encode(); } diff --git a/app/Abstracts/View/Components/Transactions/Template.php b/app/Abstracts/View/Components/Transactions/Template.php index 5727a22bf..8acb637c8 100644 --- a/app/Abstracts/View/Components/Transactions/Template.php +++ b/app/Abstracts/View/Components/Transactions/Template.php @@ -9,7 +9,6 @@ use App\Traits\Transactions; use App\Utilities\Modules; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Intervention\Image\Facades\Image; use Intervention\Image\Exception\NotReadableException; @@ -277,7 +276,7 @@ abstract class Template extends Component if (!empty($media)) { $path = $media->getDiskPath(); - if (Storage::missing($path)) { + if (! $media->fileExists()) { return $logo; } } else { @@ -290,7 +289,7 @@ abstract class Template extends Component $height = setting('invoice.logo_size_height'); if ($media) { - $image->make(Storage::get($path))->resize($width, $height)->encode(); + $image->make($media->contents())->resize($width, $height)->encode(); } else { $image->make($path)->resize($width, $height)->encode(); } diff --git a/app/Traits/Uploads.php b/app/Traits/Uploads.php index 574273526..4c73bc920 100644 --- a/app/Traits/Uploads.php +++ b/app/Traits/Uploads.php @@ -4,7 +4,6 @@ namespace App\Traits; use App\Models\Common\Media as MediaModel; use App\Utilities\Date; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use MediaUploader; @@ -112,7 +111,7 @@ trait Uploads $path = $media->getDiskPath(); - if (Storage::missing($path)) { + if (! $media->fileExists()) { return false; }