|
|
|
|
@ -775,6 +775,7 @@ final class CloudInvoiceService
|
|
|
|
|
$records = [];
|
|
|
|
|
$orderIds = [];
|
|
|
|
|
$linkedInstanceIds = [];
|
|
|
|
|
$renewalInstanceIds = [];
|
|
|
|
|
$operationalInvoiceIds = [];
|
|
|
|
|
$ownerIds = [];
|
|
|
|
|
foreach ($invoices as $invoice) {
|
|
|
|
|
@ -791,6 +792,10 @@ final class CloudInvoiceService
|
|
|
|
|
&& $invoice->instance_id !== null) {
|
|
|
|
|
$linkedInstanceIds[(int) $invoice->instance_id]
|
|
|
|
|
= (int) $invoice->instance_id;
|
|
|
|
|
if ($purpose === 'renewal') {
|
|
|
|
|
$renewalInstanceIds[(int) $invoice->instance_id]
|
|
|
|
|
= (int) $invoice->instance_id;
|
|
|
|
|
}
|
|
|
|
|
if (in_array($purpose, ['upgrade', 'ip_change'], true)) {
|
|
|
|
|
$operationalInvoiceIds[(int) $invoice->id]
|
|
|
|
|
= (int) $invoice->id;
|
|
|
|
|
@ -860,6 +865,14 @@ final class CloudInvoiceService
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
$blockedUpgradeInstanceIds = [];
|
|
|
|
|
if ($renewalInstanceIds !== []) {
|
|
|
|
|
foreach (CloudJobService::blockingQueryForInstances(
|
|
|
|
|
array_values($renewalInstanceIds)
|
|
|
|
|
)->where('kind', 'instance_upgrade')->pluck('instance_id') as $instanceId) {
|
|
|
|
|
$blockedUpgradeInstanceIds[(int) $instanceId] = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$now = time();
|
|
|
|
|
$summaries = [];
|
|
|
|
|
@ -903,14 +916,15 @@ final class CloudInvoiceService
|
|
|
|
|
&& !isset($existingInstanceIds[$historicalInstanceId])) {
|
|
|
|
|
$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;
|
|
|
|
|
$publicState = self::publicState(
|
|
|
|
|
$invoice,
|
|
|
|
|
$purpose,
|
|
|
|
|
$order,
|
|
|
|
|
$instance,
|
|
|
|
|
$now,
|
|
|
|
|
$instance !== null
|
|
|
|
|
&& isset($blockedUpgradeInstanceIds[(int) $instance->id])
|
|
|
|
|
);
|
|
|
|
|
$jobStatus = self::taskStatus($job);
|
|
|
|
|
$summaries[] = [
|
|
|
|
|
'id' => (string) $invoice->id,
|
|
|
|
|
@ -918,18 +932,15 @@ final class CloudInvoiceService
|
|
|
|
|
'type_label' => $title,
|
|
|
|
|
'purpose' => $purpose,
|
|
|
|
|
'amount' => (string) $invoice->amount,
|
|
|
|
|
'status' => $status,
|
|
|
|
|
'display_status' => self::displayStatus(
|
|
|
|
|
$purpose,
|
|
|
|
|
$status,
|
|
|
|
|
$summaryPayable,
|
|
|
|
|
$deadline,
|
|
|
|
|
$now
|
|
|
|
|
),
|
|
|
|
|
'currency' => strtoupper((string) ($invoice->currency ?: 'USD')),
|
|
|
|
|
'status' => $publicState['status'],
|
|
|
|
|
'display_status' => $publicState['display_status'],
|
|
|
|
|
'available_action' => $publicState['available_action'],
|
|
|
|
|
'payable' => $publicState['payable'],
|
|
|
|
|
'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' => $deadline,
|
|
|
|
|
'payment_deadline_at' => $publicState['deadline'],
|
|
|
|
|
'created_at' => (int) $invoice->created_at,
|
|
|
|
|
'order_status' => $order?->status,
|
|
|
|
|
'fulfillment_status' => $jobStatus ?? $order?->status,
|
|
|
|
|
@ -1026,7 +1037,7 @@ final class CloudInvoiceService
|
|
|
|
|
* payable: bool, available_action: ?string}
|
|
|
|
|
*/
|
|
|
|
|
private static function publicState(CloudInvoice $invoice, string $purpose,
|
|
|
|
|
$order, $instance, int $now): array
|
|
|
|
|
$order, $instance, int $now, ?bool $upgradeBlocked = null): array
|
|
|
|
|
{
|
|
|
|
|
$status = self::publicStatus($invoice, $purpose, $instance, $now);
|
|
|
|
|
|
|
|
|
|
@ -1037,12 +1048,14 @@ final class CloudInvoiceService
|
|
|
|
|
&& (string) $order->status === 'awaiting_payment'
|
|
|
|
|
&& $deadline > $now;
|
|
|
|
|
} elseif ($purpose === 'renewal') {
|
|
|
|
|
$upgradeBlocked ??= $instance !== null
|
|
|
|
|
&& CloudJobService::blockingQueryForInstance(
|
|
|
|
|
(int) $instance->id
|
|
|
|
|
)->where('kind', 'instance_upgrade')->exists();
|
|
|
|
|
$payable = in_array($status, ['open', 'overdue'], true)
|
|
|
|
|
&& $instance !== null
|
|
|
|
|
&& !self::instanceDeleting($instance)
|
|
|
|
|
&& !CloudJobService::blockingQueryForInstance(
|
|
|
|
|
(int) $instance->id
|
|
|
|
|
)->where('kind', 'instance_upgrade')->exists()
|
|
|
|
|
&& !$upgradeBlocked
|
|
|
|
|
&& $deadline > $now;
|
|
|
|
|
} else {
|
|
|
|
|
// Upgrade and operational invoices are settled atomically when
|
|
|
|
|
@ -1355,6 +1368,7 @@ final class CloudInvoiceService
|
|
|
|
|
'error' => $jobError,
|
|
|
|
|
] : null,
|
|
|
|
|
'amount' => (string) $invoice->amount,
|
|
|
|
|
'currency' => strtoupper((string) ($invoice->currency ?: 'USD')),
|
|
|
|
|
'items' => $items,
|
|
|
|
|
'renewal_result' => $renewalResult,
|
|
|
|
|
'validity_days' => (int) $invoice->validity_days,
|
|
|
|
|
|