Browse Source

fix: topbar

Muhammad Iqbal Afandi 3 years ago
parent
commit
616da0887e

+ 11
- 7
app/Http/Middleware/HandleInertiaRequests.php View File

@@ -2,6 +2,7 @@
2 2
 
3 3
 namespace App\Http\Middleware;
4 4
 
5
+use App\Models\Company;
5 6
 use Illuminate\Http\Request;
6 7
 use Inertia\Middleware;
7 8
 
@@ -13,7 +14,7 @@ class HandleInertiaRequests extends Middleware
13 14
      * @see https://inertiajs.com/server-side-setup#root-template
14 15
      * @var string
15 16
      */
16
-    protected $rootView = 'app';
17
+    protected $rootView = "app";
17 18
 
18 19
     /**
19 20
      * Determines the current asset version.
@@ -37,14 +38,17 @@ class HandleInertiaRequests extends Middleware
37 38
     public function share(Request $request): array
38 39
     {
39 40
         return array_merge(parent::share($request), [
40
-            'auth.user' => fn() => $request->user() ? $request->user()->only('id', 'name', 'username', 'role_id') : null,
41
-            'flash' => function () use ($request) {
41
+            "auth.user" => fn() => $request->user()
42
+                ? $request->user()->only("id", "name", "username", "role_id")
43
+                : null,
44
+            "company.name" => fn() => Company::first()->name,
45
+            "flash" => function () use ($request) {
42 46
                 return [
43
-                    'success' => $request->session()->get('success'),
44
-                    'error' => $request->session()->get('error'),
45
-                    'warning' => $request->session()->get('warning')
47
+                    "success" => $request->session()->get("success"),
48
+                    "error" => $request->session()->get("error"),
49
+                    "warning" => $request->session()->get("warning"),
46 50
                 ];
47
-            }
51
+            },
48 52
         ]);
49 53
     }
50 54
 }

+ 1
- 1
resources/js/pages/Settings/Components/Ppn.vue View File

@@ -34,7 +34,7 @@ const onSubmit = () => {
34 34
 
35 35
     <div class="col-12">
36 36
       <AppInputText
37
-        label="PPN"
37
+        label="PPN %"
38 38
         placeholder="ppn"
39 39
         type="number"
40 40
         :disabled="state.disable"