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

platform_orders index: compact view shows subscription ends_at date-only

Browse Source
This commit is contained in:
萝卜
2026-03-14 12:47:20 +00:00
parent bf58d6da9c
commit b89789faf1
2 changed files with 95 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/admin/platform_orders/index.blade.php
View File

@@ -1130,7 +1130,13 @@
<span class="muted">-</span>
@endif
</td>
<td>{{ optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '-' }}</td>
<td>
@if($isFullView)
{{ optional($order->siteSubscription?->ends_at)->format('Y-m-d H:i:s') ?: '-' }}
@else
{{ optional($order->siteSubscription?->ends_at)->format('Y-m-d') ?: '-' }}
@endif
</td>
<td class="col-optional">{{ data_get($order->meta, 'subscription_activation.synced_at') ?: '-' }}</td>
<td class="col-optional">
@php

88
tests/Feature/AdminPlatformOrderIndexCompactViewSubscriptionEndsAtFormatTest.php Normal file
View File

@@ -0,0 +1,88 @@
<?php
namespace Tests\Feature;
use App\Models\Merchant;
use App\Models\Plan;
use App\Models\PlatformOrder;
use App\Models\SiteSubscription;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AdminPlatformOrderIndexCompactViewSubscriptionEndsAtFormatTest 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_compact_view_subscription_ends_at_shows_date_only_full_view_shows_datetime(): void
{
$this->loginAsPlatformAdmin();
$merchant = Merchant::query()->firstOrFail();
$plan = Plan::query()->create([
'code' => 'po_index_sub_ends_at_format_plan',
'name' => '平台订单列表订阅到期时间格式测试套餐',
'billing_cycle' => 'monthly',
'price' => 10,
'list_price' => 10,
'status' => 'active',
'sort' => 10,
'published_at' => now(),
]);
$endsAt = now()->setDate(2026, 3, 31)->setTime(23, 59, 59);
$sub = SiteSubscription::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'status' => 'active',
'source' => 'test',
'subscription_no' => 'SS_ENDS_AT_FORMAT_0001',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'amount' => 10,
'starts_at' => now(),
'ends_at' => $endsAt,
]);
PlatformOrder::query()->create([
'merchant_id' => $merchant->id,
'plan_id' => $plan->id,
'site_subscription_id' => $sub->id,
'order_no' => 'PO_INDEX_SUB_ENDS_AT_0001',
'order_type' => 'renewal',
'status' => 'activated',
'payment_status' => 'paid',
'plan_name' => $plan->name,
'billing_cycle' => $plan->billing_cycle,
'period_months' => 1,
'quantity' => 1,
'payable_amount' => 10,
'paid_amount' => 10,
'placed_at' => now(),
'paid_at' => now(),
'activated_at' => now(),
'meta' => [],
]);
$this->get('/admin/platform-orders')
->assertOk()
->assertSee('2026-03-31', false)
->assertDontSee('23:59:59', false);
$this->get('/admin/platform-orders?view=full')
->assertOk()
->assertSee('2026-03-31 23:59:59', false);
}
}