linxianzhuang/saasshop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(admin): 去重阻断warning返回改用AdminFlash::apply收敛with逻辑

Browse Source
This commit is contained in:
萝卜
2026-03-17 19:13:19 +08:00
parent 23476b0ac3
commit 1725eae6b2
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Admin/PlatformOrderController.php
View File

@@ -1634,15 +1634,7 @@ class PlatformOrderController extends Controller
$flash = \App\Support\BatchDispatchWarning::build('BAS ', $existing, 'bas');
$res = redirect()->back()->with('warning', (string) ($flash['warning'] ?? ''));
foreach (['warning_link_href', 'warning_link_label', 'warning_copy_text', 'warning_copy_label'] as $k) {
if (isset($flash[$k]) && (string) $flash[$k] !== '') {
$res = $res->with($k, (string) $flash[$k]);
}
}
return $res;
return \App\Support\AdminFlash::apply(redirect()->back(), $flash);
}
\App\Jobs\BatchActivateSubscriptionsJob::dispatch(
@@ -1790,15 +1782,7 @@ class PlatformOrderController extends Controller
$flash = \App\Support\BatchDispatchWarning::build('BMPA ', $existing, 'bmpa');
$res = redirect()->back()->with('warning', (string) ($flash['warning'] ?? ''));
foreach (['warning_link_href', 'warning_link_label', 'warning_copy_text', 'warning_copy_label'] as $k) {
if (isset($flash[$k]) && (string) $flash[$k] !== '') {
$res = $res->with($k, (string) $flash[$k]);
}
}
return $res;
return \App\Support\AdminFlash::apply(redirect()->back(), $flash);
}
\App\Jobs\BatchMarkPaidAndActivateJob::dispatch(