From eb948f9000fdcb98a372ae9412b66105ec72e73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Fri, 11 Feb 2022 17:02:17 +0100
Subject: [PATCH] metered billing app fixes

---
 .../Admin/WidgetLatestRegistrations.vue       |  4 +-
 .../js/components/Index/IndexNavigation.vue   |  2 +-
 .../js/components/Others/Forms/ImageInput.vue |  4 +-
 .../js/components/Others/Forms/InfoBox.vue    |  4 +-
 resources/js/store/modules/lists.js           |  4 +
 resources/js/views/Admin.vue                  | 96 ++++++++++---------
 .../AppSettingsTabs/Appearance.vue            |  2 +-
 .../AppSettings/AppSettingsTabs/Others.vue    |  6 +-
 resources/js/views/Admin/Dashboard.vue        | 18 +++-
 .../Admin/Plans/Create/CreateMeteredPlan.vue  |  3 +-
 resources/js/views/Admin/Users.vue            |  4 +-
 .../Console/Commands/SetupProdEnvironment.php | 24 ++++-
 webpack.mix.js                                |  4 +-
 13 files changed, 109 insertions(+), 66 deletions(-)

diff --git a/resources/js/components/Admin/WidgetLatestRegistrations.vue b/resources/js/components/Admin/WidgetLatestRegistrations.vue
index 145db7f7..660ee3d3 100644
--- a/resources/js/components/Admin/WidgetLatestRegistrations.vue
+++ b/resources/js/components/Admin/WidgetLatestRegistrations.vue
@@ -171,12 +171,12 @@
                 </td>
                 <td class="px-3 md:px-1">
                     <span class="text-sm font-bold">
-                        {{ row.data.meta.usages.featureEstimates.storage.usage }}
+                        {{ row.data.meta.usages ? row.data.meta.usages.featureEstimates.storage.usage : '-' }}
                     </span>
                 </td>
                 <td class="px-3 md:px-1">
                     <span class="text-sm font-bold">
-                        {{ row.data.meta.usages.costEstimate }}
+                        {{ row.data.meta.usages ? row.data.meta.usages.costEstimate : '-' }}
                     </span>
                 </td>
                 <td class="px-3 md:px-1">
diff --git a/resources/js/components/Index/IndexNavigation.vue b/resources/js/components/Index/IndexNavigation.vue
index 67434279..2c8be299 100644
--- a/resources/js/components/Index/IndexNavigation.vue
+++ b/resources/js/components/Index/IndexNavigation.vue
@@ -30,7 +30,7 @@
                 </li>
             </ul>
             <ul v-if="config.isAuthenticated" class="navigation-links">
-                <li v-if="config.userRegistration">
+                <li>
                     <router-link class="cta-button text-theme bg-theme-100" :to="{ name: 'Files' }">
                         {{ $t('go_to_files') }}
                     </router-link>
diff --git a/resources/js/components/Others/Forms/ImageInput.vue b/resources/js/components/Others/Forms/ImageInput.vue
index b83bfdf6..b0af4c87 100644
--- a/resources/js/components/Others/Forms/ImageInput.vue
+++ b/resources/js/components/Others/Forms/ImageInput.vue
@@ -25,10 +25,10 @@
             <image-icon size="34" class="vue-feather text-theme inline-block mb-4" />
 
 			<b class="font-bold text-base block leading-3">
-                {{ $te('input_image.title') || 'Upload Image' }}
+                {{ $te('input_image.title') ? $t('input_image.title') : 'Upload Image' }}
             </b>
             <small class="text-xs text-gray-500">
-                {{ $te('input_image.supported') || 'Supported formats are .png, .jpg, .jpeg.' }}
+                {{ $te('input_image.supported') ? $t('input_image.supported') : 'Supported formats are .png, .jpg, .jpeg.' }}
             </small>
         </div>
     </div>
diff --git a/resources/js/components/Others/Forms/InfoBox.vue b/resources/js/components/Others/Forms/InfoBox.vue
index 9f497e6f..0a5e2e92 100644
--- a/resources/js/components/Others/Forms/InfoBox.vue
+++ b/resources/js/components/Others/Forms/InfoBox.vue
@@ -7,7 +7,9 @@
 <script>
 export default {
     name: 'InfoBox',
-    props: ['type'],
+    props: [
+		'type'
+	],
 }
 </script>
 
diff --git a/resources/js/store/modules/lists.js b/resources/js/store/modules/lists.js
index a6023295..3f745427 100644
--- a/resources/js/store/modules/lists.js
+++ b/resources/js/store/modules/lists.js
@@ -94,6 +94,10 @@ const defaultState = {
             label: 'Fixed',
             value: 'fixed',
         },
+        {
+            label: 'None',
+            value: 'none',
+        },
     ],
     teamPermissions: {
         'can-edit': 'Can Edit',
diff --git a/resources/js/views/Admin.vue b/resources/js/views/Admin.vue
index a3f01f14..a0db3008 100644
--- a/resources/js/views/Admin.vue
+++ b/resources/js/views/Admin.vue
@@ -124,51 +124,57 @@ export default {
                 ],
             }[this.config.subscriptionType]
 
-            return [
-                {
-                    groupCollapsable: false,
-                    groupTitle: this.$t('global.admin'),
-                    groupLinks: [
-                        {
-                            title: this.$t('admin_menu.dashboard'),
-                            route: 'Dashboard',
-                            icon: 'box',
-                        },
-                        {
-                            title: this.$t('admin_menu.users'),
-                            route: 'Users',
-                            icon: 'users',
-                            linkActivation: ['users', 'user'],
-                        },
-                        {
-                            title: this.$t('admin_menu.settings'),
-                            route: 'AppSettings',
-                            icon: 'settings',
-                        },
-                    ],
-                },
-                {
-                    groupCollapsable: false,
-                    groupTitle: this.$t('Content'),
-                    groupLinks: [
-                        {
-                            title: this.$t('admin_menu.pages'),
-                            route: 'Pages',
-                            icon: 'monitor',
-                        },
-                        {
-                            title: this.$t('admin_menu.languages'),
-                            route: 'Language',
-                            icon: 'globe',
-                        },
-                    ],
-                },
-                {
-                    groupCollapsable: false,
-                    groupTitle: this.$t('Subscription'),
-                    groupLinks: subscriptionLinks,
-                },
-            ]
+			let sections = [
+				{
+					groupCollapsable: false,
+					groupTitle: this.$t('global.admin'),
+					groupLinks: [
+						{
+							title: this.$t('admin_menu.dashboard'),
+							route: 'Dashboard',
+							icon: 'box',
+						},
+						{
+							title: this.$t('admin_menu.users'),
+							route: 'Users',
+							icon: 'users',
+							linkActivation: ['users', 'user'],
+						},
+						{
+							title: this.$t('admin_menu.settings'),
+							route: 'AppSettings',
+							icon: 'settings',
+						},
+					],
+				},
+				{
+					groupCollapsable: false,
+					groupTitle: this.$t('Content'),
+					groupLinks: [
+						{
+							title: this.$t('admin_menu.pages'),
+							route: 'Pages',
+							icon: 'monitor',
+						},
+						{
+							title: this.$t('admin_menu.languages'),
+							route: 'Language',
+							icon: 'globe',
+						},
+					],
+				},
+			]
+
+			// Push subscription if there is metered or fixed type
+			if (this.config.subscriptionType !== 'none') {
+				sections.push({
+					groupCollapsable: false,
+					groupTitle: this.$t('Subscription'),
+					groupLinks: subscriptionLinks,
+				})
+			}
+
+			return sections
         },
     },
     components: {
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
index 94aa9d95..fe4e9870 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
@@ -54,7 +54,7 @@
                 <ImageInput @input="$updateImage('/admin/settings', 'app_og_image', app.og_image)" :image="$getImage(app.og_image)" v-model="app.og_image" />
             </AppInputText>
 
-            <AppInputText :title="$t('app_touch_icon')" :description="$t('app_touch_icon_description')">
+            <AppInputText :title="$t('app_touch_icon')" :description="$t('app_touch_icon_description')" :is-last="true">
                 <ImageInput @input="$updateImage('/admin/settings', 'app_touch_icon', app.touch_icon)" :image="$getImage(app.touch_icon)" v-model="app.touch_icon" />
             </AppInputText>
         </div>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
index 050a7d77..df180b9d 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
@@ -1,7 +1,7 @@
 <template>
     <PageTab :is-loading="isLoading">
         <!--Store & Upload-->
-        <div class="card shadow-card">
+        <div v-if="app" class="card shadow-card">
             <FormLabel>
                 {{ $t('Storage & Upload') }}
             </FormLabel>
@@ -55,7 +55,7 @@
         </div>
 
         <!--Other Settings-->
-        <div class="card shadow-card">
+        <div v-if="app" class="card shadow-card">
             <FormLabel>
                 {{ $t('Application') }}
             </FormLabel>
@@ -88,7 +88,7 @@
         </div>
 
         <!-- ReCaptcha -->
-        <div class="card shadow-card">
+        <div v-if="app" class="card shadow-card">
             <FormLabel icon="shield">
                 {{ $t('reCaptcha') }}
             </FormLabel>
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index acf27d8b..1fa5d146 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -22,7 +22,13 @@
                             {{ data.app.license }}
                         </ColorLabel>
                     </a>
-                    <a href="https://bit.ly/VueFileManager-survey" target="_blank" class="bg-theme-100 ml-8 inline-block hidden items-center rounded-lg py-1.5 px-3 md:flex">
+                    <b v-if="data.app.license === 'extended'" class="mr-4 inline-block">
+                        <span class="text-sm font-bold"> {{ $t('Subscription') }}: </span>
+                        <ColorLabel color="purple">
+                            {{ config.subscriptionType }}
+                        </ColorLabel>
+                    </b>
+                    <a href="https://bit.ly/VueFileManager-survey" target="_blank" class="bg-theme-100 lg:ml-4 ml-8 inline-block hidden items-center rounded-lg py-1.5 px-3 md:flex">
                         <thumbs-up-icon size="15" class="vue-feather text-theme mr-2.5" />
                         <span class="text-theme text-sm font-bold">
                             {{ $t('Write a Feedback') }}
@@ -31,6 +37,11 @@
                 </div>
             </div>
 
+			<div v-if="config.subscriptionType === 'metered' && config.isEmptyPlans" class="p-5 bg-rose-200 rounded-xl shadow-card mb-6 flex items-center">
+				<alert-octagon-icon size="18" class="vue-feather text-rose-700 mr-4 shrink-0"/>
+				<p class="text-sm text-rose-700">As you installed app with metered subscription type, you have to <router-link :to="{name: 'CreateMeteredPlan'}" class="font-bold underline text-sm">create your plan</router-link> as soon as possible to prevent new user registration without automatically assigned subscription plan.</p>
+			</div>
+
             <!--Metric widgets-->
             <div class="mb-2 md:mb-6 md:flex md:space-x-6">
                 <div class="card mb-4 w-full shadow-card md:mb-0">
@@ -144,7 +155,7 @@
 <script>
 import WidgetLatestRegistrations from '../../components/Admin/WidgetLatestRegistrations'
 import ColorLabel from '../../components/Others/ColorLabel'
-import { ChevronRightIcon, ThumbsUpIcon } from 'vue-feather-icons'
+import { AlertOctagonIcon, ChevronRightIcon, ThumbsUpIcon } from 'vue-feather-icons'
 import WidgetWrapper from '../../components/Admin/WidgetWrapper'
 import Spinner from '../../components/FilesView/Spinner'
 import FormLabel from '../../components/Others/Forms/FormLabel'
@@ -152,13 +163,16 @@ import BarChart from '../../components/UI/BarChart'
 import { mapGetters } from 'vuex'
 import axios from 'axios'
 import WidgetLatestTransactions from '../../components/Admin/WidgetLatestTransactions'
+import InfoBox from "../../components/Others/Forms/InfoBox";
 
 export default {
     name: 'Dashboard',
     components: {
+		InfoBox,
         WidgetLatestTransactions,
         WidgetLatestRegistrations,
         ChevronRightIcon,
+		AlertOctagonIcon,
         WidgetWrapper,
         ThumbsUpIcon,
         ColorLabel,
diff --git a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
index 72ebc2ea..ee1b4556 100644
--- a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
@@ -175,7 +175,7 @@ export default {
         InfoBox,
     },
     computed: {
-        ...mapGetters(['currencyList', 'intervalList']),
+        ...mapGetters(['currencyList', 'intervalList', 'config']),
     },
     data() {
         return {
@@ -273,6 +273,7 @@ export default {
                     }
                 })
                 .catch((error) => {
+					console.log(error);
                     events.$emit('toaster', {
                         type: 'danger',
                         message: this.$t('popup_error.title'),
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 75de801f..34a89f44 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -186,12 +186,12 @@
                         </td>
                         <td class="px-3 md:px-1">
                             <span class="text-sm font-bold">
-                                {{ row.data.meta.usages.featureEstimates.storage.usage }}
+                                {{ row.data.meta.usages ? row.data.meta.usages.featureEstimates.storage.usage : '-' }}
                             </span>
                         </td>
                         <td class="px-3 md:px-1">
                             <span class="text-sm font-bold">
-                                {{ row.data.meta.usages.costEstimate }}
+                                {{ row.data.meta.usages ? row.data.meta.usages.costEstimate : '-' }}
                             </span>
                         </td>
                         <td class="px-3 md:px-1">
diff --git a/src/App/Console/Commands/SetupProdEnvironment.php b/src/App/Console/Commands/SetupProdEnvironment.php
index c2ffadeb..51f29f5b 100644
--- a/src/App/Console/Commands/SetupProdEnvironment.php
+++ b/src/App/Console/Commands/SetupProdEnvironment.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Console\Commands;
 
 use App\Users\Models\User;
@@ -28,10 +29,11 @@ class SetupProdEnvironment extends Command
 
     public function __construct(
         private CreateDiskDirectoriesAction $createDiskDirectories,
-        private SeedDefaultSettingsAction $seedDefaultSettings,
-        private SeedDefaultLanguageAction $seedDefaultLanguage,
-        private SeedDefaultPagesAction $seedDefaultPages,
-    ) {
+        private SeedDefaultSettingsAction   $seedDefaultSettings,
+        private SeedDefaultLanguageAction   $seedDefaultLanguage,
+        private SeedDefaultPagesAction      $seedDefaultPages,
+    )
+    {
         parent::__construct();
         $this->setUpFaker();
     }
@@ -186,6 +188,20 @@ class SetupProdEnvironment extends Command
                 'value' => $col['value'],
             ]);
         });
+
+        if ($this->argument('license') === 'extended') {
+            $choice = $this->choice("Choose subscription type", [
+                'metered' => 'Metered',
+                'fixed'   => 'Fixed',
+                'none'    => 'None',
+            ]);
+
+            Setting::updateOrCreate([
+                'name'  => 'subscription_type'
+            ], [
+                'value' => $choice
+            ]);
+        }
     }
 
     /**
diff --git a/webpack.mix.js b/webpack.mix.js
index 77e0c6a2..2405dcaf 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -29,10 +29,10 @@ mix
             clientLogLevel: 'none'
         }
     })*/
-    .options({
+    /*.options({
         hmrOptions: {
             host: '192.168.1.112',
             port: '8080'
         },
-    })
+    })*/
     .disableNotifications();