feat(service): huỷ dịch vụ, SSL, đổi mật khẩu hosting, lịch sử thanh toán theo hình thức
- Lịch sử thanh toán hoá đơn trả thêm `method` (tự động gia hạn / số dư / admin / chuyển khoản / hoàn tiền), bỏ đuôi `(method)` khỏi ghi chú - `DnsServer::panelUrl()` = https://<domain>/ dùng cho email cấp hosting và nút Plesk của khách - Order item trả thêm `uuid`/`type` của dịch vụ để FE dẫn tới trang quản lý - Yêu cầu huỷ dịch vụ, chứng chỉ SSL, lịch sử gia hạn, đổi mật khẩu hosting cho khách Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5.5
parent
a6b641015e
commit
b44a88bb52
@@ -3,31 +3,34 @@
|
||||
namespace App\Http\Resources\Api\Client\Service;
|
||||
|
||||
use App\Models\DnsDomain;
|
||||
use App\Support\ResponseCipher;
|
||||
use App\Support\ServiceGroup;
|
||||
use App\Models\ModuleHostingPleskClient;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\Crypt;
|
||||
|
||||
class ServiceClientDetailResource extends JsonResource
|
||||
{
|
||||
public const MASKED_PASSWORD = '*****';
|
||||
private const IRRELEVANT_KEYS = [
|
||||
'hosting' => ['os', 'specs', 'vm', 'custom_product', 'ssl_certificate', 'dns_domain_id', 'dns_cancelled'],
|
||||
'vps' => ['hosting', 'service_plan', 'ssl_certificate', 'dns_domain_id', 'dns_cancelled'],
|
||||
'cloud' => ['hosting', 'service_plan', 'ssl_certificate', 'dns_domain_id', 'dns_cancelled'],
|
||||
'domain' => ['os', 'specs', 'vm', 'hosting', 'service_plan', 'custom_product', 'ssl_certificate'],
|
||||
'ssl' => ['os', 'specs', 'vm', 'hosting', 'service_plan', 'custom_product', 'dns_domain_id', 'dns_cancelled'],
|
||||
];
|
||||
|
||||
/** Plesk panel login (persisted, reusable) — separate from the one-time FTP password, which is never stored. */
|
||||
private function resolvePleskCredentials($hosting): ?array
|
||||
{
|
||||
$client = ModuleHostingPleskClient::query()
|
||||
->where('customer_id', $hosting->customer_id)
|
||||
->where('dns_manager_server_id', $hosting->dns_manager_server_id)
|
||||
->first();
|
||||
$client = ModuleHostingPleskClient::forHosting($hosting);
|
||||
|
||||
if (!$client) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
'login' => $client->login,
|
||||
'password' => Crypt::decryptString($client->password),
|
||||
];
|
||||
return ['login' => $client->login, 'password' => Crypt::decryptString($client->password)];
|
||||
}
|
||||
|
||||
private function resolveDnsZone(): ?DnsDomain
|
||||
@@ -101,9 +104,10 @@ class ServiceClientDetailResource extends JsonResource
|
||||
$dnsZone = $this->resolveDnsZone();
|
||||
$dnsCancelled = $dnsZone !== null && (int) $dnsZone->is_created === DnsDomain::STATUS_CANCELLED;
|
||||
|
||||
return [
|
||||
$payload = [
|
||||
'uuid' => $this->uuid,
|
||||
'type' => $this->type,
|
||||
'group' => ServiceGroup::of($this->orderItem?->product?->product_type ?? $this->product?->product_type, $this->orderItem?->product?->name ?? $this->product?->name),
|
||||
'server_name' => $this->server_name,
|
||||
'status' => $this->status,
|
||||
'auto_renew' => $this->auto_renew,
|
||||
@@ -132,8 +136,8 @@ class ServiceClientDetailResource extends JsonResource
|
||||
'vm' => $vm ? [
|
||||
'ip_address' => $vm->ipAddress?->ip ?? $vm->ip,
|
||||
'hostname' => $vm->hostname,
|
||||
'username' => $vm->user,
|
||||
'password' => $vm->plain_password ? self::MASKED_PASSWORD : null,
|
||||
'username' => ResponseCipher::encrypt($vm->user),
|
||||
'password' => ResponseCipher::encrypt($vm->plain_password),
|
||||
'port' => $vm->port,
|
||||
'status' => $vm->status,
|
||||
'ip' => $vm->ip ?? null,
|
||||
@@ -141,17 +145,29 @@ class ServiceClientDetailResource extends JsonResource
|
||||
] : null,
|
||||
'hosting' => $hosting ? [
|
||||
'ip_address' => $hosting->server?->publicHost(),
|
||||
'plesk_url' => $hosting->server
|
||||
? "http://{$hosting->server->publicHost()}:{$hosting->server->panel_port}/"
|
||||
: null,
|
||||
'hosting_plan' => $hosting->hosting_plan,
|
||||
'ftp_username' => $hosting->ftp_username,
|
||||
'username' => $pleskCredentials['login'] ?? null,
|
||||
'password' => $pleskCredentials['password'] ?? null,
|
||||
'status' => $hosting->status,
|
||||
'plesk_url' => $hosting->server?->panelUrl(),
|
||||
'username' => ResponseCipher::encrypt($pleskCredentials['login'] ?? null),
|
||||
'password' => ResponseCipher::encrypt($pleskCredentials['password'] ?? null),
|
||||
] : null,
|
||||
'attachments' => \App\Models\ServiceAttachment::forCustomer()
|
||||
->where('service_id', $this->resource->id)
|
||||
->latest()
|
||||
->get()
|
||||
->map(fn ($file) => [
|
||||
'id' => $file->id,
|
||||
'filename' => $file->filename,
|
||||
'mime_type' => $file->mime_type,
|
||||
'size' => (int) $file->size,
|
||||
'uploaded_at' => $file->created_at?->toISOString(),
|
||||
])
|
||||
->values(),
|
||||
'cancel_at_expiry' => (bool) $this->cancel_at_expiry,
|
||||
'cancellation_request' => \App\Http\Controllers\Api\Client\Service\ServiceCancellationController::payload($this->resource->cancellationRequests()->pending()->latest()->first()),
|
||||
'ssl_certificate' => $this->resource->sslCertificate?->data,
|
||||
'dns_domain_id' => $dnsZone && !$dnsCancelled ? $dnsZone->id : null,
|
||||
'dns_cancelled' => $dnsCancelled,
|
||||
];
|
||||
|
||||
return Arr::except($payload, self::IRRELEVANT_KEYS[$this->type] ?? []);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use App\Enums\Order\OrderStatus;
|
||||
use App\Models\InvoiceAttachment;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
class InvoiceDetailResource extends JsonResource
|
||||
{
|
||||
@@ -33,6 +34,9 @@ class InvoiceDetailResource extends JsonResource
|
||||
'auto_renew' => (bool) $this->auto_renew,
|
||||
'created_at' => $this->created_at?->toISOString(),
|
||||
'due_date' => $this->due_date?->toISOString(),
|
||||
'billing_period_start' => $this->billing_period_start ? Carbon::parse($this->billing_period_start)->toDateString() : null,
|
||||
'billing_period_end' => $this->billing_period_end ? Carbon::parse($this->billing_period_end)->toDateString() : null,
|
||||
'next_renewal_date' => $this->whenLoaded('order', fn () => $this->nextRenewalDate()),
|
||||
'paid_at' => $this->paid_at?->toISOString(),
|
||||
'customer' => $this->whenLoaded('customer', fn () => [
|
||||
'name' => $this->customer->fullname,
|
||||
@@ -46,7 +50,7 @@ class InvoiceDetailResource extends JsonResource
|
||||
'total' => (float) $this->order->total,
|
||||
'created_at' => $this->order->created_at?->toISOString(),
|
||||
]),
|
||||
'items' => $this->whenLoaded('order', fn () => $this->order->orderItems->map(fn ($item) => [
|
||||
'items' => $this->whenLoaded('order', fn () => $this->isRenewal() ? $this->renewalItems() : $this->order->orderItems->map(fn ($item) => [
|
||||
'product_name' => $item->product?->name,
|
||||
'server_name' => $item->server_name,
|
||||
'billing_cycle' => $item->billing_cycle,
|
||||
@@ -70,19 +74,59 @@ class InvoiceDetailResource extends JsonResource
|
||||
];
|
||||
}
|
||||
|
||||
private function resolveService(): ?array
|
||||
private function isRenewal(): bool
|
||||
{
|
||||
return (int) $this->invoice_type === 2;
|
||||
}
|
||||
|
||||
private function resolveOrderItem(): mixed
|
||||
{
|
||||
$items = $this->order->orderItems;
|
||||
$item = $this->service_id
|
||||
? $items->first(fn ($i) => (int) $i->service?->id === (int) $this->service_id)
|
||||
: null;
|
||||
$item ??= $items->first();
|
||||
|
||||
return $item ?? $items->first();
|
||||
}
|
||||
|
||||
private function renewalMonths(): ?int
|
||||
{
|
||||
return $this->invoiceItems->firstWhere('type', 'renewal')?->months;
|
||||
}
|
||||
|
||||
private function renewalItems(): array
|
||||
{
|
||||
$serverName = $this->resolveOrderItem()?->server_name;
|
||||
|
||||
return $this->invoiceItems->map(fn ($item) => [
|
||||
'product_name' => $item->description,
|
||||
'server_name' => $serverName,
|
||||
'billing_cycle' => $item->months ? 'monthly' : null,
|
||||
'price' => (float) $item->total_price,
|
||||
'months' => $item->months,
|
||||
'os_id' => null,
|
||||
])->values()->all();
|
||||
}
|
||||
|
||||
private function nextRenewalDate(): ?string
|
||||
{
|
||||
if ($this->isRenewal() && $this->billing_period_end) {
|
||||
return Carbon::parse($this->billing_period_end)->toDateString();
|
||||
}
|
||||
|
||||
return $this->resolveOrderItem()?->service?->expires_at?->toDateString();
|
||||
}
|
||||
|
||||
private function resolveService(): ?array
|
||||
{
|
||||
$item = $this->resolveOrderItem();
|
||||
$renewalMonths = $this->isRenewal() ? $this->renewalMonths() : null;
|
||||
|
||||
return $item ? [
|
||||
'product_id' => $item->product_id,
|
||||
'name' => $item->product?->name,
|
||||
'billing_cycle' => $item->billing_cycle,
|
||||
'months' => $item->months,
|
||||
'billing_cycle' => $renewalMonths ? 'monthly' : $item->billing_cycle,
|
||||
'months' => $renewalMonths ?: $item->months,
|
||||
'server_name' => $item->server_name,
|
||||
'product_type' => $item->product?->product_type,
|
||||
] : null;
|
||||
|
||||
@@ -18,6 +18,8 @@ class OrderItemResource extends JsonResource
|
||||
'price' => (float) $this->price,
|
||||
'service' => $this->whenLoaded('service', fn () => [
|
||||
'id' => $this->service->id,
|
||||
'uuid' => $this->service->uuid,
|
||||
'type' => $this->service->type,
|
||||
'status' => $this->service->status,
|
||||
'status_text' => $this->service->status_label,
|
||||
'retry_requested_at' => $this->service->retry_requested_at?->toISOString(),
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\Resources\Api\Service;
|
||||
|
||||
use App\Models\Product;
|
||||
use App\Support\ServiceGroup;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
@@ -38,12 +39,14 @@ class VpsServiceResource extends JsonResource
|
||||
return [
|
||||
'uuid' => $this->uuid,
|
||||
'type' => $type,
|
||||
'group' => ServiceGroup::of($product?->product_type, $product?->name),
|
||||
'server_name' => $this->server_name,
|
||||
'invoice_num' => $invoice?->invoice_number,
|
||||
'order_num' => $order?->order_num,
|
||||
'status' => $this->status,
|
||||
'status_label' => $this->status_label,
|
||||
'auto_renew' => (bool) $this->auto_renew,
|
||||
'cancel_at_expiry' => (bool) $this->cancel_at_expiry,
|
||||
'started_at' => $this->started_at?->toISOString(),
|
||||
'expires_at' => $this->expires_at?->toISOString(),
|
||||
'product' => $product ? [
|
||||
|
||||
Reference in New Issue
Block a user