fixes part 5

config/language-translations.php

@@ -201,13 +201,13 @@ return [
         'col_date'                                            => 'Date',
         'col_amount'                                          => 'Amount',
         'total'                                               => 'Total',
+
+        // v2
         'max_team_members'                                    => 'Up to {value} Team Members',
-        'max_team_members.unlimited'                          => 'Up to {value} Team Members',
+        'max_team_members.unlimited'                          => 'Unlimited Team Members',
         'max_storage_amount'                                  => '{value} GB Storage Size',
         'interval.month'                                      => 'Monthly',
         'interval.year'                                       => 'Yearly',
-
-        // v2
         'bandwidth'                                           => 'Bandwidth',
         'storage'                                             => 'Storage',
         'flatFee'                                             => 'Flat Fee',

resources/js/components/Admin/WidgetLatestTransactions.vue

@@ -51,9 +51,9 @@
                     </span>
                 </td>
                 <td class="pl-3 md:pl-1">
-                    <div class="w-32 text-right md:w-full">
+                    <div class="w-28">
                         <img
-                            class="w-32 md:inline-block"
+                            class="inline-block max-h-5"
                             :src="$getPaymentLogo(row.data.attributes.driver)"
                             :alt="row.data.attributes.driver"
                         />

resources/js/components/Others/SelectSingleChargeMethodPopup.vue

@@ -47,7 +47,7 @@
                     :email="user.data.attributes.email"
                     :paystackkey="config.paystack_public_key"
                     :reference="$generatePaystackReference()"
-                    :callback="paystackPaymentSuccessful"
+                    :callback="paymentSuccessful"
                     :close="paystackClosed"
                 >
                     <span class="text-theme cursor-pointer text-sm font-bold">
@@ -132,8 +132,9 @@ export default {
 
             this.paypal.isMethodsLoaded = true
             this.paypal.isMethodLoading = false
+			const app = this
 
-            // Initialize paypal buttons for single charge
+			// Initialize paypal buttons for single charge
             await paypal
                 .Buttons({
                     createOrder: function (data, actions) {
@@ -148,10 +149,13 @@ export default {
                             ],
                         })
                     },
+					onApprove: function () {
+						app.paymentSuccessful()
+					},
                 })
                 .render('#paypal-button-container')
         },
-        paystackPaymentSuccessful() {
+        paymentSuccessful() {
             this.$closePopup()
 
             events.$emit('toaster', {

resources/js/components/Spotlight/Spotlight.vue

@@ -227,7 +227,9 @@
 
                         <!--Keyboard shortcut hint-->
                         <div v-if="!$isMobile()" class="absolute right-4 top-1/2 -translate-y-1/2 transform">
-                            <span class="text-xs text-gray-400">{{ i === 0 ? '↵' : metaKeyIcon + i }}</span>
+                            <span class="text-xs text-gray-400">
+								{{ i === 0 ? '↵' : metaKeyIcon + i }}
+							</span>
                         </div>
                     </div>
                 </div>

resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue

@@ -92,7 +92,7 @@
                 </InfoBox>
 
                 <!--Toggle yearly billing-->
-                <div v-if="hasYearlyPlans.length > 0" class="mb-2 px-5 text-right">
+                <div v-if="hasYearlyPlans.length > 0" class="mb-2 text-right">
                     <label
                         :class="{ 'text-gray-400': !isSelectedYearlyPlans }"
                         class="cursor-pointer text-xs font-bold"
@@ -130,7 +130,7 @@
                 </ButtonBase>
                 <ButtonBase
                     class="w-full"
-                    v-if="plans.data.length !== 0"
+                    v-if="plans && plans.data.length !== 0"
                     :button-style="buttonStyle"
                     @click.native="isPaymentOptionPage = true"
                     >{{ $t('Upgrade Account') }}
@@ -254,7 +254,7 @@ export default {
                             custom_id: userId,
                         })
                     },
-                    onApprove: function (data, actions) {
+                    onApprove: function () {
                         app.paymentSuccessful()
                     },
                 })

resources/js/store/modules/lists.js

@@ -40,7 +40,7 @@ const defaultState = {
             sortable: true,
         },
         {
-            label: i18n.t('user'),
+            label: i18n.t('User'),
             field: 'user_id',
             sortable: true,
         },

resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue

@@ -127,7 +127,7 @@
             <ValidationProvider tag="div" mode="passive" name="Max Team Members" rules="required" v-slot="{ errors }">
                 <AppInputText
                     :title="$t('Team Members')"
-                    :description="$t('To set unlimited team members, type -1 into form')"
+                    :description="$t('Type -1 to set unlimited team members.')"
                     :is-last="true"
                 >
                     <input
@@ -147,7 +147,7 @@
             <p>{{ errorMessage }}</p>
         </InfoBox>
 
-        <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit">
+        <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit" class="w-full sm:w-auto">
             {{ $t('admin_page_plans.create_plan_button') }}
         </ButtonBase>
     </ValidationObserver>

resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue

@@ -198,7 +198,7 @@
             </div>
         </div>
 
-        <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit">
+        <ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit" class="w-full sm:w-auto">
             {{ $t('admin_page_plans.create_plan_button') }}
         </ButtonBase>
     </ValidationObserver>

resources/js/views/Admin/Users.vue

@@ -137,7 +137,7 @@
                                 {{ row.data.attributes.role }}
                             </ColorLabel>
                         </td>
-                        <td class="px-3 md:px-1" v-if="config.isSaaS">
+                        <td class="px-3 md:px-1">
                             <span class="text-sm font-bold">
                                 {{ row.data.relationships.subscription ? $t('global.premium') : $t('global.free') }}
                             </span>
@@ -343,7 +343,7 @@ export default {
                         sortable: true,
                     },
                     {
-                        label: this.$t('admin_page_user.table.plan'),
+                        label: this.$t('Account'),
                         sortable: false,
                     },
                     {

src/App/Users/Resources/UserMinimalResource.php

@@ -16,7 +16,7 @@ class UserMinimalResource extends JsonResource
         return [
             'data' => [
                 'id'         => $this->id,
-                'type'       => 'users',
+                'type'       => 'user',
                 'attributes' => [
                     'avatar' => $this->settings->avatar,
                     'name'   => $this->settings->name,