fix(user-form): fixed null company code because user admin create by …

…seeder
programinglive · Nov 12, 2024 · f4ced5f · f4ced5f
1 parent 43f2fcc
commit f4ced5f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/app/Livewire/FormCompanyOption.php b/app/Livewire/FormCompanyOption.php
@@ -21,9 +21,14 @@ public function updatedCompanyCode(string $companyCode): void
     {
         $this->dispatch('set-company', $companyCode);
     }
-
+    /**
+     * Handle set company event.
+     *
+     * @param string $companyCode
+     * @return void
+     */
     #[On('set-company')]
-    public function setCompany($companyCode): void
+    public function setCompany(string $companyCode): void
     {
         $this->companyCode = $companyCode;
     }

diff --git a/app/Livewire/PageFilter.php b/app/Livewire/PageFilter.php
@@ -17,12 +17,8 @@ class PageFilter extends Component
 
     public $filter = true;
 
-    public $companyId;
-
     public $branchFilter = false;
 
-    public $brands;
-
     /**
      * Renders the view for the page filter.
      *
@@ -32,7 +28,6 @@ public function render(): View
     {
         return view('livewire.page-filter', [
             'companies' => Company::all(),
-            'brands' => $this->brands,
         ]);
     }
-}
+}
diff --git a/app/Livewire/ProfileCard.php b/app/Livewire/ProfileCard.php
@@ -50,6 +50,10 @@ public function mount(): void
             $this->userDetail = UserDetail::where('nik', $this->nik)->first();
             $this->user = $this->userDetail->user;
         }
+
+        if (!$this->user) {
+            $this->user = auth()->user();
+        }
     }
 
     /**

diff --git a/app/Livewire/UserDetailForm.php b/app/Livewire/UserDetailForm.php
@@ -126,7 +126,10 @@ public function setDetail($details): void
     }
 
     #[On('set-company')]
-    public function setCompany($companyCode): void
+    /**
+     * @param string $companyCode
+     */
+    public function setCompany(string $companyCode): void
     {
         $this->details['company_code'] = $companyCode;
         $this->company = Company::where('code', $companyCode)->first();

diff --git a/app/Livewire/UserForm.php b/app/Livewire/UserForm.php
@@ -239,10 +239,14 @@ public function setUser(): void
     {
         $this->userDetail = UserDetail::where('user_id', $this->user->id)->first();
         $this->setDetail($this->userDetail->toArray());
-
+        
         $this->name = $this->user->name;
         $this->email = $this->user->email;
 
+        if (is_null($this->userDetail->company_code)) {
+            return;
+        }
+
         $this->companyCode = $this->userDetail->company_code;
         $this->dispatch('set-company', $this->companyCode);
         $this->branchCode = $this->userDetail->branch_code;

diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
 	<meta charset="utf-8">
 	<title>{{ $title ?? '' }} | {{ config('app.name') }}</title>
@@ -17,7 +16,7 @@
 	<link rel="manifest" href="{{asset('/site.webmanifest')}}">
 
 	@vite(['resources/scss/app.scss', 'resources/scss/icons.scss'])
-	@vite(['resources/js/config.js'])
+{{--	@vite(['resources/js/config.js'])--}}
 	@livewireStyles
 </head>