Skip to content

G
gitlab-ce
Commit f009d429 authored by Vitaly Slobodin's avatar Vitaly Slobodin Committed by Douglas Barbosa Alexandre
Browse files
Options

Resolve merge conflicts

parent 2ee982c2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 288 deletions
ee/app/assets/javascripts/billings/stores/modules/subscription/mock_data_subscription.json deleted 100644 → 0
View file @ 2ee982c2
{
"plan": {
"name": "Gold",
"code": "gold",
"trial": false
},
"usage": {
"seats_in_subscription": 100,
"seats_in_use": 98,
"max_seats_used": 104,
"seats_owed": 4
},
"billing": {
"subscription_start_date": "2018-07-11",
"subscription_end_date": "2019-07-11",
"last_invoice": "2018-09-01",
"next_invoice": "2018-10-01"
}
}
ee/app/assets/stylesheets/pages/billings.scss
View file @ f009d429
......@@ -203,12 +203,4 @@
}
}
}
.card-header {
.controls {
> .btn:not(:last-child) {
margin: 0 $gl-padding-8 0 0;
}
}
}
}
ee/spec/frontend/billings/store/modules/subscription/data/mock_subscription.json deleted 100644 → 0
View file @ 2ee982c2
{
"plan": { "code": "bronze", "name": "Bronze", "trial": null, "upgradable": true },
"usage": { "seats_in_subscription": 0, "seats_in_use": 1, "max_seats_used": 0, "seats_owed": 0 },
"billing": {
"subscription_start_date": "2019-07-31",
"subscription_end_date": null,
"trial_ends_on": null
}
}
ee/spec/frontend/billings/store/modules/subscription/data/mock_tables.json deleted 100644 → 0
View file @ 2ee982c2
{
"free": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": null,
"colClass": "number",
"popover": {
"content": "This is the number of seats you will be required to purchase if you update to a paid plan."
}
},
{
"id": "subscriptionStartDate",
"label": "Subscription start date",
"value": null,
"isDate": true
}
]
}
]
},
"trial": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": null,
"colClass": "number",
"popover": { "content": "Usage count is performed once a day at 12:00 PM." }
},
{
"id": "subscriptionStartDate",
"label": "Trial start date",
"value": null,
"isDate": true
},
{ "id": "subscriptionEndDate", "label": "Trial end date", "value": null, "isDate": true }
]
}
]
},
"default": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInSubscription",
"label": "Seats in subscription",
"value": 0,
"colClass": "number"
},
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": 1,
"colClass": "number",
"popover": { "content": "Usage count is performed once a day at 12:00 PM." }
},
{
"id": "maxSeatsUsed",
"label": "Max seats used",
"value": 0,
"colClass": "number",
"popover": {
"content": "This is the maximum number of users that have existed at the same time since this subscription started."
}
},
{
"id": "seatsOwed",
"label": "Seats owed",
"value": 0,
"colClass": "number",
"popover": {
"content": "GitLab allows you to continue using your subscription even if you exceed the number of seats you purchased. You will be required to pay for these seats upon renewal."
}
}
]
},
{
"header": { "icon": "calendar", "title": "Billing" },
"columns": [
{
"id": "subscriptionStartDate",
"label": "Subscription start date",
"value": "2019-07-31",
"isDate": true
},
{
"id": "subscriptionEndDate",
"label": "Subscription end date",
"value": null,
"isDate": true
},
{
"id": "lastInvoice",
"label": "Last invoice",
"value": null,
"isDate": true,
"popover": {
"content": "This is the last time the GitLab.com team was in contact with you to settle any outstanding balances."
},
"hideContent": true
},
{
"id": "nextInvoice",
"label": "Next invoice",
"value": null,
"isDate": true,
"popover": {
"content": "This is the next date when the GitLab.com team is scheduled to get in contact with you to settle any outstanding balances."
},
"hideContent": true
}
]
}
]
}
}
ee/spec/frontend/billings/store/modules/subscription/mock_tables.json deleted 100644 → 0
View file @ 2ee982c2
{
"free": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": null,
"colClass": "number",
"popover": {
"content": "This is the number of seats you will be required to purchase if you update to a paid plan."
}
},
{
"id": "subscriptionStartDate",
"label": "Subscription start date",
"value": null,
"isDate": true
}
]
}
]
},
"trial": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": null,
"colClass": "number",
"popover": { "content": "Usage count is performed once a day at 12:00 PM." }
},
{
"id": "subscriptionStartDate",
"label": "Trial start date",
"value": null,
"isDate": true
},
{ "id": "subscriptionEndDate", "label": "Trial end date", "value": null, "isDate": true }
]
}
]
},
"default": {
"rows": [
{
"header": { "icon": "monitor", "title": "Usage" },
"columns": [
{
"id": "seatsInSubscription",
"label": "Seats in subscription",
"value": 0,
"colClass": "number"
},
{
"id": "seatsInUse",
"label": "Seats currently in use",
"value": 1,
"colClass": "number",
"popover": { "content": "Usage count is performed once a day at 12:00 PM." }
},
{
"id": "maxSeatsUsed",
"label": "Max seats used",
"value": 0,
"colClass": "number",
"popover": {
"content": "This is the maximum number of users that have existed at the same time since this subscription started."
}
},
{
"id": "seatsOwed",
"label": "Seats owed",
"value": 0,
"colClass": "number",
"popover": {
"content": "GitLab allows you to continue using your subscription even if you exceed the number of seats you purchased. You will be required to pay for these seats upon renewal."
}
}
]
},
{
"header": { "icon": "calendar", "title": "Billing" },
"columns": [
{
"id": "subscriptionStartDate",
"label": "Subscription start date",
"value": "2019-07-31",
"isDate": true
},
{
"id": "subscriptionEndDate",
"label": "Subscription end date",
"value": null,
"isDate": true
},
{
"id": "lastInvoice",
"label": "Last invoice",
"value": null,
"isDate": true,
"popover": {
"content": "This is the last time the GitLab.com team was in contact with you to settle any outstanding balances."
},
"hideContent": true
},
{
"id": "nextInvoice",
"label": "Next invoice",
"value": null,
"isDate": true,
"popover": {
"content": "This is the next date when the GitLab.com team is scheduled to get in contact with you to settle any outstanding balances."
},
"hideContent": true
}
]
}
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7