feat: Add service date handling and enhance service details in response
This commit is contained in:
@@ -1151,6 +1151,11 @@ class CustomerController extends Controller
|
|||||||
'price' => $basePrice,
|
'price' => $basePrice,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Ngày bắt đầu/hết hạn dùng chung cho cả module_vmware (next_due_date/next_invoice) và services.
|
||||||
|
$startedAt = $data['started_at'] ?? now();
|
||||||
|
$expiresAt = $data['expires_at']
|
||||||
|
?? \Carbon\Carbon::parse($startedAt)->addMonths($months);
|
||||||
|
|
||||||
// 2) ModuleVmware: snapshot từ virtual_machines. `order_id` phải trỏ về
|
// 2) ModuleVmware: snapshot từ virtual_machines. `order_id` phải trỏ về
|
||||||
// order vừa tạo — client console-ticket/rebuild resolve VM qua
|
// order vừa tạo — client console-ticket/rebuild resolve VM qua
|
||||||
// service->orderItem->order->vmWare, không qua services.vm_id.
|
// service->orderItem->order->vmWare, không qua services.vm_id.
|
||||||
@@ -1181,6 +1186,10 @@ class CustomerController extends Controller
|
|||||||
'plain_password' => $data['vm_password'] ?? null,
|
'plain_password' => $data['vm_password'] ?? null,
|
||||||
'port' => $data['vm_port'] ?? null,
|
'port' => $data['vm_port'] ?? null,
|
||||||
'status' => 1,
|
'status' => 1,
|
||||||
|
'first_payment' => $basePrice,
|
||||||
|
'next_payment' => $basePrice,
|
||||||
|
'next_due_date' => \Carbon\Carbon::parse($expiresAt)->timestamp,
|
||||||
|
'next_invoice' => \Carbon\Carbon::parse($expiresAt)->timestamp,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$vmId = $moduleVm->id;
|
$vmId = $moduleVm->id;
|
||||||
@@ -1234,10 +1243,6 @@ class CustomerController extends Controller
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
// 5) Service — updateOrCreate để tránh trùng khi cùng VM được gán lại
|
// 5) Service — updateOrCreate để tránh trùng khi cùng VM được gán lại
|
||||||
$startedAt = $data['started_at'] ?? now();
|
|
||||||
$expiresAt = $data['expires_at']
|
|
||||||
?? \Carbon\Carbon::parse($startedAt)->addMonths($months);
|
|
||||||
|
|
||||||
$serviceLookup = $vmId
|
$serviceLookup = $vmId
|
||||||
? ['customer_id' => $customer->id, 'vm_id' => $vmId]
|
? ['customer_id' => $customer->id, 'vm_id' => $vmId]
|
||||||
: [
|
: [
|
||||||
@@ -1264,6 +1269,11 @@ class CustomerController extends Controller
|
|||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// module_vmware.service_id chỉ biết được sau khi Service đã tồn tại.
|
||||||
|
if ($vmId) {
|
||||||
|
\App\Models\ModuleVmware::where('id', $vmId)->update(['service_id' => $service->id]);
|
||||||
|
}
|
||||||
|
|
||||||
DB::commit();
|
DB::commit();
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'error' => false,
|
'error' => false,
|
||||||
|
|||||||
@@ -12,8 +12,17 @@ class ServiceClientDetailResource extends JsonResource
|
|||||||
*
|
*
|
||||||
* @return array<string, mixed>
|
* @return array<string, mixed>
|
||||||
*/
|
*/
|
||||||
private function resolveSpecs($product): ?array
|
private function resolveSpecs($vm, $product): ?array
|
||||||
{
|
{
|
||||||
|
if ($vm && ($vm->cpu !== null || $vm->ram_mb !== null || $vm->disk_gb !== null)) {
|
||||||
|
return [
|
||||||
|
'cpu' => (int) ($vm->cpu ?? 0),
|
||||||
|
'ram' => (int) ($vm->ram_mb ?? 0),
|
||||||
|
'disk' => (int) ($vm->disk_gb ?? 0),
|
||||||
|
'bandwidth' => (int) ($product->bandwidth ?? 0),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
$addons = $this->addons ?? collect();
|
$addons = $this->addons ?? collect();
|
||||||
if ($addons->isNotEmpty()) {
|
if ($addons->isNotEmpty()) {
|
||||||
return [
|
return [
|
||||||
@@ -51,10 +60,10 @@ class ServiceClientDetailResource extends JsonResource
|
|||||||
'started_at' => $this->started_at?->toISOString(),
|
'started_at' => $this->started_at?->toISOString(),
|
||||||
'expires_at' => $this->expires_at?->toISOString(),
|
'expires_at' => $this->expires_at?->toISOString(),
|
||||||
'os' => [
|
'os' => [
|
||||||
'version' => $orderItem?->os?->version,
|
'version' => $orderItem?->os?->version ?? $vm?->os?->version,
|
||||||
'group' => $orderItem?->os?->osGroup?->name,
|
'group' => $orderItem?->os?->osGroup?->name ?? $vm?->os?->osGroup?->name,
|
||||||
],
|
],
|
||||||
'specs' => $this->resolveSpecs($product),
|
'specs' => $this->resolveSpecs($vm, $product),
|
||||||
'order' => $order ? [
|
'order' => $order ? [
|
||||||
'total' => (float) $order->total,
|
'total' => (float) $order->total,
|
||||||
'months' => (int) $orderItem->months,
|
'months' => (int) $orderItem->months,
|
||||||
@@ -63,7 +72,7 @@ class ServiceClientDetailResource extends JsonResource
|
|||||||
'vm' => $vm ? [
|
'vm' => $vm ? [
|
||||||
'id' => $vm->id,
|
'id' => $vm->id,
|
||||||
'vmware_id' => $vm->vmware_id,
|
'vmware_id' => $vm->vmware_id,
|
||||||
'ip_address' => $vm->ipAddress?->ip,
|
'ip_address' => $vm->ipAddress?->ip ?? $vm->ip,
|
||||||
'hostname' => $vm->hostname,
|
'hostname' => $vm->hostname,
|
||||||
'username' => $vm->user,
|
'username' => $vm->user,
|
||||||
'password' => $vm->plain_password ?? null,
|
'password' => $vm->plain_password ?? null,
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
Reference in New Issue
Block a user