Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-11-10 01:19:53 +01:00
Code Issues Projects Releases Wiki Activity

fix: now showing either payg or consumption (#10803)

Browse Source 
1. Make it show either payg or consumption.
2. Add paid tag.
This commit is contained in:
Jaanus Sellin 2025-10-15 13:32:51 +03:00 committed by GitHub
parent bffec9bc4d
commit e83d92975c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/component/admin/billing/BillingInfo/BillingInfo.tsx
View File

@ -79,7 +79,6 @@ export const BillingInfo: FC<BillingInfoProps> = () => {
} }
const isPAYG = billing === 'pay-as-you-go'; const isPAYG = billing === 'pay-as-you-go';
const plan = `${instanceStatus.plan}${isPAYG ? ' Pay-as-You-Go' : ''}`;
const isEnterpriseConsumption = billing === 'enterprise-consumption'; const isEnterpriseConsumption = billing === 'enterprise-consumption';
const inactive = instanceStatus.state !== InstanceState.ACTIVE; const inactive = instanceStatus.state !== InstanceState.ACTIVE;
const { isCustomBilling } = instanceStatus; const { isCustomBilling } = instanceStatus;
@ -101,9 +100,9 @@ export const BillingInfo: FC<BillingInfoProps> = () => {
<StyledRow> <StyledRow>
<StyledItemTitle>Current plan</StyledItemTitle>{' '} <StyledItemTitle>Current plan</StyledItemTitle>{' '}
<StyledItemValue> <StyledItemValue>
{plan} {isPAYG && isEnterpriseConsumption
{isPAYG || isEnterpriseConsumption ? ' Pay-as-You-Go' : ''} ? 'Consumption'
{isEnterpriseConsumption ? ' Consumption' : ''} : 'Pay-as-You-Go'}
</StyledItemValue> </StyledItemValue>
</StyledRow> </StyledRow>
<StyledRow> <StyledRow>

3
frontend/src/component/admin/billing/BillingInvoices/BillingInvoice/BillingInvoice.tsx
View File

@ -145,6 +145,9 @@ export const BillingInvoice = ({
{status === 'invoiced' ? ( {status === 'invoiced' ? (
<Badge color='success'>Invoiced</Badge> <Badge color='success'>Invoiced</Badge>
) : null} ) : null}
{status === 'paid' ? (
<Badge color='success'>Paid</Badge>
) : null}
<Typography variant='body1' sx={{ fontWeight: 700 }}> <Typography variant='body1' sx={{ fontWeight: 700 }}>
{formatCurrency(totalAmount, currency)} {formatCurrency(totalAmount, currency)}
</Typography> </Typography>