Merge branch 'branch-jagad' into 'main'

updated rayon

See merge request fiqhpratama1/xpendify!36

app/Http/Controllers/Master/RayonController.php

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Rayon;
 use App\Helpers\AuditTrailHelper;
+use App\Models\Cabang;
 
 class RayonController extends Controller
 {
@@ -15,14 +16,16 @@ class RayonController extends Controller
 		session()->put('redirect_url', route('admin.rayon.index'));
 
 		return view('backend.pages.master.rayon.index', [
-			'rayons' => Rayon::all()
+			'rayons' => Rayon::with('cabang')->get()
 		]);
   }
 
 	public function create()
 	{
 		$this->checkAuthorization(auth()->user(), ['rayon.create']);
-		return view('backend.pages.master.rayon.create');
+		return view('backend.pages.master.rayon.create', [
+			'cabangs' => Cabang::all()
+		]);
 	}
 
 	public function store(Request $request)
@@ -30,12 +33,14 @@ class RayonController extends Controller
 		$this->checkAuthorization(auth()->user(), ['rayon.create']);
 		$request->validate([
 			'code' => 'required|unique:rayon,code',
-			'name' => 'required|unique:rayon,name'
+			'name' => 'required|unique:rayon,name',
+			'cabang_id' => 'required|exists:cabang,id'
 		]);
 
 		Rayon::create([
 			'code' => $request->code,
-			'name' => $request->name
+			'name' => $request->name,
+			'cabang_id' => $request->cabang_id
 		]);
 
 		AuditTrailHelper::AddAuditTrail('Insert', 'Insert New Record at Rayon Table (' . $request->name . ')');
@@ -47,7 +52,8 @@ class RayonController extends Controller
 	{
 		$this->checkAuthorization(auth()->user(), ['rayon.edit']);
 		return view('backend.pages.master.rayon.edit', [
-			'rayon' => Rayon::findOrfail($id)
+			'rayon' => Rayon::findOrfail($id),
+			'cabangs' => Cabang::all()
 		]);
 	}
 
@@ -56,12 +62,14 @@ class RayonController extends Controller
 		$this->checkAuthorization(auth()->user(), ['rayon.edit']);
 		$request->validate([
 			'code' => 'required|unique:rayon,code,' . $id . ',id',
-			'name' => 'required|unique:rayon,name,' . $id . ',id'
+			'name' => 'required|unique:rayon,name,' . $id . ',id',
+			'cabang_id' => 'required|exists:cabang,id'
 		]);
 
 		Rayon::findOrfail($id)->update([
 			'code' => $request->code,
-			'name' => $request->name
+			'name' => $request->name,
+			'cabang_id' => $request->cabang_id
 		]);
 
 		AuditTrailHelper::AddAuditTrail('Update', 'Update New Record at Rayon Table (' . $request->name . ')');

app/Models/Rayon.php

@@ -11,4 +11,9 @@ class Rayon extends Model
     
     protected $table = 'rayon';
     protected $fillable = ['code', 'name', 'cabang_id'];
+
+    public function cabang()
+    {
+        return $this->belongsTo('App\Models\Cabang');
+    }
 }

resources/views/backend/pages/master/rayon/create.blade.php

@@ -31,6 +31,15 @@
                             <label class="form-label">Code Rayon</label>
                             <input type="text" class="form-control" name="code">
                         </div>
+                        <div class="mb-3">
+                            <label class="form-label">Pilih Cabang</label>
+                            <select class="form-control" name="cabang_id">
+                                <option value="">Pilih Cabang</option>
+                                @foreach ($cabangs as $cabang)
+                                    <option value="{{ $cabang->id }}">{{ $cabang->code }} | {{ $cabang->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
                         <div class="mb-3">
                             <label class="form-label">Nama Rayon</label>
                             <input type="text" class="form-control" name="name">

resources/views/backend/pages/master/rayon/edit.blade.php

@@ -32,6 +32,15 @@
                             <label class="form-label">Code Rayon</label>
                             <input type="text" class="form-control" name="code" value="{{ $rayon->code }}">
                         </div>
+                        <div class="mb-3">
+                            <label class="form-label">Pilih Cabang</label>
+                            <select class="form-control" name="cabang_id">
+                                <option value="">Pilih Cabang</option>
+                                @foreach ($cabangs as $cabang)
+                                    <option value="{{ $cabang->id }}" {{ $rayon->cabang_id == $cabang->id ? 'selected' : '' }}>{{ $cabang->code }} | {{ $cabang->name }}</option>
+                                @endforeach
+                            </select>
+                        </div>
                         <div class="mb-3">
                             <label class="form-label">Nama Rayon</label>
                             <input type="text" class="form-control" name="name" value="{{ $rayon->name }}">

resources/views/backend/pages/master/rayon/index.blade.php

@@ -43,6 +43,7 @@
                                     <tr>
                                         <th>#</th>
                                         <th>Code</th>
+                                        <th>Cabang</th>
                                         <th>Nama</th>
                                         <th>Aksi</th>
                                     </tr>
@@ -52,6 +53,7 @@
                                         <tr>
                                             <td>{{ $loop->index + 1 }}</td>
                                             <td>{{ $rayon->code }}</td>
+                                            <td>{{ $rayon->cabang->name }}</td>
                                             <td>{{ $rayon->name }}</td>
                                             <td>
                                                 @if (auth()->user()->can('rayon.edit'))