|
|
|
|
@ -812,7 +812,8 @@ final class CloudInvoiceService
|
|
|
|
|
$existingInstanceIds = [];
|
|
|
|
|
if ($linkedInstanceIds !== []) {
|
|
|
|
|
foreach (CloudInstance::whereIn('id', array_values($linkedInstanceIds))
|
|
|
|
|
->get(['id', 'user_id', 'name', 'status']) as $instance) {
|
|
|
|
|
->get(['id', 'user_id', 'name', 'status', 'service_status'])
|
|
|
|
|
as $instance) {
|
|
|
|
|
$existingInstanceIds[(int) $instance->id] = true;
|
|
|
|
|
$instances[self::listKey((int) $instance->user_id, (int) $instance->id)]
|
|
|
|
|
= $instance;
|
|
|
|
|
@ -894,6 +895,13 @@ final class CloudInvoiceService
|
|
|
|
|
$safeInstanceId = $historicalInstanceId;
|
|
|
|
|
}
|
|
|
|
|
$status = self::publicStatus($invoice, $purpose, $instance, $now);
|
|
|
|
|
$deadline = self::paymentDeadline($invoice);
|
|
|
|
|
$summaryPayable = $purpose === 'renewal'
|
|
|
|
|
&& in_array($status, ['open', 'overdue'], true)
|
|
|
|
|
&& $instance !== null
|
|
|
|
|
&& !self::instanceDeleting($instance)
|
|
|
|
|
&& $deadline !== null
|
|
|
|
|
&& $deadline > $now;
|
|
|
|
|
$jobStatus = self::taskStatus($job);
|
|
|
|
|
$summaries[] = [
|
|
|
|
|
'id' => (string) $invoice->id,
|
|
|
|
|
@ -902,10 +910,17 @@ final class CloudInvoiceService
|
|
|
|
|
'purpose' => $purpose,
|
|
|
|
|
'amount' => (string) $invoice->amount,
|
|
|
|
|
'status' => $status,
|
|
|
|
|
'display_status' => self::displayStatus(
|
|
|
|
|
$purpose,
|
|
|
|
|
$status,
|
|
|
|
|
$summaryPayable,
|
|
|
|
|
$deadline,
|
|
|
|
|
$now
|
|
|
|
|
),
|
|
|
|
|
'renews_expires_at' => $invoice->renews_expires_at === null
|
|
|
|
|
? null : max(0, (int) $invoice->renews_expires_at),
|
|
|
|
|
'due_at' => max(0, (int) $invoice->due_at),
|
|
|
|
|
'payment_deadline_at' => self::paymentDeadline($invoice),
|
|
|
|
|
'payment_deadline_at' => $deadline,
|
|
|
|
|
'created_at' => (int) $invoice->created_at,
|
|
|
|
|
'order_status' => $order?->status,
|
|
|
|
|
'fulfillment_status' => $jobStatus ?? $order?->status,
|
|
|
|
|
@ -971,12 +986,27 @@ final class CloudInvoiceService
|
|
|
|
|
return $status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Keep storage status stable while presenting the renewal grace phase. */
|
|
|
|
|
private static function displayStatus(string $purpose, string $status,
|
|
|
|
|
bool $payable, ?int $deadline, int $now): string
|
|
|
|
|
{
|
|
|
|
|
if ($purpose !== 'renewal' || $status !== 'overdue') {
|
|
|
|
|
return $status;
|
|
|
|
|
}
|
|
|
|
|
if ($payable) {
|
|
|
|
|
return 'renewal_grace';
|
|
|
|
|
}
|
|
|
|
|
return $deadline !== null && $deadline <= $now
|
|
|
|
|
? 'expired' : $status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Derive the public invoice state once for both full detail responses and
|
|
|
|
|
* lightweight polling responses. The callers deliberately load different
|
|
|
|
|
* columns, but payment eligibility must never drift between them.
|
|
|
|
|
*
|
|
|
|
|
* @return array{status: string, deadline: ?int, payable: bool}
|
|
|
|
|
* @return array{status: string, display_status: string, deadline: ?int,
|
|
|
|
|
* payable: bool, available_action: ?string}
|
|
|
|
|
*/
|
|
|
|
|
private static function publicState(CloudInvoice $invoice, string $purpose,
|
|
|
|
|
$order, $instance, int $now): array
|
|
|
|
|
@ -1003,8 +1033,19 @@ final class CloudInvoiceService
|
|
|
|
|
$payable = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ['status' => $status, 'deadline' => $deadline,
|
|
|
|
|
'payable' => $payable];
|
|
|
|
|
return [
|
|
|
|
|
'status' => $status,
|
|
|
|
|
'display_status' => self::displayStatus(
|
|
|
|
|
$purpose,
|
|
|
|
|
$status,
|
|
|
|
|
$payable,
|
|
|
|
|
$deadline,
|
|
|
|
|
$now
|
|
|
|
|
),
|
|
|
|
|
'deadline' => $deadline,
|
|
|
|
|
'payable' => $payable,
|
|
|
|
|
'available_action' => $payable ? 'pay' : null,
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -1051,6 +1092,7 @@ final class CloudInvoiceService
|
|
|
|
|
|
|
|
|
|
$publicState = self::publicState($invoice, $purpose, $order, $instance, $now);
|
|
|
|
|
$status = $publicState['status'];
|
|
|
|
|
$displayStatus = $publicState['display_status'];
|
|
|
|
|
$deadline = $publicState['deadline'];
|
|
|
|
|
$payable = $publicState['payable'];
|
|
|
|
|
|
|
|
|
|
@ -1098,6 +1140,8 @@ final class CloudInvoiceService
|
|
|
|
|
'id' => (string) $invoice->id,
|
|
|
|
|
'purpose' => $purpose,
|
|
|
|
|
'status' => $status,
|
|
|
|
|
'display_status' => $displayStatus,
|
|
|
|
|
'available_action' => $publicState['available_action'],
|
|
|
|
|
'payable' => $payable,
|
|
|
|
|
'paid_at' => $invoice->paid_at === null ? null : (int) $invoice->paid_at,
|
|
|
|
|
'paid_via' => $invoice->paid_via,
|
|
|
|
|
@ -1212,6 +1256,7 @@ final class CloudInvoiceService
|
|
|
|
|
$bandwidthMbps = $bandwidthMbps > 0 ? $bandwidthMbps : null;
|
|
|
|
|
$publicState = self::publicState($invoice, $purpose, $order, $instance, $now);
|
|
|
|
|
$status = $publicState['status'];
|
|
|
|
|
$displayStatus = $publicState['display_status'];
|
|
|
|
|
$deadline = $publicState['deadline'];
|
|
|
|
|
$payable = $publicState['payable'];
|
|
|
|
|
$jobStatus = self::taskStatus($job);
|
|
|
|
|
@ -1283,6 +1328,8 @@ final class CloudInvoiceService
|
|
|
|
|
'service_days' => (int) $invoice->validity_days,
|
|
|
|
|
'traffic_quota_bytes' => (int) $invoice->traffic_quota_bytes,
|
|
|
|
|
'status' => $status,
|
|
|
|
|
'display_status' => $displayStatus,
|
|
|
|
|
'available_action' => $publicState['available_action'],
|
|
|
|
|
'due_at' => (int) $invoice->due_at,
|
|
|
|
|
'renews_expires_at' => $invoice->renews_expires_at === null
|
|
|
|
|
? null : (int) $invoice->renews_expires_at,
|
|
|
|
|
|