Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
910d4c5df0 | ||
|
|
f1a0322d3f | ||
|
|
6025ea4304 |
@@ -4,6 +4,47 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||||
|
|
||||||
|
## [0.21.0] - 2026-09-25
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- `Modules\Core\File` — a generic, storage-backend-agnostic file registry: `Models\File` (a
|
||||||
|
`files` table row per stored file — disk, path, original name, mime, size, a `purpose` tag,
|
||||||
|
and a nullable polymorphic owner), `Services\FileService` (store/retrieve/download/exists/
|
||||||
|
delete/list/`pruneUnowned`, delegating every actual byte-level operation to a
|
||||||
|
`Contracts\FileAdapterInterface` resolved per disk — `Adapters\LocalFileAdapter` today, the
|
||||||
|
same contextual-binding pattern `Shipping\Contracts\CarrierFulfillmentInterface` already uses
|
||||||
|
per carrier, so a future `S3FileAdapter` is one class and one more match arm, nothing else
|
||||||
|
changes), and `Http\Controllers\DownloadFileController` — a signed-URL-only route
|
||||||
|
(`files.download`) any consuming app can mint a link to, serving either inline (a preview) or
|
||||||
|
as a forced download (`?download=1`).
|
||||||
|
- `Modules\Core\File\Http\Controllers\UploadFileController` — an abstract base for "accept an
|
||||||
|
upload, validate it, store it via `FileService`, return its id" endpoints. Which
|
||||||
|
extensions/sizes are acceptable is deliberately left to a concrete subclass's own
|
||||||
|
`purpose()`/`validationRules()` overrides (ordinary server-side PHP, never trusting anything
|
||||||
|
the request itself claims about its own limits) — a real policy decision that can differ per
|
||||||
|
site and even per product/field, not something a shared base class or config file could
|
||||||
|
express safely.
|
||||||
|
- `boboko:file:prune-unowned {purpose}` — deletes every unowned `File` of a given purpose past
|
||||||
|
its grace period (`--hours`, default 24). Generic: any consuming app schedules it once per
|
||||||
|
purpose string it stores files under.
|
||||||
|
- `Modules\Core\Cart\Events\CartLineAdded`/`Checkout\Events\OrderPlaced` listeners
|
||||||
|
(`File\Listeners\AttachCustomFieldFileToCartLine`/`TransferCustomFieldFileOwnership`) that
|
||||||
|
re-point a `File`'s ownership from unowned → the real `CartLine` once one exists, then from
|
||||||
|
that `CartLine` → the `OrderLine` an order is placed with — so a File referenced by a product
|
||||||
|
custom field survives the cart it originated from being cleared, without ever being copied.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- The admin order-lines table's collapsible details dropdown (next to the existing price
|
||||||
|
breakdown) now shows a product's custom-field answers (`OrderLine.meta.custom_fields`) — a
|
||||||
|
bordered table matching the existing price-breakdown one, with a thumbnail preview and a
|
||||||
|
download-icon link for a file answer, resolved through `File\Services\FileService`'s signed
|
||||||
|
route. Previously never shown anywhere in the admin.
|
||||||
|
- 3dealer's product custom-field photo upload (`CustomFieldUploadController`), cart line meta
|
||||||
|
(`CartController::customFieldsMeta()`), and pruning (formerly its own `PruneCustomFieldUploads`
|
||||||
|
command) now go through `Modules\Core\File` instead of a bespoke `Crypt::encryptString({disk,
|
||||||
|
path, name, mime})` reference scheme — a cart/order line's file answer is now just a `File`
|
||||||
|
row's `file_id`, with `File` as the single source of truth for every other detail.
|
||||||
|
|
||||||
## [0.20.2] - 2026-09-25
|
## [0.20.2] - 2026-09-25
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "boboko/core",
|
"name": "boboko/core",
|
||||||
"description": "Core module — authentication and shared panel behaviour",
|
"description": "Core module — authentication and shared panel behaviour",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"version": "0.20.2",
|
"version": "0.21.0",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Modules\\Core\\": "src/"
|
"Modules\\Core\\": "src/"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use Illuminate\Database\Schema\Blueprint;
|
|||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A generic, storage-backend-agnostic file registry — Modules\Core\Files\
|
* A generic, storage-backend-agnostic file registry — Modules\Core\File\
|
||||||
* Services\FileService's own backing table. `disk`/`path` are whatever
|
* Services\FileService's own backing table. `disk`/`path` are whatever
|
||||||
* Laravel's Storage facade already understands (local, s3, ...); this
|
* Laravel's Storage facade already understands (local, s3, ...); this
|
||||||
* table adds what Flysystem itself has no concept of: who a file
|
* table adds what Flysystem itself has no concept of: who a file
|
||||||
@@ -28,7 +28,7 @@ return new class extends Migration
|
|||||||
{
|
{
|
||||||
public function up(): void
|
public function up(): void
|
||||||
{
|
{
|
||||||
Schema::create('file_uploads', function (Blueprint $table) {
|
Schema::create('files', function (Blueprint $table) {
|
||||||
$table->id();
|
$table->id();
|
||||||
$table->string('disk');
|
$table->string('disk');
|
||||||
$table->string('path');
|
$table->string('path');
|
||||||
@@ -45,6 +45,6 @@ return new class extends Migration
|
|||||||
|
|
||||||
public function down(): void
|
public function down(): void
|
||||||
{
|
{
|
||||||
Schema::dropIfExists('file_uploads');
|
Schema::dropIfExists('files');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -40,4 +40,9 @@ class LocalFileAdapter implements FileAdapterInterface
|
|||||||
{
|
{
|
||||||
return $this->disk->response($path, $name);
|
return $this->disk->response($path, $name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function download(string $path, ?string $name = null): StreamedResponse
|
||||||
|
{
|
||||||
|
return $this->disk->download($path, $name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Core\File\Commands;
|
||||||
|
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use Modules\Core\File\Services\FileService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generic wrapper around FileService::pruneUnowned() — see that method's
|
||||||
|
* own docblock for what "unowned" means and why the grace period exists.
|
||||||
|
* Any caller (3dealer's product custom-field photo uploads today, some
|
||||||
|
* other future upload feature tomorrow, in this app or another consuming
|
||||||
|
* app) schedules this once per purpose string it stores files under; this
|
||||||
|
* command itself has no opinion about what any given purpose means.
|
||||||
|
*/
|
||||||
|
class PruneUnownedFilesCommand extends Command
|
||||||
|
{
|
||||||
|
protected $signature = 'boboko:file:prune-unowned {purpose} {--hours=24 : Only delete unowned files older than this}';
|
||||||
|
|
||||||
|
protected $description = 'Delete unowned files of a given purpose past their grace period';
|
||||||
|
|
||||||
|
public function handle(FileService $files): int
|
||||||
|
{
|
||||||
|
$purpose = $this->argument('purpose');
|
||||||
|
|
||||||
|
$deleted = $files->pruneUnowned($purpose, now()->subHours((int) $this->option('hours')));
|
||||||
|
|
||||||
|
$this->info("Deleted {$deleted} unowned file(s) of purpose \"{$purpose}\".");
|
||||||
|
|
||||||
|
return self::SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,7 +32,15 @@ interface FileAdapterInterface
|
|||||||
public function delete(string $path): void;
|
public function delete(string $path): void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Streams the file at $path straight to the browser.
|
* Streams the file at $path straight to the browser, inline (the
|
||||||
|
* browser renders/previews it directly rather than prompting to save).
|
||||||
*/
|
*/
|
||||||
public function retrieve(string $path, ?string $name = null): StreamedResponse;
|
public function retrieve(string $path, ?string $name = null): StreamedResponse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Same bytes as retrieve(), but as a forced attachment — the browser
|
||||||
|
* always prompts to save, even for a type it could otherwise preview
|
||||||
|
* (an image inline in a new tab).
|
||||||
|
*/
|
||||||
|
public function download(string $path, ?string $name = null): StreamedResponse;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Core\File\Http\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Routing\Controller;
|
||||||
|
use Modules\Core\File\Models\File;
|
||||||
|
use Modules\Core\File\Services\FileService;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Streams a File's bytes straight to the browser — inline by default (a
|
||||||
|
* browser-previewable type like an image opens/displays directly), or as
|
||||||
|
* a forced download with ?download=1 (e.g. an explicit "Download" button
|
||||||
|
* distinct from a thumbnail/preview link pointing at the same file). Only
|
||||||
|
* reachable via a short-lived signed URL — same auth model as
|
||||||
|
* Modules\Core\Shipping\Http\Controllers\DownloadShipmentLabelController
|
||||||
|
* (a valid signature IS the auth check, no separate staff/customer
|
||||||
|
* session check here) — so any caller that can mint a signed URL to this
|
||||||
|
* route (the storefront's own custom-field upload flow, or the admin
|
||||||
|
* order-line display) can hand a viewer a working link without this
|
||||||
|
* controller knowing anything about who they are or why they're allowed
|
||||||
|
* to see this particular file.
|
||||||
|
*
|
||||||
|
* Looks the File up manually from a plain {file} id rather than relying
|
||||||
|
* on implicit route-model-binding — registered via loadRoutesFrom() with
|
||||||
|
* no middleware group (see Providers\FileServiceProvider::boot()), so
|
||||||
|
* SubstituteBindings never runs and a type-hinted File parameter would
|
||||||
|
* silently resolve to an empty, non-existent model instead of 404ing.
|
||||||
|
*/
|
||||||
|
class DownloadFileController extends Controller
|
||||||
|
{
|
||||||
|
public function __invoke(Request $request, int $file, FileService $files): StreamedResponse
|
||||||
|
{
|
||||||
|
if (! $request->hasValidSignature()) {
|
||||||
|
abort(401);
|
||||||
|
}
|
||||||
|
|
||||||
|
$file = File::findOrFail($file);
|
||||||
|
|
||||||
|
abort_unless($files->exists($file), 404);
|
||||||
|
|
||||||
|
return $request->boolean('download') ? $files->download($file) : $files->retrieve($file);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Core\File\Http\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Routing\Controller;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Modules\Core\File\Services\FileService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The generic "accept an upload, validate it, store it via FileService,
|
||||||
|
* return its id" flow — what varies per use case (which extensions/sizes
|
||||||
|
* are acceptable) is deliberately NOT configurable here, and NEVER trusts
|
||||||
|
* anything the request itself claims about its own limits: a client could
|
||||||
|
* simply lie about them. purpose()/validationRules() are protected hooks
|
||||||
|
* a concrete subclass overrides instead — an ordinary PHP method a caller
|
||||||
|
* writes once per upload policy, not request input, so the actual limit
|
||||||
|
* enforced is always whatever server-side code says it is. Different
|
||||||
|
* products can even need different limits (a 3D-print reference photo
|
||||||
|
* vs. a video upload, say) — that's still a subclass's own store()
|
||||||
|
* override deciding which rule set applies to a given request, not
|
||||||
|
* something this base class or a shared config file could express.
|
||||||
|
*/
|
||||||
|
abstract class UploadFileController extends Controller
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The File row's `purpose` tag (see Models\File) — also the storage
|
||||||
|
* directory it lands under (FileService::store()'s single $purpose
|
||||||
|
* param doubles as both).
|
||||||
|
*/
|
||||||
|
abstract protected function purpose(): string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Laravel validation rules for the incoming request, keyed exactly as
|
||||||
|
* $request->all() would be. Must include a 'file' rule accepting an
|
||||||
|
* uploaded file — this class always reads the file from that key.
|
||||||
|
*
|
||||||
|
* @return array<string, array<int, mixed>>
|
||||||
|
*/
|
||||||
|
abstract protected function validationRules(Request $request): array;
|
||||||
|
|
||||||
|
public function store(Request $request, FileService $files): JsonResponse
|
||||||
|
{
|
||||||
|
$validator = Validator::make(
|
||||||
|
$request->all(),
|
||||||
|
$this->validationRules($request),
|
||||||
|
$this->validationMessages($request),
|
||||||
|
$this->validationAttributes($request),
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($validator->fails()) {
|
||||||
|
return response()->json(['error' => $validator->errors()->first('file')], 422);
|
||||||
|
}
|
||||||
|
|
||||||
|
$file = $files->store($request->file('file'), $this->purpose());
|
||||||
|
|
||||||
|
return response()->json(['file_id' => $file->id]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
protected function validationMessages(Request $request): array
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
protected function validationAttributes(Request $request): array
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Core\File\Listeners;
|
||||||
|
|
||||||
|
use Modules\Core\Cart\Events\CartLineAdded;
|
||||||
|
use Modules\Core\File\Models\File;
|
||||||
|
use Modules\Core\File\Services\FileService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A custom-field photo is uploaded (and gets its own File row, unowned)
|
||||||
|
* the moment a shopper picks it on the product page — before add-to-cart
|
||||||
|
* even runs (see 3dealer's CustomFieldUploadController). The storefront's
|
||||||
|
* add-to-cart request only carries that File's `id` in its custom_fields
|
||||||
|
* answer (see CartController::customFieldsMeta()); this is what actually
|
||||||
|
* gives the File an owner, once the real CartLine it belongs to exists.
|
||||||
|
*
|
||||||
|
* Listens for Cart\Events\CartLineAdded rather than reaching back into
|
||||||
|
* the cart after CartService::addLine() returns — that event already
|
||||||
|
* carries the exact CartLine Lunar resolved/created, with no need to
|
||||||
|
* re-match it by meta (ambiguous whenever two lines share a purchasable +
|
||||||
|
* similar meta).
|
||||||
|
*/
|
||||||
|
class AttachCustomFieldFileToCartLine
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly FileService $files,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function handle(CartLineAdded $event): void
|
||||||
|
{
|
||||||
|
$fileIds = collect($event->line->meta['custom_fields'] ?? [])
|
||||||
|
->pluck('file_id')
|
||||||
|
->filter()
|
||||||
|
->all();
|
||||||
|
|
||||||
|
if ($fileIds === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
File::query()
|
||||||
|
->whereIn('id', $fileIds)
|
||||||
|
->each(fn (File $file) => $this->files->attachOwner($file, $event->line));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Core\File\Listeners;
|
||||||
|
|
||||||
|
use Lunar\Models\OrderLine;
|
||||||
|
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||||
|
use Modules\Core\File\Models\File;
|
||||||
|
use Modules\Core\File\Services\FileService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lunar\Pipelines\Order\Creation\CreateOrderLines copies a CartLine's
|
||||||
|
* meta (custom_fields included) onto its new OrderLine verbatim — so an
|
||||||
|
* order's custom-field file answer keeps the exact same `file_id` its
|
||||||
|
* originating cart line's meta already had (see 3dealer's CartController::
|
||||||
|
* customFieldsMeta(), which stores only that id — File is the single
|
||||||
|
* source of truth for disk/path/name/mime, never duplicated into meta).
|
||||||
|
* That id is enough to find the File row directly, with no need to match
|
||||||
|
* an OrderLine back to "the" CartLine it came from.
|
||||||
|
*
|
||||||
|
* Re-points ownership (not a copy — the same File row) from whatever
|
||||||
|
* CartLine owned it to this OrderLine, so a customer's placed order keeps
|
||||||
|
* its file even after the cart it came from is later cleared (see
|
||||||
|
* Modules\Core\Cart\Services\CartService, or a checkout-complete cart
|
||||||
|
* reset) — FileService::pruneUnowned() only ever removes UNOWNED files,
|
||||||
|
* but a File left pointing at a since-deleted CartLine would be just as
|
||||||
|
* orphaned in practice; this listener is what keeps that from ever
|
||||||
|
* happening for a real, placed order.
|
||||||
|
*
|
||||||
|
* Listens for Checkout\Events\OrderPlaced, not an OrderLine model event —
|
||||||
|
* that's the one place in this codebase an order is reliably known to be
|
||||||
|
* placed exactly once (see that event's own docblock), and it hands over
|
||||||
|
* the whole Order with every line already loaded.
|
||||||
|
*/
|
||||||
|
class TransferCustomFieldFileOwnership
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly FileService $files,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function handle(OrderPlaced $event): void
|
||||||
|
{
|
||||||
|
foreach ($event->order->lines as $line) {
|
||||||
|
$this->transferLine($line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function transferLine(OrderLine $line): void
|
||||||
|
{
|
||||||
|
$fileIds = collect($line->meta['custom_fields'] ?? [])
|
||||||
|
->pluck('file_id')
|
||||||
|
->filter()
|
||||||
|
->all();
|
||||||
|
|
||||||
|
if ($fileIds === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
File::query()
|
||||||
|
->whereIn('id', $fileIds)
|
||||||
|
->each(fn (File $file) => $this->files->attachOwner($file, $line));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,6 +20,12 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
|
|||||||
* (3dealer's custom-field upload flow today, some other future
|
* (3dealer's custom-field upload flow today, some other future
|
||||||
* file-upload need tomorrow) supplies its own `purpose` string and owner
|
* file-upload need tomorrow) supplies its own `purpose` string and owner
|
||||||
* model, and scopes its own queries by them.
|
* model, and scopes its own queries by them.
|
||||||
|
*
|
||||||
|
* `purpose` also doubles as the storage directory a file lands under
|
||||||
|
* (store() passes it straight through as the adapter's own $directory) —
|
||||||
|
* one string to name both, rather than every caller supplying two
|
||||||
|
* near-identical values for what's really the same distinction ("which
|
||||||
|
* kind of upload is this").
|
||||||
*/
|
*/
|
||||||
class FileService
|
class FileService
|
||||||
{
|
{
|
||||||
@@ -27,9 +33,9 @@ class FileService
|
|||||||
private readonly Container $container,
|
private readonly Container $container,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function store(UploadedFile $file, string $purpose, string $directory, string $disk = 'local'): File
|
public function store(UploadedFile $file, string $purpose, string $disk = 'local'): File
|
||||||
{
|
{
|
||||||
$path = $this->adapter($disk)->store($file, $directory);
|
$path = $this->adapter($disk)->store($file, $purpose);
|
||||||
|
|
||||||
return File::create([
|
return File::create([
|
||||||
'disk' => $disk,
|
'disk' => $disk,
|
||||||
@@ -62,6 +68,16 @@ class FileService
|
|||||||
return $this->adapter($file->disk)->retrieve($file->path, $file->original_name);
|
return $this->adapter($file->disk)->retrieve($file->path, $file->original_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Same file as retrieve(), forced as a download (Content-Disposition:
|
||||||
|
* attachment) rather than served inline — for a button distinct from
|
||||||
|
* a preview link/thumbnail pointing at the same File.
|
||||||
|
*/
|
||||||
|
public function download(File $file): StreamedResponse
|
||||||
|
{
|
||||||
|
return $this->adapter($file->disk)->download($file->path, $file->original_name);
|
||||||
|
}
|
||||||
|
|
||||||
public function exists(File $file): bool
|
public function exists(File $file): bool
|
||||||
{
|
{
|
||||||
return $this->adapter($file->disk)->exists($file->path);
|
return $this->adapter($file->disk)->exists($file->path);
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
use Modules\Core\File\Http\Controllers\DownloadFileController;
|
||||||
|
|
||||||
|
Route::get('files/{file}/download', DownloadFileController::class)
|
||||||
|
->name('files.download');
|
||||||
@@ -3,22 +3,60 @@
|
|||||||
namespace Modules\Core\Order\Filament\Extensions;
|
namespace Modules\Core\Order\Filament\Extensions;
|
||||||
|
|
||||||
use Filament\Actions\BulkAction;
|
use Filament\Actions\BulkAction;
|
||||||
|
use Filament\Support\Colors\Color;
|
||||||
use Filament\Support\Exceptions\Halt;
|
use Filament\Support\Exceptions\Halt;
|
||||||
|
use Filament\Tables\Columns\Layout\Panel;
|
||||||
|
use Filament\Tables\Columns\TextColumn;
|
||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
|
use Illuminate\Support\Facades\Blade;
|
||||||
|
use Illuminate\Support\Facades\URL;
|
||||||
|
use Illuminate\Support\HtmlString;
|
||||||
use Lunar\Admin\Support\Extending\BaseExtension;
|
use Lunar\Admin\Support\Extending\BaseExtension;
|
||||||
|
use Lunar\Models\OrderLine;
|
||||||
|
use Modules\Core\File\Models\File;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Same fix as OrderActionsExtension, applied to the order lines
|
* extendTable() has two unrelated jobs: the "bulk_refund" toolbar-action
|
||||||
* table's "bulk_refund" toolbar action (Lunar\Admin\...\OrderItemsTable::
|
* fix (see fixFailureNotification()'s own docblock — a genuine Filament
|
||||||
* getBulkRefundAction()) — see that class's docblock for the underlying
|
* bug), and adding a "Custom Fields" entry to each order line's own
|
||||||
* Filament bug (failureNotification()+failure()+halt() never actually
|
* collapsible details dropdown (Lunar\Admin\...\OrderItemsTable::
|
||||||
* sends the notification, because halt()'s Halt exception is caught before
|
* getOrderLinesTableColumns()'s Panel — the same one already showing
|
||||||
* Filament reaches the code that would send it).
|
* stock level, notes, and the price_breakdowns table) — the shopper's
|
||||||
|
* answers to Product::$custom_fields (a reference photo, personalization
|
||||||
|
* text, ...), stored on OrderLine.meta by 3dealer's CartController::
|
||||||
|
* customFieldsMeta() and, until now, never shown anywhere in the admin.
|
||||||
|
*
|
||||||
|
* Finds that Panel via $table->getCollapsibleColumnsLayout() — NOT
|
||||||
|
* $table->getColumns(), which two earlier attempts at this both reached
|
||||||
|
* for. HasColumns::pushColumns() flattens every Panel/Split into leaf
|
||||||
|
* columns at table-build time and stores THAT flat list as
|
||||||
|
* $this->columns (what getColumns() returns); the original nested
|
||||||
|
* Panel/Stack objects actually used for rendering are kept separately —
|
||||||
|
* in $this->columnsLayout for a non-collapsible layout component, or
|
||||||
|
* $this->collapsibleColumnsLayout for one that IS collapsible (this
|
||||||
|
* order-lines Panel is, via ->collapsible()). So `$column instanceof
|
||||||
|
* Panel` over getColumns() can never match anything — Panel/Split
|
||||||
|
* instances simply never appear in that array at all — and a fix built
|
||||||
|
* on that check silently mutated nothing. A first attempt building a
|
||||||
|
* brand new Panel and re-calling $table->columns() on top of the
|
||||||
|
* existing setup fixed nothing either and instead rendered as a stray
|
||||||
|
* empty extra column outside the dropdown (caught by actually opening
|
||||||
|
* the order page). Mutates the found Panel's Stack in place via
|
||||||
|
* Stack::schema(), the one part of both earlier attempts that actually
|
||||||
|
* worked once the right object was found.
|
||||||
|
*
|
||||||
|
* Its own TextColumn rather than reusing the Panel's existing KeyValue:
|
||||||
|
* KeyValue's own Blade view HTML-escapes every value ({{ $value }}),
|
||||||
|
* which can't render a clickable link for a file answer.
|
||||||
*/
|
*/
|
||||||
class OrderItemsTableExtension extends BaseExtension
|
class OrderItemsTableExtension extends BaseExtension
|
||||||
{
|
{
|
||||||
public function extendTable(Table $table): Table
|
public function extendTable(Table $table): Table
|
||||||
{
|
{
|
||||||
|
if ($table->getCollapsibleColumnsLayout() instanceof Panel) {
|
||||||
|
$this->addCustomFieldsColumn($table->getCollapsibleColumnsLayout());
|
||||||
|
}
|
||||||
|
|
||||||
return $table->toolbarActions(
|
return $table->toolbarActions(
|
||||||
array_map(
|
array_map(
|
||||||
fn ($action) => $action instanceof BulkAction && $action->getName() === 'bulk_refund'
|
fn ($action) => $action instanceof BulkAction && $action->getName() === 'bulk_refund'
|
||||||
@@ -29,6 +67,88 @@ class OrderItemsTableExtension extends BaseExtension
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function addCustomFieldsColumn(Panel $panel): void
|
||||||
|
{
|
||||||
|
$stack = $panel->getComponents()[0] ?? null;
|
||||||
|
|
||||||
|
if ($stack === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$stack->schema([
|
||||||
|
...$stack->getComponents(),
|
||||||
|
TextColumn::make('custom_fields')
|
||||||
|
->label('Custom Fields')
|
||||||
|
->visible(fn (OrderLine $record) => filled($record->meta['custom_fields'] ?? null))
|
||||||
|
->getStateUsing(fn (OrderLine $record) => $this->renderCustomFields($record))
|
||||||
|
->html(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Same table markup/classes as this Panel's own existing KeyValue
|
||||||
|
* component (Lunar\Admin's price_breakdowns, right above this in the
|
||||||
|
* dropdown — see lunarpanel::tables.components.key-value) for visual
|
||||||
|
* consistency, rebuilt here rather than reused: KeyValue's Blade view
|
||||||
|
* HTML-escapes every value ({{ $value }}), which can't render a
|
||||||
|
* thumbnail/download link for a file answer.
|
||||||
|
*/
|
||||||
|
private function renderCustomFields(OrderLine $record): HtmlString
|
||||||
|
{
|
||||||
|
$rows = collect($record->meta['custom_fields'] ?? [])
|
||||||
|
->map(fn (array $field) => sprintf(
|
||||||
|
'<tr class="divide-x divide-gray-950/10 dark:divide-white/10"><td class="p-2 font-medium whitespace-nowrap">%s</td><td class="p-2">%s</td></tr>',
|
||||||
|
e($field['label']),
|
||||||
|
$field['type'] === 'file' ? $this->fileCell($field) : e($field['value'] ?? ''),
|
||||||
|
))
|
||||||
|
->implode('');
|
||||||
|
|
||||||
|
return new HtmlString(
|
||||||
|
'<div class="w-full mt-2 overflow-hidden overflow-x-auto ring-1 ring-inset ring-gray-950/10 dark:ring-white/10 rounded bg-white/70 dark:bg-white/5">'
|
||||||
|
.'<table class="min-w-full text-xs divide-y divide-gray-950/10 dark:divide-white/10"><tbody class="divide-y divide-gray-950/10 dark:divide-white/10">'
|
||||||
|
.$rows
|
||||||
|
.'</tbody></table></div>',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A thumbnail (previewable image types only — an inline-signed URL to
|
||||||
|
* the same File; see FileService::retrieve()) alongside an icon-only
|
||||||
|
* download link forcing Content-Disposition: attachment (FileService::
|
||||||
|
* download()) — two separate signed URLs, not one reused with a query
|
||||||
|
* string appended after signing, since a signature covers the exact
|
||||||
|
* query parameters present when it was minted.
|
||||||
|
*/
|
||||||
|
private function fileCell(array $field): string
|
||||||
|
{
|
||||||
|
$file = File::find($field['file_id'] ?? null);
|
||||||
|
|
||||||
|
if ($file === null) {
|
||||||
|
return __('lunarpanel::global.na');
|
||||||
|
}
|
||||||
|
|
||||||
|
$previewUrl = URL::temporarySignedRoute('files.download', now()->addHours(2), ['file' => $file->id]);
|
||||||
|
$downloadUrl = URL::temporarySignedRoute('files.download', now()->addHours(2), ['file' => $file->id, 'download' => 1]);
|
||||||
|
$previewable = ['image/jpeg', 'image/png', 'image/webp', 'image/gif'];
|
||||||
|
|
||||||
|
$thumbnail = in_array($file->mime, $previewable, true)
|
||||||
|
? sprintf(
|
||||||
|
'<a href="%s" target="_blank" rel="noopener"><img src="%s" alt="" style="width:2.5rem;height:2.5rem;object-fit:cover;border-radius:0.375rem;vertical-align:middle"></a>',
|
||||||
|
$previewUrl,
|
||||||
|
$previewUrl,
|
||||||
|
)
|
||||||
|
: '';
|
||||||
|
|
||||||
|
return sprintf(
|
||||||
|
'<div style="display:flex;align-items:center;gap:0.5rem">%s<span>%s</span><a href="%s" title="Download" style="color:rgb(%s);display:inline-flex">%s</a></div>',
|
||||||
|
$thumbnail,
|
||||||
|
e($file->original_name),
|
||||||
|
$downloadUrl,
|
||||||
|
Color::Blue[600],
|
||||||
|
Blade::render('<x-filament::icon icon="heroicon-o-arrow-down-tray" style="width:1rem;height:1rem"/>'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
private function fixFailureNotification(BulkAction $action): BulkAction
|
private function fixFailureNotification(BulkAction $action): BulkAction
|
||||||
{
|
{
|
||||||
$originalAction = $action->getActionFunction();
|
$originalAction = $action->getActionFunction();
|
||||||
|
|||||||
@@ -2,11 +2,17 @@
|
|||||||
|
|
||||||
namespace Modules\Core\Providers;
|
namespace Modules\Core\Providers;
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Event;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
|
use Modules\Core\Cart\Events\CartLineAdded;
|
||||||
|
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||||
use Modules\Core\File\Adapters\LocalFileAdapter;
|
use Modules\Core\File\Adapters\LocalFileAdapter;
|
||||||
|
use Modules\Core\File\Commands\PruneUnownedFilesCommand;
|
||||||
use Modules\Core\File\Contracts\FileAdapterInterface;
|
use Modules\Core\File\Contracts\FileAdapterInterface;
|
||||||
|
use Modules\Core\File\Listeners\AttachCustomFieldFileToCartLine;
|
||||||
|
use Modules\Core\File\Listeners\TransferCustomFieldFileOwnership;
|
||||||
|
|
||||||
class FileServiceProvider extends ServiceProvider
|
class FileServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
@@ -29,6 +35,17 @@ class FileServiceProvider extends ServiceProvider
|
|||||||
|
|
||||||
public function boot(): void
|
public function boot(): void
|
||||||
{
|
{
|
||||||
$this->loadMigrationsFrom(__DIR__.'/../../database/migrations');
|
// Signed-URL auth only, same model as Shipping\Http\Controllers\
|
||||||
|
// DownloadShipmentLabelController — see that route's own docblock.
|
||||||
|
// Migrations live in the shared database/migrations directory
|
||||||
|
// CoreServiceProvider already loads; nothing more to register here.
|
||||||
|
$this->loadRoutesFrom(__DIR__.'/../File/routes/web.php');
|
||||||
|
|
||||||
|
Event::listen(CartLineAdded::class, AttachCustomFieldFileToCartLine::class);
|
||||||
|
Event::listen(OrderPlaced::class, TransferCustomFieldFileOwnership::class);
|
||||||
|
|
||||||
|
if ($this->app->runningInConsole()) {
|
||||||
|
$this->commands([PruneUnownedFilesCommand::class]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user