Fix fatal duplicate symbols from church→shop/menu rename.
Deploy Ladill Merchant / deploy (push) Successful in 36s
Deploy Ladill Merchant / deploy (push) Successful in 36s
The customize script's blind TYPE_CHURCH→TYPE_SHOP and churchLogo→menuLogo replacements created a duplicate QrCode::TYPE_SHOP constant and duplicate QrScanController::menuLogo()/menuCover() methods — fatal at request time (crashed /dashboard with 500). The menu* methods already cover TYPE_SHOP, so drop the redundant church-origin copies. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
6cf796fa60
commit
62b3fcd479
@@ -254,36 +254,6 @@ class QrScanController extends Controller
|
||||
return Storage::disk('qr')->response($path);
|
||||
}
|
||||
|
||||
public function menuLogo(string $shortCode): StreamedResponse
|
||||
{
|
||||
$qrCode = QrCode::query()
|
||||
->where('short_code', $shortCode)
|
||||
->where('is_active', true)
|
||||
->firstOrFail();
|
||||
|
||||
abort_unless($qrCode->type === QrCode::TYPE_SHOP, 404);
|
||||
|
||||
$path = $qrCode->content()['logo_path'] ?? null;
|
||||
abort_unless($path && Storage::disk('qr')->exists($path), 404);
|
||||
|
||||
return Storage::disk('qr')->response($path);
|
||||
}
|
||||
|
||||
public function menuCover(string $shortCode): StreamedResponse
|
||||
{
|
||||
$qrCode = QrCode::query()
|
||||
->where('short_code', $shortCode)
|
||||
->where('is_active', true)
|
||||
->firstOrFail();
|
||||
|
||||
abort_unless($qrCode->type === QrCode::TYPE_SHOP, 404);
|
||||
|
||||
$path = $qrCode->content()['cover_path'] ?? null;
|
||||
abort_unless($path && Storage::disk('qr')->exists($path), 404);
|
||||
|
||||
return Storage::disk('qr')->response($path);
|
||||
}
|
||||
|
||||
public function paymentLogo(string $shortCode): StreamedResponse
|
||||
{
|
||||
return $this->serveContentImage($shortCode, QrCode::TYPE_PAYMENT, 'logo_path');
|
||||
|
||||
Reference in New Issue
Block a user