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

chore(admin-dashboard): dedupe add-refund-receipt link (reuse fixRefundReceiptUrl)

Browse Source
This commit is contained in:
萝卜
2026-03-16 17:05:46 +08:00
parent 73e557230a
commit cef5783612
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/admin/dashboard.blade.php
View File

@@ -312,6 +312,7 @@
$hasReceiptEvidence = (data_get($po->meta, 'payment_summary.total_amount') !== null) $hasReceiptEvidence = (data_get($po->meta, 'payment_summary.total_amount') !== null)
|| (data_get($po->meta, 'payment_receipts.0.amount') !== null); || (data_get($po->meta, 'payment_receipts.0.amount') !== null);
$fixReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-payment-receipt'); $fixReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-payment-receipt');
$fixRefundReceiptUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-refund-receipt');
$noReceiptListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?payment_status=paid&receipt_status=none', $selfWithoutBack); $noReceiptListUrl = \App\Support\BackUrl::withBack('/admin/platform-orders?payment_status=paid&receipt_status=none', $selfWithoutBack);
$syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? ''); $syncErrMsg = (string) (data_get($po->meta, 'subscription_activation_error.message') ?? '');
@@ -498,7 +499,7 @@
<span class="muted">｜</span> <span class="muted">｜</span>
<a class="link" href="{!! $scanGoRefundUrl !!}">去核对退款</a> <a class="link" href="{!! $scanGoRefundUrl !!}">去核对退款</a>
<span class="muted">｜</span> <span class="muted">｜</span>
<a class="link" href="{!! \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'add-refund-receipt') !!}">去补退款记录</a> <a class="link" href="{!! $fixRefundReceiptUrl !!}">去补退款记录</a>
</div> </div>
@endif @endif
@if((string) $po->order_type === 'renewal' && empty($po->site_subscription_id)) @if((string) $po->order_type === 'renewal' && empty($po->site_subscription_id))

6
tests/Feature/AdminDashboardRecentPlatformOrdersShouldNotUseDuplicateBackUrlWithBackAndFragmentCallsTest.php
View File

@@ -38,11 +38,17 @@ class AdminDashboardRecentPlatformOrdersShouldNotUseDuplicateBackUrlWithBackAndF
"BackUrl::withBackAndFragment('/admin/platform-orders/' . \$po->id, \$selfWithoutBack, 'relation-subscription')" "BackUrl::withBackAndFragment('/admin/platform-orders/' . \$po->id, \$selfWithoutBack, 'relation-subscription')"
)); ));
$this->assertSame(1, substr_count(
$blade,
"BackUrl::withBackAndFragment('/admin/platform-orders/' . \$po->id, \$selfWithoutBack, 'add-refund-receipt')"
));
// 仍应存在变量引用（说明已收敛到统一变量） // 仍应存在变量引用（说明已收敛到统一变量）
$this->assertStringContainsString('$scanGoSyncFailedUrl', $blade); $this->assertStringContainsString('$scanGoSyncFailedUrl', $blade);
$this->assertStringContainsString('$scanGoBmpaFailedUrl', $blade); $this->assertStringContainsString('$scanGoBmpaFailedUrl', $blade);
$this->assertStringContainsString('$scanGoReconcileUrl', $blade); $this->assertStringContainsString('$scanGoReconcileUrl', $blade);
$this->assertStringContainsString('$scanGoRefundUrl', $blade); $this->assertStringContainsString('$scanGoRefundUrl', $blade);
$this->assertStringContainsString('$scanGoRelationUrl', $blade); $this->assertStringContainsString('$scanGoRelationUrl', $blade);
$this->assertStringContainsString('$fixRefundReceiptUrl', $blade);
} }
} }