diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php
index 14f6d0a..5ea448b 100644
--- a/app/Http/Controllers/API/SyncController.php
+++ b/app/Http/Controllers/API/SyncController.php
@@ -183,7 +183,7 @@ class SyncController extends Controller
->exists(sprintf('docs/%s/%s.%s', \tenant()->getKey(), $doc['uuid'], $doc['type']));
if ($exists) {
array_push($attach, URL::temporarySignedRoute(
- 'bo.docs.download',
+ 'docs.download',
now()->addDays(30),
['tenant' => \tenant()->getKey(), 'uuid' => $doc['uuid']]
));
diff --git a/app/Http/Controllers/Bo/DocumentController.php b/app/Http/Controllers/Bo/DocumentController.php
index 8fd2961..2a3a8e3 100644
--- a/app/Http/Controllers/Bo/DocumentController.php
+++ b/app/Http/Controllers/Bo/DocumentController.php
@@ -209,14 +209,15 @@ class DocumentController extends Controller
/**
* Download the document
*
+ * @param string $tenant
* @param string $uuid
* @return \Symfony\Component\HttpFoundation\BinaryFileResponse
*/
- public function download(string $uuid): \Symfony\Component\HttpFoundation\BinaryFileResponse
+ public function download(string $tenant, string $uuid): \Symfony\Component\HttpFoundation\BinaryFileResponse
{
$doc = Document::where('uuid', $uuid)->firstOrFail();
$pathToFile = public_path() . Storage::url(
- sprintf('docs/%s/%s.%s', \tenant()->getKey(), $doc->uuid, $doc->type)
+ sprintf('docs/%s/%s.%s', $tenant, $doc->uuid, $doc->type)
);
return response()->download($pathToFile, $doc->path);
}
diff --git a/app/Models/Formulary.php b/app/Models/Formulary.php
index 5800c46..b4256e9 100644
--- a/app/Models/Formulary.php
+++ b/app/Models/Formulary.php
@@ -8,6 +8,7 @@ use App\Traits\Models\IsRelatedToTenant;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
+use Stancl\Tenancy\Contracts\Tenant as BaseTenant;
use Stancl\Tenancy\Database\Concerns\BelongsToTenant;
use Uwil\LaravelCommon\Helpers\ToolboxHelper;
@@ -104,7 +105,7 @@ class Formulary extends Model
private static function assertNameIsUnique(
string|null $name,
?int $id = null,
- \App\Models\Tenant|\Stancl\Tenancy\Contracts\Tenant $tenant = null
+ Tenant|BaseTenant|null $tenant = null
) {
$table = (new self())->getTable();
ToolboxHelper::assertFieldIsUnique($table, 'name', $name, $id, self::whereTenantQuery($tenant));
diff --git a/resources/assets/images/logo.png b/resources/assets/images/logo.png
index 6e5a62b..7d9cea2 100644
Binary files a/resources/assets/images/logo.png and b/resources/assets/images/logo.png differ
diff --git a/resources/views/vendor/errors/403.blade.php b/resources/views/vendor/errors/403.blade.php
index 08ae36b..dd72459 100644
--- a/resources/views/vendor/errors/403.blade.php
+++ b/resources/views/vendor/errors/403.blade.php
@@ -8,6 +8,5 @@
@section('button', true)
@section('image')
-{{-- FIXME: Personaliser ca --}}
-
+
@endsection
diff --git a/resources/views/vendor/errors/404.blade.php b/resources/views/vendor/errors/404.blade.php
index dd14f0c..d529d28 100644
--- a/resources/views/vendor/errors/404.blade.php
+++ b/resources/views/vendor/errors/404.blade.php
@@ -8,6 +8,5 @@
@section('button', true)
@section('image')
-{{-- FIXME: Personaliser ca --}}
-
+
@endsection
diff --git a/resources/views/vendor/errors/503.blade.php b/resources/views/vendor/errors/503.blade.php
index 9b4c100..12d2fa1 100644
--- a/resources/views/vendor/errors/503.blade.php
+++ b/resources/views/vendor/errors/503.blade.php
@@ -6,6 +6,5 @@
@section('submessage', __('Le site est en maintenance, nous reviendrons...'))
@section('image')
-{{-- FIXME: Personaliser ca --}}
-
+
@endsection
diff --git a/routes/web-bo.php b/routes/web-bo.php
index 917f539..95b09e9 100644
--- a/routes/web-bo.php
+++ b/routes/web-bo.php
@@ -104,10 +104,10 @@ Route::middleware(['web', 'admin-secure'])->name('bo.')->group(function () {
])->where('direction', 'up|down')
->name('formularies.change-order');
});
-
- // * Public files download
- Route::get('/docs/{uuid}/download', [DocumentController::class, 'download'])
- ->name('docs.download')
- ->middleware('signed');
});
});
+
+// Public files download.
+Route::get('/{tenant}/docs/{uuid}/download', [DocumentController::class, 'download'])
+ ->name('docs.download')
+ ->middleware('signed');