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

feat: invoices created date (#3250)

Browse Source
This commit is contained in:
Jaanus Sellin 2023-03-03 14:31:27 +02:00 committed by GitHub
parent 1782df36cc
commit 8c0411dc20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx
View File

@ -162,16 +162,19 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
marginBottom: theme.spacing(1.5), marginBottom: theme.spacing(1.5),
})} })}
> >
<GridCol> <GridCol vertical>
<Typography> <Typography>
<strong>{seats}</strong> team <strong>Included members</strong>
members
<GridColLink> <GridColLink>
<Link to="/admin/users"> <Link to="/admin/users">
{freeAssigned} assigned {freeAssigned} of 5 assigned
</Link> </Link>
</GridColLink> </GridColLink>
</Typography> </Typography>
<StyledInfoLabel>
You have 5 team members included in
your PRO plan
</StyledInfoLabel>
</GridCol> </GridCol>
<GridCol> <GridCol>
<StyledCheckIcon /> <StyledCheckIcon />
@ -183,7 +186,7 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
<GridRow> <GridRow>
<GridCol vertical> <GridCol vertical>
<Typography> <Typography>
Paid members <strong>Paid members</strong>
<GridColLink> <GridColLink>
<Link to="/admin/users"> <Link to="/admin/users">
{paidAssigned} assigned {paidAssigned} assigned
@ -191,9 +194,7 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
</GridColLink> </GridColLink>
</Typography> </Typography>
<StyledInfoLabel> <StyledInfoLabel>
Add up to 15 extra paid members - $ $15/month per paid member
{price.user}
/month per member
</StyledInfoLabel> </StyledInfoLabel>
</GridCol> </GridCol>
<GridCol> <GridCol>

12
frontend/src/component/admin/billing/BillingHistory/BillingHistory.tsx
View File

@ -37,9 +37,13 @@ const columns = [
disableGlobalFilter: true, disableGlobalFilter: true,
}, },
{ {
Header: 'Due date', Header: 'Created date',
accessor: 'dueDate', accessor: 'created',
Cell: DateCell, Cell: ({ value }: { value: number }) => {
return (
<DateCell value={value ? new Date(value * 1000) : undefined} />
);
},
sortType: 'date', sortType: 'date',
disableGlobalFilter: true, disableGlobalFilter: true,
}, },
@ -69,7 +73,7 @@ export const BillingHistory: VFC<IBillingHistoryProps> = ({
}) => { }) => {
const initialState = useMemo( const initialState = useMemo(
() => ({ () => ({
sortBy: [{ id: 'dueDate' }], sortBy: [{ id: 'created' }],
}), }),
[] []
); );