fix: 移除保留账户旧网银钱包并统一返回入口 #1237
@ -68,7 +68,7 @@ class FinanceLedger extends Controller
|
||||
$ledgerData['ledgerStandaloneAccountBackUrl'] = route('business.pages.show', [
|
||||
'section' => 'financial-operations',
|
||||
'page' => 'ledger',
|
||||
]) . '?tab=flows&flows_view=basic';
|
||||
]) . '?tab=overview';
|
||||
|
||||
return view('business.pages.financial-ledger.account-basic-page', [
|
||||
'ledgerData' => $ledgerData,
|
||||
|
||||
@ -96,13 +96,10 @@ final class NonStoreAccountMonitorPageData
|
||||
->where('category', self::CATEGORY_WANGSHANG)
|
||||
->values()
|
||||
->all();
|
||||
$fundOverview['legacy_wallet_accounts'] = $retained
|
||||
->where('category', self::CATEGORY_LEGACY_WALLET)
|
||||
->values()
|
||||
->all();
|
||||
$positiveBalanceTotal = (float) $retained
|
||||
->sum(static fn (array $row): float => max(0.0, (float) $row['current_balance']));
|
||||
$fundDistribution = collect(self::CATEGORY_LABELS)
|
||||
->except([self::CATEGORY_LEGACY_WALLET])
|
||||
->map(function (string $platform, string $category) use ($retained, $positiveBalanceTotal): array {
|
||||
$rows = $retained->where('category', $category)->values();
|
||||
$summary = $this->summary($rows);
|
||||
@ -608,7 +605,9 @@ final class NonStoreAccountMonitorPageData
|
||||
);
|
||||
$categories = $sectionKey === 'direct'
|
||||
? [self::CATEGORY_BANK => self::CATEGORY_LABELS[self::CATEGORY_BANK]]
|
||||
: self::CATEGORY_LABELS;
|
||||
: collect(self::CATEGORY_LABELS)
|
||||
->except([self::CATEGORY_LEGACY_WALLET])
|
||||
->all();
|
||||
foreach ($categories as $category => $label) {
|
||||
$categoryRows = $sectionRows->where('category', $category)->values();
|
||||
$section['rows'][] = [
|
||||
@ -877,7 +876,6 @@ final class NonStoreAccountMonitorPageData
|
||||
self::CATEGORY_BANK => '银行账户',
|
||||
self::CATEGORY_ALIPAY => '支付宝',
|
||||
self::CATEGORY_WANGSHANG => '网商银行',
|
||||
self::CATEGORY_LEGACY_WALLET => '旧网银钱包',
|
||||
self::CATEGORY_OTHER => '其他账户',
|
||||
] as $category => $label) {
|
||||
$query = [
|
||||
|
||||
@ -1045,13 +1045,13 @@
|
||||
@if ($standaloneAccountView !== null)
|
||||
<header class="ledger-standalone-account-header" data-ledger-standalone-account="{{ $standaloneAccountView }}">
|
||||
<div class="ledger-standalone-account-header__copy">
|
||||
<span class="ledger-standalone-account-header__eyebrow">账户基本信息</span>
|
||||
<span class="ledger-standalone-account-header__eyebrow">账户总览 · 账户档案</span>
|
||||
<h2>{{ $standaloneAccountTitle }}</h2>
|
||||
<p>{{ $standaloneAccountDescription }}。当前为独立页面,筛选、列设置和账户编辑均只在本页进行。</p>
|
||||
</div>
|
||||
<a class="ledger-standalone-account-back" href="{{ $standaloneAccountBackUrl }}">
|
||||
<span class="material-icons-outlined" aria-hidden="true">arrow_back</span>
|
||||
返回账户基本信息
|
||||
返回账户总览
|
||||
</a>
|
||||
</header>
|
||||
@else
|
||||
@ -1793,7 +1793,7 @@
|
||||
@include('business.pages.financial-ledger.partials.account-home-tabs')
|
||||
@if ($flowView === 'basic')
|
||||
@include('business.pages.financial-ledger.partials.account-type-cards', [
|
||||
'accountTypeCardsBackUrl' => $flowViewUrl('summary'),
|
||||
'accountTypeCardsBackUrl' => $ledgerPageUrl . '?tab=overview',
|
||||
])
|
||||
@else
|
||||
@if ($flowView === 'daily')
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<h3>账户基本信息</h3>
|
||||
<p>点击账户类型卡片查看对应账户资料;每种账户只展示自己需要的表头。</p>
|
||||
</div>
|
||||
<a class="ledger-btn" href="{{ $accountTypeCardsBackUrl }}"><span class="material-icons-outlined" aria-hidden="true">arrow_back</span>返回</a>
|
||||
<a class="ledger-btn" href="{{ $accountTypeCardsBackUrl }}"><span class="material-icons-outlined" aria-hidden="true">arrow_back</span>返回账户总览</a>
|
||||
</header>
|
||||
<div class="ledger-account-type-grid">
|
||||
@foreach ($ledgerAccountTypeCards as $card)
|
||||
|
||||
@ -1655,7 +1655,7 @@
|
||||
<button type="button" role="menuitem" data-bank-drilldown-open data-bank-mode="direct">银企直连</button>
|
||||
</div>
|
||||
</div>
|
||||
@elseif (in_array($distribution['category'], ['other', 'alipay', 'wangshang', 'legacy_wallet'], true))
|
||||
@elseif (in_array($distribution['category'], ['other', 'alipay', 'wangshang'], true))
|
||||
<button
|
||||
class="nsm-number-link"
|
||||
type="button"
|
||||
@ -1745,15 +1745,6 @@
|
||||
'accounts' => $fundOverview['wangshang_accounts'],
|
||||
])
|
||||
|
||||
@include('business.pages.financial-operations.partials.platform-account-detail', [
|
||||
'category' => 'legacy_wallet',
|
||||
'detailId' => 'nsm-legacy-wallet-drilldown',
|
||||
'title' => '旧网银钱包账户明细',
|
||||
'description' => '旧网银钱包统一归入不保留账户,此处仅保留分类入口',
|
||||
'accounts' => $fundOverview['legacy_wallet_accounts'],
|
||||
'emptyMessage' => '当前没有保留的旧网银钱包账户,后续可在此维护。',
|
||||
])
|
||||
|
||||
<section class="nsm-bank-detail" id="nsm-bank-drilldown" data-bank-drilldown hidden>
|
||||
<div class="nsm-bank-panel" data-bank-panel="direct" hidden>
|
||||
<header class="nsm-bank-detail__head">
|
||||
@ -2040,6 +2031,7 @@
|
||||
@elseif ($monitorView === 'accounts')
|
||||
@php
|
||||
$activeCategoryLabel = $categoryOptions[$accountFilters['category']] ?? '全部账户类型';
|
||||
$retainedCategoryOptions = array_diff_key($categoryOptions, ['legacy_wallet' => true]);
|
||||
@endphp
|
||||
<section class="nsm-page-head">
|
||||
<div class="nsm-page-head__main">
|
||||
@ -2080,7 +2072,7 @@
|
||||
<label class="nsm-field">
|
||||
账户类型
|
||||
<select name="account_category" data-account-category>
|
||||
@foreach ($categoryOptions as $value => $label)
|
||||
@foreach ($retainedCategoryOptions as $value => $label)
|
||||
<option value="{{ $value }}" @selected($accountFilters['category'] === $value)>{{ $label }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
|
||||
@ -237,14 +237,14 @@ class FinanceLedgerNavigationTest extends FeatureTestCase
|
||||
$backUrl = route('business.pages.show', [
|
||||
'section' => 'financial-operations',
|
||||
'page' => 'ledger',
|
||||
]) . '?tab=flows&flows_view=basic';
|
||||
]) . '?tab=overview';
|
||||
|
||||
foreach (FinanceLedgerPageData::ACCOUNT_TYPE_VIEWS as $view => $definition) {
|
||||
$url = route('business.financial-ledger.account-basic', ['view' => $view]);
|
||||
$html = $this->get($url)
|
||||
->assertOk()
|
||||
->assertSeeText($definition['title'])
|
||||
->assertSeeText('返回账户基本信息')
|
||||
->assertSeeText('返回账户总览')
|
||||
->getContent();
|
||||
|
||||
$this->assertStringContainsString('data-ledger-standalone-account="' . $view . '"', $html);
|
||||
|
||||
@ -201,9 +201,14 @@ class NonStoreAccountMonitorTest extends FeatureTestCase
|
||||
$this->assertStringContainsString('data-platform-account-detail="alipay"', $html);
|
||||
$this->assertStringContainsString('data-platform-account-open="wangshang"', $html);
|
||||
$this->assertStringContainsString('data-platform-account-detail="wangshang"', $html);
|
||||
$this->assertStringContainsString('<td>旧网银钱包</td>', $html);
|
||||
$this->assertStringContainsString('data-platform-account-open="legacy_wallet"', $html);
|
||||
$this->assertStringContainsString('data-platform-account-detail="legacy_wallet"', $html);
|
||||
$retainedDialog = $this->dialogHtml($html, 'data-retained-dialog');
|
||||
$unretainedDialog = $this->dialogHtml($html, 'data-unretained-dialog');
|
||||
$this->assertStringNotContainsString('<td>旧网银钱包</td>', $retainedDialog);
|
||||
$this->assertStringNotContainsString('data-platform-account-open="legacy_wallet"', $retainedDialog);
|
||||
$this->assertStringNotContainsString('data-platform-account-detail="legacy_wallet"', $retainedDialog);
|
||||
$this->assertStringContainsString('<td>旧网银钱包</td>', $unretainedDialog);
|
||||
$this->assertStringContainsString('data-platform-account-open="legacy_wallet"', $unretainedDialog);
|
||||
$this->assertStringContainsString('data-platform-account-detail="legacy_wallet"', $unretainedDialog);
|
||||
$this->assertStringContainsString('data-account-archive-open', $html);
|
||||
$this->assertStringContainsString('account_category=all', $html);
|
||||
$this->assertStringContainsString('<td>工商银行</td>', $html);
|
||||
@ -283,14 +288,20 @@ class NonStoreAccountMonitorTest extends FeatureTestCase
|
||||
]);
|
||||
|
||||
$overviewHtml = $this->loginAs()->get($this->pageUrl())->assertOk()->getContent();
|
||||
$this->assertStringContainsString('data-platform-account-open="legacy_wallet"', $overviewHtml);
|
||||
$this->assertStringContainsString('测试旧网银钱包', $overviewHtml);
|
||||
$retainedDialog = $this->dialogHtml($overviewHtml, 'data-retained-dialog');
|
||||
$unretainedDialog = $this->dialogHtml($overviewHtml, 'data-unretained-dialog');
|
||||
$this->assertStringNotContainsString('旧网银钱包', $retainedDialog);
|
||||
$this->assertStringNotContainsString('测试旧网银钱包', $retainedDialog);
|
||||
$this->assertStringContainsString('data-platform-account-open="legacy_wallet"', $unretainedDialog);
|
||||
$this->assertStringContainsString('测试旧网银钱包', $unretainedDialog);
|
||||
|
||||
$retainedHtml = $this->loginAs()->get($this->pageUrl([
|
||||
'view' => 'accounts',
|
||||
'account_category' => 'all',
|
||||
]))->assertOk()->getContent();
|
||||
$this->assertStringNotContainsString('测试旧网银钱包', $retainedHtml);
|
||||
$this->assertStringNotContainsString('value="legacy_wallet"', $retainedHtml);
|
||||
$this->assertStringNotContainsString('account_category=legacy_wallet', $retainedHtml);
|
||||
|
||||
$unretainedHtml = $this->loginAs()->get($this->pageUrl([
|
||||
'view' => 'unretained_tasks',
|
||||
@ -567,4 +578,15 @@ class NonStoreAccountMonitorTest extends FeatureTestCase
|
||||
'page' => 'non-store-accounts',
|
||||
], $parameters));
|
||||
}
|
||||
|
||||
private function dialogHtml(string $html, string $attribute): string
|
||||
{
|
||||
$this->assertSame(1, preg_match(
|
||||
'/<dialog[^>]*\b' . preg_quote($attribute, '/') . '\b[^>]*>.*?<\/dialog>/s',
|
||||
$html,
|
||||
$matches,
|
||||
));
|
||||
|
||||
return $matches[0];
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user