-
+
{{ $t('admin_page_plans.create_plan_button') }}
@@ -12,12 +12,48 @@
-
+
+
+
+
+
+ {{ row.data.attributes.name }}
+
+
+
+
+ {{ row.data.attributes.currency }}
+
+
+
+
+ {{ row.data.attributes.interval }}
+
+
+
+
+ {{ row.data.attributes.subscribers }}
+
+
+
+
+
+
+
+
-
+
{{ row.data.attributes.name }}
@@ -63,7 +99,7 @@
:title="$t('admin_page_plans.empty.title')"
:description="$t('admin_page_plans.empty.description')"
>
-
+
{{ $t('admin_page_plans.empty.button') }}
-->
@@ -116,51 +152,80 @@
isEmptyPlans() {
return ! this.isLoading && this.plans.length === 0 && this.config.stripe_public_key
},
- stripeIsNotConfigured() {
- return ! this.config.stripe_public_key
- },
- stripeConfiguredWithPlans() {
- return ! this.isLoading && this.config.stripe_public_key
- }
+ createPlanRoute() {
+ return {
+ metered: 'CreateMeteredPlan',
+ fixed: 'CreateFixedPlan',
+ }[this.config.subscriptionType]
+ },
+ columns() {
+ return {
+ metered: [
+ {
+ label: this.$t('Name'),
+ field: 'name',
+ sortable: true
+ },
+ {
+ label: this.$t('Currency'),
+ field: 'currency',
+ sortable: true
+ },
+ {
+ label: this.$t('Interval'),
+ field: 'interval',
+ sortable: true
+ },
+ {
+ label: this.$t('admin_page_plans.table.subscribers'),
+ sortable: false
+ },
+ {
+ label: this.$t('admin_page_user.table.action'),
+ sortable: false
+ },
+ ],
+ fixed: [
+ {
+ label: this.$t('Visibility'),
+ field: 'visible',
+ sortable: true
+ },
+ {
+ label: this.$t('Name'),
+ field: 'name',
+ sortable: true
+ },
+ {
+ label: this.$t('Price'),
+ field: 'amount',
+ sortable: true
+ },
+ {
+ label: this.$t('Interval'),
+ field: 'interval',
+ sortable: true
+ },
+ {
+ label: this.$t('admin_page_plans.table.subscribers'),
+ sortable: false
+ },
+ {
+ label: this.$t('Storage'),
+ sortable: false
+ },
+ {
+ label: this.$t('admin_page_user.table.action'),
+ sortable: false
+ },
+ ],
+ }[this.config.subscriptionType]
+ }
},
data() {
return {
isLoading: true,
plans: [],
- columns: [
- {
- label: this.$t('Visibility'),
- field: 'visible',
- sortable: true
- },
- {
- label: this.$t('Name'),
- field: 'name',
- sortable: true
- },
- {
- label: this.$t('Price'),
- field: 'amount',
- sortable: true
- },
- {
- label: this.$t('Interval'),
- field: 'interval',
- sortable: true
- },
- {
- label: this.$t('admin_page_plans.table.subscribers'),
- sortable: false
- },
- {
- label: this.$t('Storage'),
- sortable: false
- },
- {
- label: this.$t('admin_page_user.table.action'),
- sortable: false
- },
- ],
}
},
created() {
diff --git a/resources/js/views/Admin/Plans/PlanCreate.vue b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
similarity index 98%
rename from resources/js/views/Admin/Plans/PlanCreate.vue
rename to resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
index 12d69a79..5439b2a5 100644
--- a/resources/js/views/Admin/Plans/PlanCreate.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
@@ -81,7 +81,7 @@
diff --git a/resources/js/views/Admin/Plans/Plan.vue b/resources/js/views/Admin/Plans/FixedPlan.vue
similarity index 88%
rename from resources/js/views/Admin/Plans/Plan.vue
rename to resources/js/views/Admin/Plans/FixedPlan.vue
index c3905314..41ca0626 100644
--- a/resources/js/views/Admin/Plans/Plan.vue
+++ b/resources/js/views/Admin/Plans/FixedPlan.vue
@@ -11,7 +11,7 @@
-
+
+
+
+
+
+
+
+ {{ row.data.attributes.renews_at }}
+
+
+
+ ![]()
+
+
+
-
+
{{ $t('admin_page_plans.empty.button') }}
-->
diff --git a/src/App/Users/Actions/FormatUsageEstimatesAction.php b/src/App/Users/Actions/FormatUsageEstimatesAction.php
index c293eb55..1d46478e 100644
--- a/src/App/Users/Actions/FormatUsageEstimatesAction.php
+++ b/src/App/Users/Actions/FormatUsageEstimatesAction.php
@@ -1,4 +1,5 @@
Metric::megabytes($estimate['usage'])->format(),
- 'storage' => Metric::megabytes($estimate['usage'])->format(),
+ 'storage' => Metric::megabytes($estimate['usage'])->format(),
+ 'flat-fee' => intval($estimate['usage']) . ' ' . __('Pcs.'),
};
// Normalize units
- $amount = $estimate['amount'] / 1000;
+ $amount = match ($estimate['feature']) {
+ 'bandwidth', 'storage' => $estimate['amount'] / 1000,
+ 'flat-fee' => $estimate['amount'],
+ };
return [
$estimate['feature'] => [
diff --git a/tests/App/Users/UserSubscriptionTest.php b/tests/App/Users/UserSubscriptionTest.php
index c89623f5..55a816ca 100644
--- a/tests/App/Users/UserSubscriptionTest.php
+++ b/tests/App/Users/UserSubscriptionTest.php
@@ -116,6 +116,10 @@ class UserSubscriptionTest extends TestCase
'feature' => 'storage',
'amount' => 476.28,
'usage' => 3969,
+ ], [
+ 'feature' => 'flat-fee',
+ 'amount' => 2.49,
+ 'usage' => 1,
],
]);
@@ -124,17 +128,24 @@ class UserSubscriptionTest extends TestCase
->toArray();
$expected = [
- [
+ 'bandwidth' => [
'feature' => 'bandwidth',
'amount' => 7.54696,
'cost' => '$7.55',
'usage' => '26.02GB',
- ], [
+ ],
+ 'storage' => [
'feature' => 'storage',
'amount' => 0.47628,
'cost' => '$0.48',
'usage' => '3.97GB',
],
+ 'flat-fee' => [
+ 'feature' => 'flat-fee',
+ 'amount' => 2.49,
+ 'cost' => '$2.49',
+ 'usage' => '1 Pcs.',
+ ],
];
$this->assertEquals($expected, $estimates);
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue b/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue
similarity index 100%
rename from resources/js/views/Admin/Plans/PlanTabs/PlanDelete.vue
rename to resources/js/views/Admin/Plans/Tabs/PlanDelete.vue
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue b/resources/js/views/Admin/Plans/Tabs/PlanFixedSettings.vue
similarity index 100%
rename from resources/js/views/Admin/Plans/PlanTabs/PlanSettings.vue
rename to resources/js/views/Admin/Plans/Tabs/PlanFixedSettings.vue
diff --git a/resources/js/views/Admin/Plans/Tabs/PlanMeteredSettings.vue b/resources/js/views/Admin/Plans/Tabs/PlanMeteredSettings.vue
new file mode 100644
index 00000000..0f89fdca
--- /dev/null
+++ b/resources/js/views/Admin/Plans/Tabs/PlanMeteredSettings.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+ + {{ plan.attributes.name }} +
+ + {{ $t('30 Days intervals') }} + +
+
+
+
+
+
+
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue b/resources/js/views/Admin/Plans/Tabs/PlanSubscribers.vue
similarity index 58%
rename from resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
rename to resources/js/views/Admin/Plans/Tabs/PlanSubscribers.vue
index f4452c9c..e235ff3b 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
+++ b/resources/js/views/Admin/Plans/Tabs/PlanSubscribers.vue
@@ -4,7 +4,34 @@
-
+
+ {{ $t('Details') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('Price change is not possible. If you would like to change your price or currency, please feel free to create a new plan.') }}
+
+
+ {{ $t('Features') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.data.relationships.user.data.attributes.name }}
+
+
+ {{ row.data.relationships.user.data.attributes.email }}
+
+
+