Dashboard scanline: sync/bmpa none links to order governance actions
This commit is contained in:
@@ -839,6 +839,7 @@
|
|||||||
@forelse(($recentPlatformOrders ?? []) as $po)
|
@forelse(($recentPlatformOrders ?? []) as $po)
|
||||||
@php
|
@php
|
||||||
$poShowUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/' . $po->id, $selfWithoutBack);
|
$poShowUrl = \App\Support\BackUrl::withBack('/admin/platform-orders/' . $po->id, $selfWithoutBack);
|
||||||
|
$poShowGovernanceUrl = \App\Support\BackUrl::withBackAndFragment('/admin/platform-orders/' . $po->id, $selfWithoutBack, 'order-governance-actions');
|
||||||
|
|
||||||
$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);
|
||||||
@@ -988,7 +989,7 @@
|
|||||||
@elseif($syncStatusText === '成功')
|
@elseif($syncStatusText === '成功')
|
||||||
<a class="link" href="{!! $syncedListUrl !!}"><strong>{{ $syncStatusText }}</strong></a>
|
<a class="link" href="{!! $syncedListUrl !!}"><strong>{{ $syncStatusText }}</strong></a>
|
||||||
@else
|
@else
|
||||||
<strong>{{ $syncStatusText }}</strong>
|
<a class="link" href="{!! $poShowGovernanceUrl !!}"><strong>{{ $syncStatusText }}</strong></a>
|
||||||
@endif
|
@endif
|
||||||
</span>
|
</span>
|
||||||
<span class="adm-order-scansep">|</span>
|
<span class="adm-order-scansep">|</span>
|
||||||
@@ -999,7 +1000,7 @@
|
|||||||
@elseif($bmpaStatusText === '成功' && $scanGoBmpaSuccessUrl !== '')
|
@elseif($bmpaStatusText === '成功' && $scanGoBmpaSuccessUrl !== '')
|
||||||
<a class="link" href="{!! $scanGoBmpaSuccessUrl !!}"><strong>{{ $bmpaStatusText }}</strong></a>
|
<a class="link" href="{!! $scanGoBmpaSuccessUrl !!}"><strong>{{ $bmpaStatusText }}</strong></a>
|
||||||
@else
|
@else
|
||||||
<strong>{{ $bmpaStatusText }}</strong>
|
<a class="link" href="{!! $poShowGovernanceUrl !!}"><strong>{{ $bmpaStatusText }}</strong></a>
|
||||||
@endif
|
@endif
|
||||||
</span>
|
</span>
|
||||||
<span class="adm-order-scansep">|</span>
|
<span class="adm-order-scansep">|</span>
|
||||||
|
|||||||
@@ -261,7 +261,7 @@
|
|||||||
$markPaidBlockedByReceiptMismatch = $receiptCents > 0 && abs($receiptCents - $expectedCents) >= $tolCents;
|
$markPaidBlockedByReceiptMismatch = $receiptCents > 0 && abs($receiptCents - $expectedCents) >= $tolCents;
|
||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
<div class="actions mt-16 gap-12">
|
<div class="actions mt-16 gap-12" id="order-governance-actions">
|
||||||
<form method="post" action="/admin/platform-orders/{{ $order->id }}/mark-paid-and-activate" data-action="disable-on-submit" onsubmit="return confirm('确认将该订单标记为已支付并生效?此操作会推进状态并尝试同步订阅');">
|
<form method="post" action="/admin/platform-orders/{{ $order->id }}/mark-paid-and-activate" data-action="disable-on-submit" onsubmit="return confirm('确认将该订单标记为已支付并生效?此操作会推进状态并尝试同步订阅');">
|
||||||
@csrf
|
@csrf
|
||||||
<button class="btn btn-sm" type="submit" @disabled(! $canMarkPaid || $markPaidBlockedByRefund || $markPaidBlockedByReceiptMismatch || $markPaidBlockedByMissingSubscriptionOnRenewal)>标记支付并生效</button>
|
<button class="btn btn-sm" type="submit" @disabled(! $canMarkPaid || $markPaidBlockedByRefund || $markPaidBlockedByReceiptMismatch || $markPaidBlockedByMissingSubscriptionOnRenewal)>标记支付并生效</button>
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Admin;
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\Plan;
|
||||||
|
use App\Models\PlatformOrder;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminDashboardRecentPlatformOrdersScanlineBmpaNoneShouldLinkToOrderGovernanceActionsTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
protected function loginAsPlatformAdmin(): void
|
||||||
|
{
|
||||||
|
$this->seed();
|
||||||
|
|
||||||
|
$this->post('/admin/login', [
|
||||||
|
'email' => 'platform.admin@demo.local',
|
||||||
|
'password' => 'Platform@123456',
|
||||||
|
])->assertRedirect('/admin');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_dashboard_recent_platform_orders_scanline_bmpa_none_should_link_to_order_governance_actions(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
// 清理 seed 订单,避免最近订单列表被 seed 污染导致断言不稳定。
|
||||||
|
PlatformOrder::query()->delete();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
|
||||||
|
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'dash_recent_order_scanline_bmpa_none_plan',
|
||||||
|
'name' => '仪表盘扫描行BMPA无直达测试套餐',
|
||||||
|
'billing_cycle' => 'monthly',
|
||||||
|
'price' => 10,
|
||||||
|
'list_price' => 10,
|
||||||
|
'status' => 'active',
|
||||||
|
'sort' => 10,
|
||||||
|
'published_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'site_subscription_id' => null,
|
||||||
|
'created_by_admin_id' => $platformAdminId ?: null,
|
||||||
|
'order_no' => 'PO_DASH_SCANLINE_BMPA_NONE_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'pending',
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'payable_amount' => 10,
|
||||||
|
'paid_amount' => 10,
|
||||||
|
'placed_at' => now(),
|
||||||
|
'paid_at' => now(),
|
||||||
|
'meta' => [
|
||||||
|
// 无 batch_mark_paid_and_activate / 无 error => 预期扫描行显示“BMPA:无”
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin');
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('PO_DASH_SCANLINE_BMPA_NONE_0001');
|
||||||
|
|
||||||
|
// “BMPA:无”应可直达订单详情的治理动作区(#order-governance-actions)
|
||||||
|
$res->assertSee('BMPA:', false);
|
||||||
|
$res->assertSee('<strong>无</strong>', false);
|
||||||
|
$res->assertSee('#order-governance-actions', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use App\Models\Admin;
|
||||||
|
use App\Models\Merchant;
|
||||||
|
use App\Models\Plan;
|
||||||
|
use App\Models\PlatformOrder;
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AdminDashboardRecentPlatformOrdersScanlineSyncNoneShouldLinkToOrderGovernanceActionsTest extends TestCase
|
||||||
|
{
|
||||||
|
use RefreshDatabase;
|
||||||
|
|
||||||
|
protected function loginAsPlatformAdmin(): void
|
||||||
|
{
|
||||||
|
$this->seed();
|
||||||
|
|
||||||
|
$this->post('/admin/login', [
|
||||||
|
'email' => 'platform.admin@demo.local',
|
||||||
|
'password' => 'Platform@123456',
|
||||||
|
])->assertRedirect('/admin');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_dashboard_recent_platform_orders_scanline_sync_none_should_link_to_order_governance_actions(): void
|
||||||
|
{
|
||||||
|
$this->loginAsPlatformAdmin();
|
||||||
|
|
||||||
|
// 清理 seed 订单,避免最近订单列表被 seed 污染导致断言不稳定。
|
||||||
|
PlatformOrder::query()->delete();
|
||||||
|
|
||||||
|
$merchant = Merchant::query()->firstOrFail();
|
||||||
|
$platformAdminId = (int) Admin::query()->where('email', 'platform.admin@demo.local')->value('id');
|
||||||
|
|
||||||
|
$plan = Plan::query()->create([
|
||||||
|
'code' => 'dash_recent_order_scanline_sync_none_plan',
|
||||||
|
'name' => '仪表盘扫描行同步无直达测试套餐',
|
||||||
|
'billing_cycle' => 'monthly',
|
||||||
|
'price' => 10,
|
||||||
|
'list_price' => 10,
|
||||||
|
'status' => 'active',
|
||||||
|
'sort' => 10,
|
||||||
|
'published_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
PlatformOrder::query()->create([
|
||||||
|
'merchant_id' => $merchant->id,
|
||||||
|
'plan_id' => $plan->id,
|
||||||
|
'site_subscription_id' => null,
|
||||||
|
'created_by_admin_id' => $platformAdminId ?: null,
|
||||||
|
'order_no' => 'PO_DASH_SCANLINE_SYNC_NONE_0001',
|
||||||
|
'order_type' => 'new_purchase',
|
||||||
|
'status' => 'pending',
|
||||||
|
'payment_status' => 'paid',
|
||||||
|
'payable_amount' => 10,
|
||||||
|
'paid_amount' => 10,
|
||||||
|
'placed_at' => now(),
|
||||||
|
'paid_at' => now(),
|
||||||
|
'meta' => [
|
||||||
|
// 无 subscription_activation / 无 error => 预期扫描行显示“同步:无”
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$res = $this->get('/admin');
|
||||||
|
$res->assertOk();
|
||||||
|
|
||||||
|
$res->assertSee('PO_DASH_SCANLINE_SYNC_NONE_0001');
|
||||||
|
|
||||||
|
// “同步:无”应可直达订单详情的治理动作区(#order-governance-actions)
|
||||||
|
$res->assertSee('同步:', false);
|
||||||
|
$res->assertSee('<strong>无</strong>', false);
|
||||||
|
$res->assertSee('#order-governance-actions', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user