- metered plan decimal extended into 3 places

- paginator fix

public/mix-manifest.json

@@ -15,7 +15,7 @@
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=cd743a710a7dd6b4",
     "/chunks/not-found.js": "/chunks/not-found.js?id=d31bd699138cf828",
     "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=26798085f527d955",
-    "/chunks/admin.js": "/chunks/admin.js?id=c9419b333cc023a5",
+    "/chunks/admin.js": "/chunks/admin.js?id=8efc9b42ff0654d9",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=5ab55a12214433c8",
     "/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0",
@@ -25,7 +25,7 @@
     "/chunks/users.js": "/chunks/users.js?id=b6629338e26b8313",
     "/chunks/user-create.js": "/chunks/user-create.js?id=40254ae98547761e",
     "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=549867504d6e4e4e",
-    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40",
+    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=6ab9a127099b3293",
     "/chunks/user.js": "/chunks/user.js?id=cf9a2a0d8c1fa1d9",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=ff6c1fc63a372d96",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=0e26321285c15e1a",
@@ -34,7 +34,7 @@
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5",
     "/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=36d925def6a82cb2",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=df990f928a77c355",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=ee4100b0eff32f36",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=630deb1fc4e17ed9",
     "/chunks/payments.js": "/chunks/payments.js?id=d59a2a18b680d65c",
     "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=27d6c1b58dbd1e6c",

resources/js/views/Admin.vue

@@ -58,7 +58,7 @@
             </ContentGroup>
         </ContentSidebar>
 
-        <router-view class="relative w-full overflow-x-hidden px-2.5 pb-12 md:px-6 lg:pt-6 lg:pb-0" />
+        <router-view class="relative w-full overflow-x-hidden px-2.5 pb-12 md:px-6 lg:pt-6 lg:pb-0 z-[5]" />
     </div>
 </template>
 

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

@@ -75,9 +75,7 @@
 							v-model="plan.features.bandwidth.per_unit"
 							:placeholder="$t('type_bandwidth_price')"
 							type="number"
-							step="0.01"
+							step=".001"
-							min="0.01"
-							max="999999999999"
 							:class="{ '!border-rose-600': errors[0] }"
 							class="focus-border-theme input-dark"
 						/>
@@ -113,9 +111,7 @@
 						v-model="plan.features.storage.per_unit"
 						:placeholder="$t('type_storage_price')"
 						type="number"
-						step="0.01"
+						step=".001"
-						min="0.01"
-						max="999999999999"
 						:class="{ '!border-rose-600': errors[0] }"
 						class="focus-border-theme input-dark"
 					/>
@@ -150,9 +146,7 @@
 						v-model="plan.features.member.per_unit"
 						:placeholder="$t('type_member_price')"
 						type="number"
-						step="0.01"
+						step=".001"
-						min="0.01"
-						max="999999999999"
 						:class="{ '!border-rose-600': errors[0] }"
 						class="focus-border-theme input-dark"
 					/>
@@ -187,9 +181,7 @@
 							v-model="plan.features.flatFee.per_unit"
 							:placeholder="$t('type_flat_fee_price')"
 							type="number"
-							step="0.01"
+							step=".001"
-							min="0.01"
-							max="999999999999"
 							:class="{ '!border-rose-600': errors[0] }"
 							class="focus-border-theme input-dark"
 						/>

resources/js/views/Admin/Plans/Tabs/PlanMeteredSettings.vue

@@ -148,6 +148,7 @@ export default {
             let formatter = new Intl.NumberFormat('en-US', {
                 style: 'currency',
                 currency: currency,
+				maximumFractionDigits: 4,
             })
 
             return formatter.format(amount)

src/Domain/Admin/Controllers/Users/UserController.php

@@ -21,12 +21,12 @@ class UserController extends Controller
     /**
      * Get all users
      */
-    public function index(): JsonResponse
+    public function index(): UsersCollection
     {
         $users = User::sortable(['created_at', 'DESC'])
             ->paginate(15);
 
-        return response()->json(new UsersCollection($users));
+        return new UsersCollection($users);
     }
 
     /**

src/Domain/Pages/Controllers/AdminPagesController.php

@@ -13,12 +13,12 @@ class AdminPagesController extends Controller
     /**
      * Get all pages
      */
-    public function index(): JsonResponse
+    public function index(): PageCollection
     {
-        return response()->json(new PageCollection(
+        return new PageCollection(
             Page::sortable()
                 ->paginate(10)
-        ));
+        );
     }
 
     /**

src/Domain/Transactions/Controllers/GetAllTransactionsController.php

@@ -2,19 +2,18 @@
 namespace Domain\Transactions\Controllers;
 
 use App\Users\Models\User;
-use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
 use Domain\Transactions\Resources\TransactionCollection;
 use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
 
 class GetAllTransactionsController extends Controller
 {
-    public function __invoke(User $user): JsonResponse
+    public function __invoke(User $user): TransactionCollection
     {
         $transactions = Transaction::with('user')
             ->sortable(['created_at' => 'desc'])
             ->paginate(20);
 
-        return response()->json(new TransactionCollection($transactions));
+        return new TransactionCollection($transactions);
     }
 }

src/Domain/Transactions/Controllers/GetTransactionsController.php

@@ -8,13 +8,13 @@ use Domain\Transactions\Resources\TransactionCollection;
 
 class GetTransactionsController extends Controller
 {
-    public function __invoke(): JsonResponse
+    public function __invoke(): TransactionCollection
     {
         $transactions = Auth::user()
             ->transactions()
             ->sortable(['created_at' => 'desc'])
             ->paginate(15);
 
-        return response()->json(new TransactionCollection($transactions));
+        return new TransactionCollection($transactions);
     }
 }

src/Domain/Transactions/Controllers/GetUserTransactionsController.php

@@ -2,19 +2,18 @@
 namespace Domain\Transactions\Controllers;
 
 use App\Users\Models\User;
-use Illuminate\Http\JsonResponse;
 use App\Http\Controllers\Controller;
 use Domain\Transactions\Resources\TransactionCollection;
 
 class GetUserTransactionsController extends Controller
 {
-    public function __invoke(User $user): JsonResponse
+    public function __invoke(User $user): TransactionCollection
     {
         $transactions = $user
             ->transactions()
             ->sortable(['created_at' => 'desc'])
             ->paginate(20);
 
-        return response()->json(new TransactionCollection($transactions));
+        return new TransactionCollection($transactions);
     }
 }