diff --git a/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue b/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue index 0fd05b5b0..229fc0699 100644 --- a/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue +++ b/web/satellite/src/components/account/billing/billingTabs/BillingHistory.vue @@ -2,13 +2,23 @@ // See LICENSE for copying information. @@ -17,14 +27,15 @@ import { Component, Vue } from 'vue-property-decorator'; import { PaymentsHistoryItem, PaymentsHistoryItemType } from '@/types/payments'; -import VList from '@/components/common/VList.vue'; import BillingHistoryHeader from '@/components/account/billing/billingTabs/BillingHistoryHeader.vue'; -import BillingHistoryShape from '@/components/account/billing/billingTabs/BillingHistoryShape.vue'; +import BillingHistoryItem from '@/components/account/billing/billingTabs/BillingHistoryItem.vue'; +import VTable from '@/components/common/VTable.vue'; // @vue/component @Component({ components: { - VList, + BillingHistoryItem, + VTable, BillingHistoryHeader, }, }) @@ -36,22 +47,20 @@ export default class BillingArea extends Vue { return item.type === PaymentsHistoryItemType.Invoice || item.type === PaymentsHistoryItemType.Charge; }); } - - public get billingHistoryStructure() { - return BillingHistoryShape; - } } diff --git a/web/satellite/src/components/account/billing/billingTabs/BillingHistoryHeader.vue b/web/satellite/src/components/account/billing/billingTabs/BillingHistoryHeader.vue index 73fa295bc..5fd1d8f26 100644 --- a/web/satellite/src/components/account/billing/billingTabs/BillingHistoryHeader.vue +++ b/web/satellite/src/components/account/billing/billingTabs/BillingHistoryHeader.vue @@ -2,150 +2,24 @@ // See LICENSE for copying information. - - diff --git a/web/satellite/src/components/account/billing/billingTabs/BillingHistoryItem.vue b/web/satellite/src/components/account/billing/billingTabs/BillingHistoryItem.vue new file mode 100644 index 000000000..1982685ac --- /dev/null +++ b/web/satellite/src/components/account/billing/billingTabs/BillingHistoryItem.vue @@ -0,0 +1,133 @@ +// Copyright (C) 2022 Storj Labs, Inc. +// See LICENSE for copying information. + + + + + + diff --git a/web/satellite/src/components/account/billing/billingTabs/BillingHistoryShape.vue b/web/satellite/src/components/account/billing/billingTabs/BillingHistoryShape.vue deleted file mode 100644 index b101be9c2..000000000 --- a/web/satellite/src/components/account/billing/billingTabs/BillingHistoryShape.vue +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright (C) 2022 Storj Labs, Inc. -// See LICENSE for copying information. - - - - - - diff --git a/web/satellite/src/types/payments.ts b/web/satellite/src/types/payments.ts index 267196003..6a234bebd 100644 --- a/web/satellite/src/types/payments.ts +++ b/web/satellite/src/types/payments.ts @@ -161,6 +161,10 @@ export class PaymentsHistoryItem { return this.status.charAt(0).toUpperCase() + this.status.substring(1); } + public get formattedStart(): string { + return this.start.toLocaleDateString('en-US', { month: 'short', year: 'numeric' }); + } + public get hasExpiration(): boolean { // Go's zero date is passed in if the coupon does not expire // Go's zero date is 0001-01-01 00:00:00 +0000 UTC