Merge branch 'branch-jagad' into 'main'

Branch jagad

See merge request fiqhpratama1/xpendify!13

app/Helpers/NextCloudHelper.php

@@ -140,7 +140,6 @@ class NextCloudHelper
         return rtrim($baseUrl, '/') . '/' . $relativePath;
     }
 
-
     public static function getNextcloudFile($filePath)
     {
         // Check if the file exists

app/Helpers/WhatsappHelper.php

@@ -8,81 +8,94 @@ use Illuminate\Support\Str;
 
 class WhatsappHelper
 {
-    public static function approveExpense($phones, $expense_number)
+    public static function approveExpense($phones, $expense_number, $url = null)
     {
-		$client = new Client();
+        $client = new Client();
 
-		$data = [];
+        // Ensure the URL is formatted correctly
-		foreach ($phones as $phone) {
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
-			$data[] = [
+            $url = 'https://' . $url;
-				'phone' => $phone,
+        }
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah disetujui. Silahkan buka website untuk melihat detailnya.',
-				'source' => 'web'
-			];
-		}
 
-		$response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
+        $data = [];
-			'headers' => [
+        foreach ($phones as $phone) {
-				'Authorization' => env('WABLAS_TOKEN'),
+            $data[] = [
-				'Content-Type' => 'application/json'
+                'phone' => $phone,
-			],
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah disetujui. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
-			'json' => [
+                'source' => 'web'
-				'data' => $data
+            ];
-			]
+        }
-		]);
 
-		return $response->getBody()->getContents();
+        $response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
+            'headers' => [
+                'Authorization' => env('WABLAS_TOKEN'),
+                'Content-Type' => 'application/json'
+            ],
+            'json' => [
+                'data' => $data
+            ]
+        ]);
+
+        return $response->getBody()->getContents();
     }
 
-	public static function rejectExpense($phones, $expense_number)
+    public static function rejectExpense($phones, $expense_number, $url = null)
-	{
+    {
-		$client = new Client();
+        $client = new Client();
 
-		$data = [];
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
-		foreach ($phones as $phone) {
+            $url = 'https://' . $url;
-			$data[] = [
+        }
-				'phone' => $phone,
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditolak. Silahkan buka website untuk melihat detailnya.',
-				'source' => 'web'
-			];
-		}
 
-		$response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
+        $data = [];
-			'headers' => [
+        foreach ($phones as $phone) {
-				'Authorization' => env('WABLAS_TOKEN'),
+            $data[] = [
-				'Content-Type' => 'application/json'
+                'phone' => $phone,
-			],
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditolak. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
-			'json' => [
+                'source' => 'web'
-				'data' => $data
+            ];
-			]
+        }
-		]);
 
-		return $response->getBody()->getContents();
+        $response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
-	}
+            'headers' => [
+                'Authorization' => env('WABLAS_TOKEN'),
+                'Content-Type' => 'application/json'
+            ],
+            'json' => [
+                'data' => $data
+            ]
+        ]);
 
-	public static function finalApprove($phones, $expense_number)
+        return $response->getBody()->getContents();
-	{
+    }
-		$client = new Client();
 
-		$data = [];
+    public static function finalApprove($phones, $expense_number, $url = null)
-		foreach ($phones as $phone) {
+    {
-			$data[] = [
+        $client = new Client();
-				'phone' => $phone,
-				'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditutup karena telah selesai diproses. Silahkan buka website untuk melihat detailnya.',
-				'source' => 'web'
-			];
-		}
 
-		$response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
+        if ($url && !preg_match('/^https?:\/\//', $url)) {
-			'headers' => [
+            $url = 'https://' . $url;
-				'Authorization' => env('WABLAS_TOKEN'),
+        }
-				'Content-Type' => 'application/json'
-			],
-			'json' => [
-				'data' => $data
-			]
-		]);
 
-		return $response->getBody()->getContents();
+        $data = [];
-	}
+        foreach ($phones as $phone) {
+            $data[] = [
+                'phone' => $phone,
+                'message' => 'Pengajuan pengeluaran anda dengan nomor *' . $expense_number . '* telah ditutup karena telah selesai diproses. Silahkan buka link berikut untuk melihat detailnya: ' . $url,
+                'source' => 'web'
+            ];
+        }
+
+        $response = $client->post(env('WABLAS_HOST') . '/api/v2/send-message', [
+            'headers' => [
+                'Authorization' => env('WABLAS_TOKEN'),
+                'Content-Type' => 'application/json'
+            ],
+            'json' => [
+                'data' => $data
+            ]
+        ]);
+
+        return $response->getBody()->getContents();
+    }
 }

app/Http/Controllers/Backend/Auth/LoginController.php

@@ -46,21 +46,21 @@ class LoginController extends Controller
 
     protected function redirectTo()
     {
+        // Check the current guard and redirect accordingly
         if (Auth::guard('admin')->check()) {
             // Redirect admins to their dashboard
-            return RouteServiceProvider::ADMIN_DASHBOARD;
+            return route('admin.dashboard');
         }
 
         if (Auth::guard('web')->check()) {
-            // Redirect users to the home page
+            // Redirect regular users to their home or default page
-            return redirect()->route('trx_order_elevation.index');
+            return route('trx_order_elevation.index');
         }
 
-        // Default redirection (optional)
+        // Default redirection if no condition matches
         return '/login';
     }
 
-
     /**
      * login admin
      *
@@ -75,40 +75,41 @@ class LoginController extends Controller
             'password' => 'required',
         ]);
 
+        // Determine the intended redirect URL
+        $redirectTo = session()->pull('url.intended', $this->redirectTo());
+
         // Attempt to login
         if (Auth::guard('admin')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'admin');
 
             AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
-            return redirect()->route('admin.dashboard');
+            return redirect($redirectTo);
         } else if (Auth::guard('admin')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'admin');
 
             AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
-            return redirect()->route('admin.dashboard');
+            return redirect($redirectTo);
-                
         } else if (Auth::guard('web')->attempt(['username' => $request->email, 'password' => $request->password], $request->remember)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'web');
 
             AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
-            return redirect()->route('admin.dashboard');
+            return redirect($redirectTo);
         } else if (Auth::guard('web')->attempt(['email' => $request->email, 'password' => $request->password], $request->remember)) {
-            session()->flash('success', 'Successully Logged in !');
+            session()->flash('success', 'Successfully Logged in!');
             Session::put('current_guard', 'web');
 
             AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
-            return redirect()->route('admin.dashboard');
+            return redirect($redirectTo);
         }
         
-        // error
+        // Login failed
-        session()->flash('error', 'Invalid email and password..');
+        session()->flash('error', 'Invalid email or password.');
         return back();
     }   
 
-
     /**
      * logout admin guard
      *

app/Http/Controllers/Forms/FormMeetingSeminarController.php

@@ -65,6 +65,32 @@ class FormMeetingSeminarController extends Controller
 		]);
 	}
 
+  public function detail($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+
+    $form = FormMeetingSeminar::with('user')->findOrFail($id);
+    $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
+    $form->bukti_transport_ankot = $form->bukti_transport_ankot ? NextCloudHelper::getFileUrl($form->bukti_transport_ankot) : null;
+    $form->bukti_hotel = $form->bukti_hotel ? NextCloudHelper::getFileUrl($form->bukti_hotel) : null;
+
+    return response()->json($form);
+  }
+
+  public function view($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+
+    $form = FormMeetingSeminar::with('user')->findOrFail($id);
+    $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
+    $form->bukti_transport_ankot = $form->bukti_transport_ankot ? NextCloudHelper::getFileUrl($form->bukti_transport_ankot) : null;
+    $form->bukti_hotel = $form->bukti_hotel ? NextCloudHelper::getFileUrl($form->bukti_hotel) : null;
+
+    return view('backend.pages.forms.meeting.view', [
+      'form' => $form,
+    ]);
+  }
+
 	public function create()
 	{
     $this->checkAuthorization(auth()->user(), ['forms.meeting.create']);
@@ -77,12 +103,12 @@ class FormMeetingSeminarController extends Controller
     $this->checkAuthorization(auth()->user(), ['forms.meeting.create']);
 
     $request->validate([
-      'allowance' => 'required',
+      'allowance' => 'nullable|numeric',
-      'transport_ankot' => 'required',
+      'transport_ankot' => 'nullable|numeric',
-      'hotel' => 'required',
+      'hotel' => 'nullable|numeric',
-      'bukti1' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti2' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti3' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
     ]);
 
     $cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
@@ -92,40 +118,40 @@ class FormMeetingSeminarController extends Controller
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/meeting';
 
-		if ($request->hasFile('bukti1')) {
+		if ($request->hasFile('bukti_allowance')) {
-      $bukti1 = $request->file('bukti1');
+      $bukti_allowance = $request->file('bukti_allowance');
-			$filename = Str::uuid() . '.' . $bukti1->extension();
+			$filename = Str::uuid() . '.' . $bukti_allowance->extension();
 
-			$filePaths['bukti1'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_allowance'] = $folderPath . '/' . $filename;
 
       NextCloudHelper::uploadFile(
         $folderPath,
-        $bukti1->getContent(),
+        $bukti_allowance->getContent(),
 				$filename
       );
 
     }
-    if ($request->hasFile('bukti2')) {
+    if ($request->hasFile('bukti_transport_ankot')) {
-      $bukti2 = $request->file('bukti2');
+      $bukti_transport_ankot = $request->file('bukti_transport_ankot');
-			$filename = Str::uuid() . '.' . $bukti2->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_ankot->extension();
 
-			$filePaths['bukti2'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_ankot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti2->getContent(),
+				$bukti_transport_ankot->getContent(),
 				$filename
 			);
     }
-    if ($request->hasFile('bukti3')) {
+    if ($request->hasFile('bukti_hotel')) {
-      $bukti3 = $request->file('bukti3');
+      $bukti_hotel = $request->file('bukti_hotel');
-			$filename = Str::uuid() . '.' . $bukti3->extension();
+			$filename = Str::uuid() . '.' . $bukti_hotel->extension();
 
-			$filePaths['bukti3'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_hotel'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti3->getContent(),
+				$bukti_hotel->getContent(),
 				$filename
 			);
     }
@@ -135,17 +161,23 @@ class FormMeetingSeminarController extends Controller
     $formatted_sequence_number = str_pad($sequence_number, 4, '0', STR_PAD_LEFT);
     $expense_number = $region->code . '-' . $cabang->code . '-MTG-' . date('ym') . $formatted_sequence_number;
 
+    $data_nominal = [
+      'allowance' => $request->allowance ?? 0,
+      'transport_ankot' => $request->transport_ankot ?? 0,
+      'hotel' => $request->hotel ?? 0,
+    ];
+
     // Save the form data
     FormMeetingSeminar::create([
       'expense_number' => $expense_number,
       'user_id' => auth()->user()->id,
-      'allowance' => $request->allowance,
+      'allowance' => $data_nominal['allowance'],
-      'transport_ankot' => $request->transport_ankot,
+      'transport_ankot' => $data_nominal['transport_ankot'],
-      'hotel' => $request->hotel,
+      'hotel' => $data_nominal['hotel'],
-      'total' => $request->allowance + $request->transport_ankot + $request->hotel,
+      'total' => array_sum($data_nominal),
-      'bukti1' => $filePaths['bukti1'] ?? null,
+      'bukti_allowance' => $filePaths['bukti_allowance'] ?? null,
-      'bukti2' => $filePaths['bukti2'] ?? null,
+      'bukti_transport_ankot' => $filePaths['bukti_transport_ankot'] ?? null,
-      'bukti3' => $filePaths['bukti3'] ?? null,
+      'bukti_hotel' => $filePaths['bukti_hotel'] ?? null,
       'account_number' => $kategori->account_number,
       'status' => 'On Progress',
     ]);
@@ -175,12 +207,12 @@ class FormMeetingSeminarController extends Controller
     $this->checkAuthorization(auth()->user(), ['forms.meeting.edit']);
 
     $request->validate([
-      'allowance' => 'required',
+      'allowance' => 'nullable|numeric',
-      'transport_ankot' => 'required',
+      'transport_ankot' => 'nullable|numeric',
-      'hotel' => 'required',
+      'hotel' => 'nullable|numeric',
-      'bukti1' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti2' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti3' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
     ]);
 
     $form = FormMeetingSeminar::findOrfail($id);
@@ -196,53 +228,59 @@ class FormMeetingSeminarController extends Controller
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/meeting';
 
-    if ($request->hasFile('bukti1')) {
+    if ($request->hasFile('bukti_allowance')) {
-      $bukti1 = $request->file('bukti1');
+      $bukti_allowance = $request->file('bukti_allowance');
-			$filename = Str::uuid() . '.' . $bukti1->extension();
+			$filename = Str::uuid() . '.' . $bukti_allowance->extension();
 
-			$filePaths['bukti1'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_allowance'] = $folderPath . '/' . $filename;
 
       NextCloudHelper::uploadFile(
         $folderPath,
-        $bukti1->getContent(),
+        $bukti_allowance->getContent(),
 				$filename
       );
 
     }
-    if ($request->hasFile('bukti2')) {
+    if ($request->hasFile('bukti_transport_ankot')) {
-      $bukti2 = $request->file('bukti2');
+      $bukti_transport_ankot = $request->file('bukti_transport_ankot');
-			$filename = Str::uuid() . '.' . $bukti2->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_ankot->extension();
 
-			$filePaths['bukti2'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_ankot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti2->getContent(),
+				$bukti_transport_ankot->getContent(),
 				$filename
 			);
     }
-    if ($request->hasFile('bukti3')) {
+    if ($request->hasFile('bukti_hotel')) {
-      $bukti3 = $request->file('bukti3');
+      $bukti_hotel = $request->file('bukti_hotel');
-			$filename = Str::uuid() . '.' . $bukti3->extension();
+			$filename = Str::uuid() . '.' . $bukti_hotel->extension();
 
-			$filePaths['bukti3'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_hotel'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti3->getContent(),
+				$bukti_hotel->getContent(),
 				$filename
 			);
     }
 
+    $data_nominal = [
+      'allowance' => $request->allowance ?? 0,
+      'transport_ankot' => $request->transport_ankot ?? 0,
+      'hotel' => $request->hotel ?? 0,
+    ];
+
     // Save the form data
     $form->update([
-      'allowance' => $request->allowance,
+      'allowance' => $data_nominal['allowance'],
-      'transport_ankot' => $request->transport_ankot,
+      'transport_ankot' => $data_nominal['transport_ankot'],
-      'hotel' => $request->hotel,
+      'hotel' => $data_nominal['hotel'],
       'total' => $request->allowance + $request->transport_ankot + $request->hotel,
-      'bukti1' => $filePaths['bukti1'] ?? $form->bukti1,
+      'bukti_allowance' => $filePaths['bukti_allowance'] ?? $form->bukti_allowance,
-      'bukti2' => $filePaths['bukti2'] ?? $form->bukti2,
+      'bukti_transport_ankot' => $filePaths['bukti_transport_ankot'] ?? $form->bukti_transport_ankot,
-      'bukti3' => $filePaths['bukti3'] ?? $form->bukti3,
+      'bukti_hotel' => $filePaths['bukti_hotel'] ?? $form->bukti_hotel,
       'account_number' => $kategori->account_number,
     ]);
 
@@ -251,21 +289,31 @@ class FormMeetingSeminarController extends Controller
     return redirect()->back();
 	}
 
-  public function approve($id)
+  public function approve(Request $request, $id)
   {
     $this->checkAuthorization(auth()->user(), ['approval.approve']);
 
     $form = FormMeetingSeminar::findOrfail($id);
+    $approved_data = [
+      'allowance' => $request->allowance ? $form->allowance : 0,
+      'transport_ankot' => $request->transport_ankot ? $form->transport_ankot : 0,
+      'hotel' => $request->hotel ? $form->hotel : 0,
+    ];
+
     $form->update([
       'approved_at' => now(),
       'approved_by' => auth()->user()->id,
-      'status' => 'Approved'
+      'status' => 'Approved',
+      'approved_allowance' => $approved_data['allowance'],
+      'approved_transport_ankot' => $approved_data['transport_ankot'],
+      'approved_hotel' => $approved_data['hotel'],
+      'approved_total' => array_sum($approved_data),
     ]);
 
     $heads = $form->user->getCabangAndRegionHead();
     $name = $form->user->name;
     $expense_number = $form->expense_number;
-    $tanggal = $form->tanggal;
+    $tanggal = $form->created_at;
     $total = $form->total;
 
     // Collect all recipients
@@ -287,15 +335,16 @@ class FormMeetingSeminarController extends Controller
     $phoneNumbers = array_unique($phoneNumbers);
 
     // Send bulk email
-    Mail::to($recipients)->send(new ExpenseApproved(
+    // Mail::to($recipients)->send(new ExpenseApproved(
-      $name,
+    //   $name,
-      $expense_number,
+    //   $expense_number,
-      $tanggal,
+    //   $tanggal,
-      $total
+    //   $total
-    ));
+    // ));
 
     // Send bulk WhatsApp message
-    WhatsappHelper::approveExpense($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
@@ -321,7 +370,7 @@ class FormMeetingSeminarController extends Controller
     $heads = $form->user->getCabangAndRegionHead();
     $name = $form->user->name;
     $expense_number = $form->expense_number;
-    $tanggal = $form->tanggal;
+    $tanggal = $form->created_at;
     $total = $form->total;
 
     // Collect all recipients
@@ -343,15 +392,16 @@ class FormMeetingSeminarController extends Controller
     $phoneNumbers = array_unique($phoneNumbers);
 
     // Send bulk email
-    Mail::to($recipients)->send(new FinalApprove(
+    // Mail::to($recipients)->send(new FinalApprove(
-      $name,
+    //   $name,
-      $expense_number,
+    //   $expense_number,
-      $tanggal,
+    //   $tanggal,
-      $total
+    //   $total
-    ));
+    // ));
 
     // send whatsapp message
-    WhatsappHelper::finalApprove($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been final approved.');
@@ -386,7 +436,7 @@ class FormMeetingSeminarController extends Controller
     $heads = $form->user->getCabangAndRegionHead();
     $name = $form->user->name;
     $expense_number = $form->expense_number;
-    $tanggal = $form->tanggal;
+    $tanggal = $form->created_at;
     $total = $form->total;
 
     // Collect all recipients
@@ -408,15 +458,16 @@ class FormMeetingSeminarController extends Controller
     $phoneNumbers = array_unique($phoneNumbers);
 
     // Send bulk email
-    Mail::to($recipients)->send(new ExpenseRejected(
+    // Mail::to($recipients)->send(new ExpenseRejected(
-      $name,
+    //   $name,
-      $expense_number,
+    //   $expense_number,
-      $tanggal,
+    //   $tanggal,
-      $total
+    //   $total
-    ));
+    // ));
 
     // Send bulk WhatsApp message
-    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number);
+    $url = route('forms.meeting.view', $form->id);
+    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Meeting Seminar (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been rejected.');

app/Http/Controllers/Forms/FormUpCountryController.php

@@ -70,12 +70,30 @@ class FormUpCountryController extends Controller
     $this->checkAuthorization(auth()->user(), ['forms.country.view']);
 
     $form = FormUpCountry::with(['rayon', 'user'])->findOrFail($id);
-    $form->bukti1 = $form->bukti1 ? NextCloudHelper::getFileUrl($form->bukti1) : null;
+    $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
-    $form->bukti2 = $form->bukti2 ? NextCloudHelper::getFileUrl($form->bukti2) : null;
+    $form->bukti_transport_dalkot = $form->bukti_transport_dalkot ? NextCloudHelper::getFileUrl($form->bukti_transport_dalkot) : null;
-    $form->bukti3 = $form->bukti3 ? NextCloudHelper::getFileUrl($form->bukti3) : null;
+    $form->bukti_transport_ankot = $form->bukti_transport_ankot ? NextCloudHelper::getFileUrl($form->bukti_transport_ankot) : null;
+    $form->bukti_hotel = $form->bukti_hotel ? NextCloudHelper::getFileUrl($form->bukti_hotel) : null;
+
     return response()->json($form);
   }
 
+  public function view($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+
+    $form = FormUpCountry::with(['rayon', 'user'])->findOrFail($id);
+    $form->bukti_allowance = $form->bukti_allowance ? NextCloudHelper::getFileUrl($form->bukti_allowance) : null;
+    $form->bukti_transport_dalkot = $form->bukti_transport_dalkot ? NextCloudHelper::getFileUrl($form->bukti_transport_dalkot) : null;
+    $form->bukti_transport_ankot = $form->bukti_transport_ankot ? NextCloudHelper::getFileUrl($form->bukti_transport_ankot) : null;
+    $form->bukti_hotel = $form->bukti_hotel ? NextCloudHelper::getFileUrl($form->bukti_hotel) : null;
+
+    return view('backend.pages.forms.upcountry.view', [
+      'form' => $form,
+      'rayons' => Rayon::all()
+    ]);
+  }
+
 	public function create()
 	{
     $this->checkAuthorization(auth()->user(), ['forms.country.create']);
@@ -94,12 +112,14 @@ class FormUpCountryController extends Controller
       'tanggal' => 'required',
       'tujuan' => 'required',
       'jarak' => 'required',
-      'allowance' => 'required',
+      'allowance' => 'nullable|numeric',
-      'transport_dalkot' => 'required',
+      'transport_dalkot' => 'nullable|numeric',
-      'transport_ankot' => 'required',
+      'transport_ankot' => 'nullable|numeric',
-      'bukti1' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'hotel' => 'nullable|numeric',
-      'bukti2' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti3' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
     ]);
 
     $cabang = UserHasCabang::with('cabang')->where('user_id', auth()->user()->id)->first()->cabang;
@@ -109,40 +129,52 @@ class FormUpCountryController extends Controller
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/upcountry';
 
-		if ($request->hasFile('bukti1')) {
+		if ($request->hasFile('bukti_allowance')) {
-      $bukti1 = $request->file('bukti1');
+      $bukti_allowance = $request->file('bukti_allowance');
-			$filename = Str::uuid() . '.' . $bukti1->extension();
+			$filename = Str::uuid() . '.' . $bukti_allowance->extension();
 
-			$filePaths['bukti1'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_allowance'] = $folderPath . '/' . $filename;
 
       NextCloudHelper::uploadFile(
         $folderPath,
-        $bukti1->getContent(),
+        $bukti_allowance->getContent(),
 				$filename
       );
 
     }
-    if ($request->hasFile('bukti2')) {
+    if ($request->hasFile('bukti_transport_dalkot')) {
-      $bukti2 = $request->file('bukti2');
+      $bukti_transport_dalkot = $request->file('bukti_transport_dalkot');
-			$filename = Str::uuid() . '.' . $bukti2->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_dalkot->extension();
 
-			$filePaths['bukti2'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_dalkot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti2->getContent(),
+				$bukti_transport_dalkot->getContent(),
 				$filename
 			);
     }
-    if ($request->hasFile('bukti3')) {
+    if ($request->hasFile('bukti_transport_ankot')) {
-      $bukti3 = $request->file('bukti3');
+      $bukti_transport_ankot = $request->file('bukti_transport_ankot');
-			$filename = Str::uuid() . '.' . $bukti3->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_ankot->extension();
 
-			$filePaths['bukti3'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_ankot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti3->getContent(),
+				$bukti_transport_ankot->getContent(),
+				$filename
+			);
+    }
+    if ($request->hasFile('bukti_hotel')) {
+      $bukti_hotel = $request->file('bukti_hotel');
+			$filename = Str::uuid() . '.' . $bukti_hotel->extension();
+
+			$filePaths['bukti_hotel'] = $folderPath . '/' . $filename;
+
+			NextCloudHelper::uploadFile(
+				$folderPath,
+				$bukti_hotel->getContent(),
 				$filename
 			);
     }
@@ -152,6 +184,13 @@ class FormUpCountryController extends Controller
     $formatted_sequence_number = str_pad($sequence_number, 4, '0', STR_PAD_LEFT);
     $expense_number = $region->code . '-' . $cabang->code . '-UPC-' . date('ym') . $formatted_sequence_number;
 
+    $data_nominal = [
+      'allowance' => $request->allowance ?? 0,
+      'transport_dalkot' => $request->transport_dalkot ?? 0,
+      'transport_ankot' => $request->transport_ankot ?? 0,
+      'hotel' => $request->hotel ?? 0,
+    ];
+
     // Save the form data
     FormUpCountry::create([
       'expense_number' => $expense_number,
@@ -160,14 +199,15 @@ class FormUpCountryController extends Controller
       'tanggal' => $request->tanggal,
       'tujuan' => $request->tujuan,
       'jarak' => $request->jarak,
-      'allowance' => $request->allowance,
+      'allowance' => $data_nominal['allowance'],
-      'transport_dalkot' => $request->transport_dalkot,
+      'transport_dalkot' => $data_nominal['transport_dalkot'],
-      'transport_ankot' => $request->transport_ankot,
+      'transport_ankot' => $data_nominal['transport_ankot'],
-      'hotel' => $request->hotel,
+      'hotel' => $data_nominal['hotel'],
-      'total' => $request->allowance + $request->transport_dalkot + $request->transport_ankot + $request->hotel,
+      'total' => array_sum($data_nominal),
-      'bukti1' => $filePaths['bukti1'] ?? null,
+      'bukti_allowance' => $filePaths['bukti_allowance'] ?? null,
-      'bukti2' => $filePaths['bukti2'] ?? null,
+      'bukti_transport_dalkot' => $filePaths['bukti_transport_dalkot'] ?? null,
-      'bukti3' => $filePaths['bukti3'] ?? null,
+      'bukti_transport_ankot' => $filePaths['bukti_transport_ankot'] ?? null,
+      'bukti_hotel' => $filePaths['bukti_hotel'] ?? null,
       'account_number' => $kategori->account_number,
       'status' => 'On Progress',
     ]);
@@ -202,13 +242,14 @@ class FormUpCountryController extends Controller
       'tanggal' => 'required',
       'tujuan' => 'required',
       'jarak' => 'required',
-      'allowance' => 'required',
+      'allowance' => 'nullable|numeric',
-      'transport_dalkot' => 'required',
+      'transport_dalkot' => 'nullable|numeric',
-      'transport_ankot' => 'required',
+      'transport_ankot' => 'nullable|numeric',
-      'hotel' => 'required',
+      'hotel' => 'nullable|numeric',
-      'bukti1' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti2' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
-      'bukti3' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
+      'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])],
     ]);
 
     $form = FormUpCountry::findOrfail($id);
@@ -224,43 +265,62 @@ class FormUpCountryController extends Controller
     $filePaths = [];
     $folderPath = '/expense/' . $region->code . '/' . $cabang->code . '/upcountry';
 
-    if ($request->hasFile('bukti1')) {
+    if ($request->hasFile('bukti_allowance')) {
-      $bukti1 = $request->file('bukti1');
+      $bukti_allowance = $request->file('bukti_allowance');
-			$filename = Str::uuid() . '.' . $bukti1->extension();
+			$filename = Str::uuid() . '.' . $bukti_allowance->extension();
 
-			$filePaths['bukti1'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_allowance'] = $folderPath . '/' . $filename;
 
       NextCloudHelper::uploadFile(
         $folderPath,
-        $bukti1->getContent(),
+        $bukti_allowance->getContent(),
 				$filename
       );
 
     }
-    if ($request->hasFile('bukti2')) {
+    if ($request->hasFile('bukti_transport_dalkot')) {
-      $bukti2 = $request->file('bukti2');
+      $bukti_transport_dalkot = $request->file('bukti_transport_dalkot');
-			$filename = Str::uuid() . '.' . $bukti2->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_dalkot->extension();
 
-			$filePaths['bukti2'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_dalkot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti2->getContent(),
+				$bukti_transport_dalkot->getContent(),
 				$filename
 			);
     }
-    if ($request->hasFile('bukti3')) {
+    if ($request->hasFile('bukti_transport_ankot')) {
-      $bukti3 = $request->file('bukti3');
+      $bukti_transport_ankot = $request->file('bukti_transport_ankot');
-			$filename = Str::uuid() . '.' . $bukti3->extension();
+			$filename = Str::uuid() . '.' . $bukti_transport_ankot->extension();
 
-			$filePaths['bukti3'] = $folderPath . '/' . $filename;
+			$filePaths['bukti_transport_ankot'] = $folderPath . '/' . $filename;
 
 			NextCloudHelper::uploadFile(
 				$folderPath,
-				$bukti3->getContent(),
+				$bukti_transport_ankot->getContent(),
 				$filename
 			);
     }
+    if ($request->hasFile('bukti_hotel')) {
+      $bukti_hotel = $request->file('bukti_hotel');
+			$filename = Str::uuid() . '.' . $bukti_hotel->extension();
+
+			$filePaths['bukti_hotel'] = $folderPath . '/' . $filename;
+
+			NextCloudHelper::uploadFile(
+				$folderPath,
+				$bukti_hotel->getContent(),
+				$filename
+			);
+    }
+
+    $data_nominal = [
+      'allowance' => $request->allowance ?? 0,
+      'transport_dalkot' => $request->transport_dalkot ?? 0,
+      'transport_ankot' => $request->transport_ankot ?? 0,
+      'hotel' => $request->hotel ?? 0,
+    ];
 
     // Save the form data
     $form->update([
@@ -268,14 +328,15 @@ class FormUpCountryController extends Controller
       'tanggal' => $request->tanggal,
       'tujuan' => $request->tujuan,
       'jarak' => $request->jarak,
-      'allowance' => $request->allowance,
+      'allowance' => $data_nominal['allowance'],
-      'transport_dalkot' => $request->transport_dalkot,
+      'transport_dalkot' => $data_nominal['transport_dalkot'],
-      'transport_ankot' => $request->transport_ankot,
+      'transport_ankot' => $data_nominal['transport_ankot'],
-      'hotel' => $request->hotel,
+      'hotel' => $data_nominal['hotel'],
-      'total' => $request->allowance + $request->transport_dalkot + $request->transport_ankot + $request->hotel,
+      'total' => array_sum($data_nominal),
-      'bukti1' => $filePaths['bukti1'] ?? $form->bukti1,
+      'bukti_allowance' => $filePaths['bukti_allowance'] ?? $form->bukti_allowance,
-      'bukti2' => $filePaths['bukti2'] ?? $form->bukti2,
+      'bukti_transport_dalkot' => $filePaths['bukti_transport_dalkot'] ?? $form->bukti_transport_dalkot,
-      'bukti3' => $filePaths['bukti3'] ?? $form->bukti3,
+      'bukti_transport_ankot' => $filePaths['bukti_transport_ankot'] ?? $form->bukti_transport_ankot,
+      'bukti_hotel' => $filePaths['bukti_hotel'] ?? $form->bukti_hotel,
       'account_number' => $kategori->account_number,
     ]);
 
@@ -300,7 +361,6 @@ class FormUpCountryController extends Controller
       'approved_at' => now(),
       'approved_by' => auth()->user()->id,
       'status' => 'Approved',
-
       'approved_allowance' => $approved_data['allowance'],
       'approved_transport_dalkot' => $approved_data['transport_dalkot'],
       'approved_transport_ankot' => $approved_data['transport_ankot'],
@@ -341,7 +401,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::approveExpense($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Approve', 'Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been approved.');
@@ -390,7 +451,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Reject', 'Reject Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been rejected.');
@@ -446,7 +508,8 @@ class FormUpCountryController extends Controller
     // ));
 
     // send whatsapp message
-    WhatsappHelper::finalApprove($phoneNumbers, $expense_number);
+    $url = route('forms.up-country.view', $form->id);
+    WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url);
 
     AuditTrailHelper::AddAuditTrail('Final Approve', 'Final Approve Expense at Form Entertainment Presentation (' . $form->expense_number . ')');
     session()->flash('success', 'Form has been final approved.');

app/Models/FormMeetingSeminar.php

@@ -21,9 +21,9 @@ class FormMeetingSeminar extends Model
         'approved_transport_ankot',
         'approved_hotel',
         'approved_total',
-        'bukti1',
+        'bukti_allowance',
-        'bukti2',
+        'bukti_transport_ankot',
-        'bukti3',
+        'bukti_hotel',
         'account_number',
         'status',
         'approved_at',

app/Models/FormUpCountry.php

@@ -27,9 +27,10 @@ class FormUpCountry extends Model
         'approved_transport_ankot',
         'approved_hotel',
         'approved_total',
-        'bukti1',
+        'bukti_allowance',
-        'bukti2',
+        'bukti_transport_dalkot',
-        'bukti3',
+        'bukti_transport_ankot',
+        'bukti_hotel',
         'account_number',
         'status',
         'approved_at',

database/migrations/2025_01_03_134057_add_nullable_to_form_up_country.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('form_up_country', function (Blueprint $table) {
+            $table->integer('allowance')->nullable()->change();
+            $table->integer('transport_dalkot')->nullable()->change();
+            $table->integer('transport_ankot')->nullable()->change();
+            $table->integer('hotel')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('form_up_country', function (Blueprint $table) {
+            $table->integer('allowance')->nullable(false)->change();
+            $table->integer('transport_dalkot')->nullable(false)->change();
+            $table->integer('transport_ankot')->nullable(false)->change();
+            $table->integer('hotel')->nullable(false)->change();
+        });
+    }
+};

database/migrations/2025_01_03_134342_changed_bukti_to_form_up_country.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('form_up_country', function (Blueprint $table) {
+            // drop old bukti columns
+            $table->dropColumn('bukti1');
+            $table->dropColumn('bukti2');
+            $table->dropColumn('bukti3');
+
+            $table->string('bukti_allowance')->after('approved_total')->nullable();
+            $table->string('bukti_transport_dalkot')->after('bukti_allowance')->nullable();
+            $table->string('bukti_transport_ankot')->after('bukti_transport_dalkot')->nullable();
+            $table->string('bukti_hotel')->after('bukti_transport_ankot')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('form_up_country', function (Blueprint $table) {
+            // drop new bukti columns
+            $table->dropColumn('bukti_allowance');
+            $table->dropColumn('bukti_transport_dalkot');
+            $table->dropColumn('bukti_transport_ankot');
+            $table->dropColumn('bukti_hotel');
+
+            $table->string('bukti1')->after('approved_total')->nullable()->change();
+            $table->string('bukti2')->after('bukti1')->nullable()->change();
+            $table->string('bukti3')->after('bukti2')->nullable()->change();
+        });
+    }
+};

database/migrations/2025_01_04_050827_add_nullable_to_form_meeting_seminar.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('form_meeting_seminar', function (Blueprint $table) {
+            $table->integer('allowance')->nullable()->change();
+            $table->integer('transport_ankot')->nullable()->change();
+            $table->integer('hotel')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('form_meeting_seminar', function (Blueprint $table) {
+            $table->integer('allowance')->nullable(false)->change();
+            $table->integer('transport_ankot')->nullable(false)->change();
+            $table->integer('hotel')->nullable(false)->change();
+        });
+    }
+};

database/migrations/2025_01_04_051006_changed_bukti_to_form_meeting_seminar.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('form_meeting_seminar', function (Blueprint $table) {
+            $table->dropColumn('bukti1');
+            $table->dropColumn('bukti2');
+            $table->dropColumn('bukti3');
+
+            $table->string('bukti_allowance')->after('approved_total')->nullable();
+            $table->string('bukti_transport_ankot')->after('bukti_allowance')->nullable();
+            $table->string('bukti_hotel')->after('bukti_transport_ankot')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('form_meeting_seminar', function (Blueprint $table) {
+            $table->dropColumn('bukti_allowance');
+            $table->dropColumn('bukti_transport_ankot');
+            $table->dropColumn('bukti_hotel');
+
+            $table->string('bukti1')->after('approved_total')->nullable()->change();
+            $table->string('bukti2')->after('bukti1')->nullable()->change();
+            $table->string('bukti3')->after('bukti2')->nullable()->change();
+        });
+    }
+};

resources/views/backend/pages/dashboard/index.blade.php

@@ -90,7 +90,7 @@
                             <p>Approved Meeting Seminar Expenses</p>
                         </div>
                         <div class="icon">
-                            <i class="fa fa-desktop" aria-hidden="true"></i>
+                            <i class="fa fa-users" aria-hidden="true"></i>
                         </div>
                         <a href="{{ route('forms.meeting') }}" class="small-box-footer">
                             More info <i class="fas fa-arrow-circle-right"></i>

resources/views/backend/pages/forms/meeting/create.blade.php

@@ -32,31 +32,31 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Allowance</label>
+                                    <label class="form-label">Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="allowance" id="allowance" required value="{{ old('allowance') }}">
+                                    <input type="text" class="form-control" name="allowance" id="allowance" value="{{ old('allowance') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Transport Antar Kota</label>
+                                    <label class="form-label">Bukti Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" required value="{{ old('transport_ankot') }}">
+                                    <input type="file" class="form-control" name="bukti_allowance" value="{{ old('bukti_allowance') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Hotel</label>
+                                    <label class="form-label">Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="hotel" id="hotel" required value="{{ old('hotel') }}">
+                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ old('transport_ankot') }}">
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
+                                    <input type="file" class="form-control" name="bukti_transport_ankot" value="{{ old('bukti_transport_ankot') }}">
                                 </div>
                             </div>
 
                             <div class="col-lg-6">
-                                <div class="mb-3">
+                               <div class="mb-3">
-                                    <label class="form-label">Bukti 1</label>
+                                    <label class="form-label">Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti1" value="{{ old('bukti1') }}">
+                                    <input type="text" class="form-control" name="hotel" id="hotel" value="{{ old('hotel') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 2</label>
+                                    <label class="form-label">Bukti Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti2" value="{{ old('bukti2') }}">
+                                    <input type="file" class="form-control" name="bukti_hotel" value="{{ old('bukti_hotel') }}">
-                                </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Bukti 3</label>
-                                    <input type="file" class="form-control" name="bukti3" value="{{ old('bukti3') }}">
                                 </div>
                             </div>
 

resources/views/backend/pages/forms/meeting/edit.blade.php

@@ -33,35 +33,35 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Allowance</label>
+                                    <label class="form-label">Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="allowance" id="allowance" required value="{{ $form->allowance }}">
+                                    <input type="text" class="form-control" name="allowance" id="allowance" value="{{ $form->allowance }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Transport Antar Kota</label>
+                                    <label class="form-label">Bukti Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" required value="{{ $form->transport_ankot }}">
+                                    <input type="file" class="form-control" name="bukti_allowance" value="{{ old('bukti_allowance') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Hotel</label>
+                                    <label class="form-label">Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="hotel" id="hotel" required value="{{ $form->hotel }}">
+                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ $form->transport_ankot }}">
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
+                                    <input type="file" class="form-control" name="bukti_transport_ankot" value="{{ old('bukti_transport_ankot') }}">
                                 </div>
                             </div>
 
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 1</label>
+                                    <label class="form-label">Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti1" value="{{ old('bukti1') }}">
+                                    <input type="text" class="form-control" name="hotel" id="hotel" value="{{ $form->hotel }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 2</label>
+                                    <label class="form-label">Bukti Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti2" value="{{ old('bukti2') }}">
+                                    <input type="file" class="form-control" name="bukti_hotel" value="{{ old('bukti_hotel') }}">
-                                </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Bukti 3</label>
-                                    <input type="file" class="form-control" name="bukti3" value="{{ old('bukti3') }}">
                                 </div>
                             </div>
 
-                            <button type="submit" class="btn btn-primary ml-2">Submit</button>
+                            <button type="submit" class="btn btn-primary ml-2">Update</button>
                         </div>
 					</form>
                 </div>

resources/views/backend/pages/forms/meeting/index.blade.php

@@ -39,7 +39,7 @@
 				<div class="col-lg-4 col-6">
 					<div class="small-box bg-success">
 						<div class="inner">
-							<h3>Rp {{ number_format($forms->whereIn('status', ['Approved', 'Closed'])->sum('total'), 0, ',', '.') }}</h3>
+							<h3>Rp {{ number_format($forms->whereIn('status', ['Approved', 'Closed'])->sum('approved_total'), 0, ',', '.') }}</h3>
 							<p>Approved Expenses</p>
 						</div>
 						<div class="icon">
@@ -84,15 +84,14 @@
 								<thead class="bg-light text-capitalize">
 									<tr>
 										<th>#</th>
+										<th>No Expense</th>
 										<th>Nama</th>
 										<th>Tanggal</th>
 										<th>Allowance</th>
 										<th>Transport Ankot</th>
 										<th>Hotel</th>
 										<th>Total</th>
-										<th>Bukti 1</th>
+										<th>Total Approved</th>
-										<th>Bukti 2</th>
-										<th>Bukti 3</th>
 										<th>Account Number</th>
 										<th>Status</th>
 										@if (auth()->user()->can('approval.approve'))
@@ -111,39 +110,14 @@
 									@foreach ($forms as $item)
 										<tr>
 											<td>{{ $loop->iteration }}</td>
+											<td>{{ $item->expense_number }}</td>
 											<td>{{ $item->user->name }}</td>
 											<td>{{ \Carbon\Carbon::parse($item->created_at)->locale('id')->isoFormat('D MMMM Y') }}</td>
 											<td>{{ number_format($item->allowance, 0, ',', '.') }}</td>
 											<td>{{ number_format($item->transport_ankot, 0, ',', '.') }}</td>
 											<td>{{ number_format($item->hotel, 0, ',', '.') }}</td>
 											<td>{{ number_format($item->total, 0, ',', '.') }}</td>
-											<td>
+											<td>{{ number_format($item->approved_total, 0, ',', '.') }}</td>
-												@if ($item->bukti1)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti1) }}" target="_blank">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
-											<td>
-												@if ($item->bukti2)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti2) }}" target="_blank">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
-											<td>
-												@if ($item->bukti3)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti3) }}" target="_blank">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
 											<td>{{ $item->account_number }}</td>
 											<td>
 												@if ($item->status == 'On Progress')
@@ -158,10 +132,10 @@
 												<td>
 													{{-- approve / reject button --}}
 													@if ($item->status == 'On Progress')
-														<form action="{{ route('forms.meeting.approve', $item->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this item?');">
+														<form action="javascript:void(0);" class="d-inline">
-															@csrf
+															<button type="button" 
-															@method('PUT')
+																class="btn btn-success btn-sm open-approve-modal" 
-															<button type="submit" class="btn btn-success btn-sm">
+																data-id="{{ route('forms.meeting.approve', $item->id) }}">
 																Approve
 															</button>
 														</form>
@@ -213,6 +187,12 @@
 												</td>
 											@endif
 											<td>
+												@if (auth()->user()->can('forms.meeting.view'))
+													<a href="{{ route('forms.meeting.view', $item->id) }}" class="btn btn-primary btn-sm">
+														<i class="fas fa-eye text-white"></i>
+													</a>
+												@endif
+
 												@if (auth()->user()->can('forms.meeting.edit'))
 													<a href="{{ route('forms.meeting.edit', $item->id) }}" class="btn btn-warning btn-sm">
 														<i class="fas fa-edit text-white"></i>
@@ -239,20 +219,191 @@
             </div>
         </div>
     </section>
+	<section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Meeting & Seminar
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Allowance:</strong> <span id="bukti_allowance"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Transport Antar Kota:</strong> <span id="bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="bukti_hotel"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="allowance" name="allowance">
+												<label class="custom-control-label" for="allowance">Allowance (<span id="allowance_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="transport_ankot" name="transport_ankot">
+												<label class="custom-control-label" for="transport_ankot">Transport Ankot (<span id="transport_ankot_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="hotel" name="hotel">
+												<label class="custom-control-label" for="hotel">Hotel (<span id="hotel_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<label for="total">Total</label>
+											<input type="text" class="form-control" id="total" name="total" value="0" readonly>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
 @endsection
 
 @section('scripts')
     <script>
-        $(document).ready(function () {
+		$(document).ready(function () {
-            if ($('#dataTable').length) {
+			// Uncheck all checkboxes on page refresh
-                $('#dataTable').DataTable({
+			$('.custom-control-input').prop('checked', false);
-                    responsive: false,
+
-                    dom: 'Bfrtip',
+			if ($('#dataTable').length) {
-                    buttons: [
+				$('#dataTable').DataTable({
-                        'excel', 'pdf', 'print'
+					responsive: false,
-                    ]
+					dom: 'Bfrtip',
-                });
+					buttons: ['excel', 'pdf', 'print']
-            }
+				});
-        });
+			}
-    </script>
+
+			// Handle Approve Button Click
+			$('.open-approve-modal').on('click', function () {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#loadingSpinner').show();
+				$('#modalContent').addClass('d-none');
+
+				$('#approveForm').attr('action', approveUrl); // Set the form action
+				$('#loadingSpinner').addClass('d-flex');
+				$('#approveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/up-country/detail/{id}
+				$.get(approveUrl.replace('approve', 'detail'), function (data) {
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#allowance_value').text(formatter.format(data.allowance));
+					$('#transport_ankot_value').text(formatter.format(data.transport_ankot));
+					$('#hotel_value').text(formatter.format(data.hotel));
+
+					// Assign data values to checkboxes
+					$('#allowance').data('value', data.allowance);
+					$('#transport_ankot').data('value', data.transport_ankot);
+					$('#hotel').data('value', data.hotel);
+
+					// Detail data
+					$('#user').text(data.user.name);
+					$('#expense_number').text(data.expense_number);
+					$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
+					$('#bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#loadingSpinner').hide();
+					$('#loadingSpinner').removeClass('d-flex');
+					$('#loadingSpinner').addClass('d-none');
+					$('#modalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Update total dynamically
+			$('.custom-control-input').on('change', function () {
+				let total = 0;
+
+				// Calculate the total based on checked checkboxes
+				$('.custom-control-input:checked').each(function () {
+					total += parseFloat($(this).data('value') || 0);
+				});
+
+				// Update the total field with formatted value
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0
+				});
+
+				$('#total').val(formatter.format(total));
+			});
+
+			// Uncheck all checkboxes when the modal is closed
+			$('#approveModal').on('hidden.bs.modal', function () {
+				$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+				$('#total').val('0');  // Reset total to 0
+			});
+		});
+	</script>
 @endsection

resources/views/backend/pages/forms/meeting/view.blade.php

@@ -0,0 +1,116 @@
+@extends('layouts.app')
+
+@section('title')
+  Dashboard
+@endsection
+
+@section('admin-content')
+    <script src="https://cdn.jsdelivr.net/npm/autonumeric@4.6.0/dist/autoNumeric.min.js"></script>
+
+    <section class="content-header">
+        <div class="container-fluid">
+            <div class="row mb-2">
+                <div class="col-sm-6">
+                    <h1>Lihat Expense Meeting & Seminar</h1>
+                </div>
+                <div class="col-sm-6">
+                    <ol class="breadcrumb float-sm-right">
+                        <li class="breadcrumb-item"><a href="{{ route('dashboard.index') }}">Dashboard</a></li>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </section>
+    <section class="content">
+        <div class="container-fluid">
+            <div class="card card-primary card-outline">
+                <div class="card-body">
+					<form method="POST" enctype="multipart/form-data">
+                        @csrf
+                        @method('PUT')
+                        @include('backend.layouts.partials.messages')
+                        <div class="row">
+                            <div class="col-lg-6">
+								 <div class="mb-3">
+                                    <label class="form-label">No Expense</label>
+                                    <input type="text" class="form-control" name="expense_number" value="{{ $form->expense_number }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Allowance</label>
+                                    <input type="text" class="form-control" name="allowance" id="allowance" value="{{ $form->allowance }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Allowance</label><br>
+                                    <a href="{{ $form->bukti_allowance }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Transport Antar Kota</label>
+                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ $form->transport_ankot }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Transport Antar Kota</label><br>
+                                    <a href="{{ $form->bukti_transport_ankot }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                            </div>
+
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label class="form-label">Hotel</label>
+                                    <input type="text" class="form-control" name="hotel" id="hotel" value="{{ $form->hotel }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Hotel</label><br>
+                                    <a href="{{ $form->bukti_hotel }}" target="_blank">Lihat Bukti</a>
+                                </div>
+								<div class="mb-3">
+                                    <label class="form-label">Total</label>
+                                    <input type="text" class="form-control" name="total" id="total" value="{{ $form->total }}" readonly>
+                                </div>
+                            </div>
+
+                            {{-- back button --}}
+                            <div class="col-lg-12">
+                                <a href="{{ route('forms.meeting') }}" class="btn btn-secondary">Kembali</a>
+                            </div>
+                        </div>
+					</form>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <script>
+        new AutoNumeric('#allowance', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#transport_ankot', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#hotel', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+		new AutoNumeric('#total', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+    </script>
+@endsection

resources/views/backend/pages/forms/upcountry/create.blade.php

@@ -31,7 +31,7 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Pilih Rayon</label>
+                                    <label class="form-label">Pilih Rayon <span class="font-italic font-weight-normal">(required)</span></label>
                                     <select class="form-control form-control-md" name="rayon_id" required>
                                         <option value="">Pilih Rayon</option>
                                         @foreach ($rayons as $rayon)
@@ -40,47 +40,51 @@
                                     </select>
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Tanggal</label>
+                                    <label class="form-label">Tanggal <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="date" class="form-control" name="tanggal" required value="{{ old('tanggal') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Tujuan</label>
+                                    <label class="form-label">Tujuan <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="text" class="form-control" name="tujuan" required value="{{ old('tujuan') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Jarak (km)</label>
+                                    <label class="form-label">Jarak (km) <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="number" class="form-control" name="jarak" required value="{{ old('jarak') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Allowance</label>
+                                    <label class="form-label">Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="string" class="form-control" name="allowance" id="allowance" required value="{{ old('allowance') }}">
+                                    <input type="string" class="form-control" name="allowance" id="allowance" value="{{ old('allowance') }}">
                                 </div>
-                                 <div class="mb-3">
+                                <div class="mb-3">
-                                    <label class="form-label">Transport Dalam Kota</label>
+                                    <label class="form-label">Bukti Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="string" class="form-control" name="transport_dalkot" id="transport_dalkot" required value="{{ old('transport_dalkot') }}">
+                                    <input type="file" class="form-control" name="bukti_allowance" value="{{ old('bukti_allowance') }}">
                                 </div>
                             </div>
 
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Transport Antar Kota</label>
+                                    <label class="form-label">Transport Dalam Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="string" class="form-control" name="transport_ankot" id="transport_ankot" required value="{{ old('transport_ankot') }}">
+                                    <input type="string" class="form-control" name="transport_dalkot" id="transport_dalkot" value="{{ old('transport_dalkot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Hotel</label>
+                                    <label class="form-label">Bukti Transport Dalam Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="string" class="form-control" name="hotel" id="hotel" required value="{{ old('hotel') }}">
+                                    <input type="file" class="form-control" name="bukti_transport_dalkot" value="{{ old('bukti_transport_dalkot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 1</label>
+                                    <label class="form-label">Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti1" value="{{ old('bukti1') }}">
+                                    <input type="string" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ old('transport_ankot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 2</label>
+                                    <label class="form-label">Bukti Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti2" value="{{ old('bukti2') }}">
+                                    <input type="file" class="form-control" name="bukti_transport_ankot" value="{{ old('bukti_transport_ankot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 3</label>
+                                    <label class="form-label">Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti3" value="{{ old('bukti3') }}">
+                                    <input type="string" class="form-control" name="hotel" id="hotel" value="{{ old('hotel') }}">
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
+                                    <input type="file" class="form-control" name="bukti_hotel" value="{{ old('bukti_hotel') }}">
                                 </div>
                             </div>
 

resources/views/backend/pages/forms/upcountry/edit.blade.php

@@ -32,7 +32,7 @@
                         <div class="row">
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Pilih Rayon</label>
+                                    <label class="form-label">Pilih Rayon <span class="font-italic font-weight-normal">(required)</span></label>
                                     <select class="form-control form-control-md" name="rayon_id" required>
                                         <option value="">Pilih Rayon</option>
                                         @foreach ($rayons as $rayon)
@@ -41,47 +41,51 @@
                                     </select>
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Tanggal</label>
+                                    <label class="form-label">Tanggal <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="date" class="form-control" name="tanggal" required value="{{ $form->tanggal }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Tujuan</label>
+                                    <label class="form-label">Tujuan <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="text" class="form-control" name="tujuan" required value="{{ $form->tujuan }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Jarak (km)</label>
+                                    <label class="form-label">Jarak (km) <span class="font-italic font-weight-normal">(required)</span></label>
                                     <input type="number" class="form-control" name="jarak" required value="{{ $form->jarak }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Allowance</label>
+                                    <label class="form-label">Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="allowance" id="allowance" required value="{{ $form->allowance }}">
+                                    <input type="string" class="form-control" name="allowance" id="allowance" value="{{ $form->allowance }}">
                                 </div>
-                                 <div class="mb-3">
+                                <div class="mb-3">
-                                    <label class="form-label">Transport Dalam Kota</label>
+                                    <label class="form-label">Bukti Allowance <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="transport_dalkot" id="transport_dalkot" required value="{{ $form->transport_dalkot }}">
+                                    <input type="file" class="form-control" name="bukti_allowance" value="{{ old('bukti_allowance') }}">
                                 </div>
                             </div>
 
                             <div class="col-lg-6">
                                 <div class="mb-3">
-                                    <label class="form-label">Transport Antar Kota</label>
+                                    <label class="form-label">Transport Dalam Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="transport_ankot" id="transport_ankot" required value="{{ $form->transport_ankot }}">
+                                    <input type="string" class="form-control" name="transport_dalkot" id="transport_dalkot" value="{{  $form->transport_dalkot }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Hotel</label>
+                                    <label class="form-label">Bukti Transport Dalam Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="text" class="form-control" name="hotel" id="hotel" required value="{{ $form->hotel }}">
+                                    <input type="file" class="form-control" name="bukti_transport_dalkot" value="{{ old('bukti_transport_dalkot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 1</label>
+                                    <label class="form-label">Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti1" value="{{ old('bukti1') }}">
+                                    <input type="string" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ $form->transport_ankot }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 2</label>
+                                    <label class="form-label">Bukti Transport Antar Kota <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti2" value="{{ old('bukti2') }}">
+                                    <input type="file" class="form-control" name="bukti_transport_ankot" value="{{ old('bukti_transport_ankot') }}">
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">Bukti 3</label>
+                                    <label class="form-label">Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
-                                    <input type="file" class="form-control" name="bukti3" value="{{ old('bukti3') }}">
+                                    <input type="string" class="form-control" name="hotel" id="hotel" value="{{ $form->hotel }}">
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Hotel <span class="font-italic font-weight-normal">(optional)</span></label>
+                                    <input type="file" class="form-control" name="bukti_hotel" value="{{ old('bukti_hotel') }}">
                                 </div>
                             </div>
 

resources/views/backend/pages/forms/upcountry/index.blade.php

@@ -84,6 +84,7 @@
 								<thead class="bg-light text-capitalize">
 									<tr>
 										<th>#</th>
+										<th>No Expense</th>
 										<th>Nama</th>
 										<th>Rayon</th>
 										<th>Tanggal</th>
@@ -91,9 +92,6 @@
 										<th>Jarak</th>
 										<th>Total</th>
 										<th>Total Approved</th>
-										<th>Bukti 1</th>
-										<th>Bukti 2</th>
-										<th>Bukti 3</th>
 										<th>Account Number</th>
 										<th>Status</th>
 										@if (auth()->user()->can('approval.approve'))
@@ -112,6 +110,7 @@
 									@foreach ($forms as $item)
 										<tr>
 											<td>{{ $loop->iteration }}</td>
+											<td>{{ $item->expense_number }}</td>
 											<td>{{ $item->user->name }}</td>
 											<td>{{ $item->rayon->code }}</td>
 											<td>{{ \Carbon\Carbon::parse($item->tanggal)->locale('id')->isoFormat('D MMMM Y') }}</td>
@@ -125,33 +124,6 @@
 													-
 												@endif
 											</td>
-											<td>
-												@if ($item->bukti1)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti1) }}">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
-											<td>
-												@if ($item->bukti2)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti2) }}">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
-											<td>
-												@if ($item->bukti3)
-													<a href="{{ NextCloudHelper::getFileUrl($item->bukti3) }}">
-														Download
-													</a>
-												@else
-													-
-												@endif
-											</td>
 											<td>{{ $item->account_number }}</td>
 											<td>
 												@if ($item->status == 'On Progress')
@@ -168,8 +140,8 @@
 													@if ($item->status == 'On Progress')
 														<form action="javascript:void(0);" class="d-inline">
 															<button type="button" 
-																	class="btn btn-success btn-sm open-approve-modal" 
+																class="btn btn-success btn-sm open-approve-modal" 
-																	data-id="{{ route('forms.up-country.approve', $item->id) }}">
+																data-id="{{ route('forms.up-country.approve', $item->id) }}">
 																Approve
 															</button>
 														</form>
@@ -221,6 +193,12 @@
 												</td>
 											@endif
 											<td>
+												@if (auth()->user()->can('forms.country.view'))
+													<a href="{{ route('forms.up-country.view', $item->id) }}" class="btn btn-primary btn-sm">
+														<i class="fas fa-eye text-white"></i>
+													</a>
+												@endif
+
 												@if (auth()->user()->can('forms.country.edit'))
 													<a href="{{ route('forms.up-country.edit', $item->id) }}" class="btn btn-warning btn-sm">
 														<i class="fas fa-edit text-white"></i>
@@ -294,13 +272,16 @@
 										<strong>Jarak:</strong> <span id="jarak"></span>
 									</li>
 									<li class="list-group-item">
-										<strong>Bukti 1:</strong> <span id="bukti1"></span>
+										<strong>Bukti Allowance:</strong> <span id="bukti_allowance"></span>
 									</li>
 									<li class="list-group-item">
-										<strong>Bukti 2:</strong> <span id="bukti2"></span>
+										<strong>Bukti Transport Dalam Kota:</strong> <span id="bukti_transport_dalkot"></span>
 									</li>
 									<li class="list-group-item">
-										<strong>Bukti 3:</strong> <span id="bukti3"></span>
+										<strong>Bukti Transport Antar Kota:</strong> <span id="bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="bukti_hotel"></span>
 									</li>
 								</ul>
 								<p class="mt-2">Please select the items you want to approve:</p>
@@ -381,6 +362,7 @@
 				$('#modalContent').addClass('d-none');
 
 				$('#approveForm').attr('action', approveUrl); // Set the form action
+				$('#loadingSpinner').addClass('d-flex');
 				$('#approveModal').modal('show'); // Show the modal
 
 				// Get detail from /forms/up-country/detail/{id}
@@ -413,9 +395,11 @@
 					}));
 					$('#tujuan').text(data.tujuan);
 					$('#jarak').text(data.jarak + ' km');
-					$('#bukti1').html(data.bukti1 ? '<a href="' + data.bukti1 + '" target="_blank">Download</a>' : '-');
+
-					$('#bukti2').html(data.bukti2 ? '<a href="' + data.bukti2 + '" target="_blank">Download</a>' : '-');
+					$('#bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
-					$('#bukti3').html(data.bukti3 ? '<a href="' + data.bukti3 + '" target="_blank">Download</a>' : '-');
+					$('#bukti_transport_dalkot').html(data.bukti_transport_dalkot ? '<a href="' + data.bukti_transport_dalkot + '" target="_blank">Download</a>' : '-');
+					$('#bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
 
 					// Hide spinner and show content
 					$('#loadingSpinner').hide();

resources/views/backend/pages/forms/upcountry/view.blade.php

@@ -0,0 +1,152 @@
+@extends('layouts.app')
+
+@section('title')
+  Dashboard
+@endsection
+
+@section('admin-content')
+    <script src="https://cdn.jsdelivr.net/npm/autonumeric@4.6.0/dist/autoNumeric.min.js"></script>
+    <section class="content-header">
+        <div class="container-fluid">
+            <div class="row mb-2">
+                <div class="col-sm-6">
+                    <h1>Lihat Expense Up Country</h1>
+                </div>
+                <div class="col-sm-6">
+                    <ol class="breadcrumb float-sm-right">
+                        <li class="breadcrumb-item"><a href="{{ route('dashboard.index') }}">Dashboard</a></li>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </section>
+    <section class="content">
+        <div class="container-fluid">
+            <div class="card card-primary card-outline">
+                <div class="card-body">
+					<form method="POST" enctype="multipart/form-data">
+                        @csrf
+                        @method('PUT')
+                        @include('backend.layouts.partials.messages')
+                        <div class="row">
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label class="form-label">No Expense</label>
+                                    <input type="text" class="form-control" name="expense_number" value="{{ $form->expense_number }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Pilih Rayon</label>
+                                    <select class="form-control form-control-md" name="rayon_id" readonly>
+                                        <option value="">Pilih Rayon</option>
+                                        @foreach ($rayons as $rayon)
+                                            <option value="{{ $rayon->id }}" {{ $form->rayon_id == $rayon->id ? 'selected' : '' }}>{{ $rayon->name }}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Tanggal</label>
+                                    <input type="date" class="form-control" name="tanggal" value="{{ $form->tanggal }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Tujuan</label>
+                                    <input type="text" class="form-control" name="tujuan" value="{{ $form->tujuan }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Jarak (km)</label>
+                                    <input type="number" class="form-control" name="jarak" value="{{ $form->jarak }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Allowance</label>
+                                    <input type="string" class="form-control" name="allowance" id="allowance" value="{{ $form->allowance }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Allowance</label><br>
+                                    <a href="{{ $form->bukti_allowance }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                            </div>
+
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label class="form-label">Transport Dalam Kota</label>
+                                    <input type="string" class="form-control" name="transport_dalkot" id="transport_dalkot" value="{{  $form->transport_dalkot }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Transport Dalam Kota</label><br>
+                                    <a href="{{ $form->bukti_transport_dalkot }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Transport Antar Kota</label>
+                                    <input type="string" class="form-control" name="transport_ankot" id="transport_ankot" value="{{ $form->transport_ankot }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Transport Antar Kota</label><br>
+                                    <a href="{{ $form->bukti_transport_ankot }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Hotel</label>
+                                    <input type="string" class="form-control" name="hotel" id="hotel" value="{{ $form->hotel }}" readonly>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Bukti Hotel</label><br>
+                                    <a href="{{ $form->bukti_hotel }}" target="_blank">Lihat Bukti</a>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="form-label">Total</label>
+                                    <input type="text" class="form-control" name="total" id="total" value="{{ $form->total }}" readonly>
+                                </div>
+                            </div>
+
+                            {{-- back button --}}
+                            <div class="col-lg-12">
+                                <a href="{{ route('forms.up-country') }}" class="btn btn-secondary">Kembali</a>
+                            </div>
+                        </div>
+					</form>
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <script>
+        new AutoNumeric('#allowance', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#transport_dalkot', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#transport_ankot', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#hotel', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+
+        new AutoNumeric('#total', {
+            digitGroupSeparator: '.', // Pemisah ribuan
+            decimalCharacter: ',',    // Karakter desimal (tidak digunakan karena tanpa desimal)
+            currencySymbol: 'Rp.',    // Simbol mata uang
+            decimalPlaces: 0,         // Tidak ada angka desimal
+            unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
+        });
+    </script>
+@endsection

resources/views/backend/pages/roles/index.blade.php

@@ -38,7 +38,7 @@
                             <div class="clearfix"></div>
                             <div class="dataTables_wrapper dt-bootstrap4">
                                 @include('backend.layouts.partials.messages')
-                                <div class="table-responsive">
+                                <div class="">
                                     <table id="dataTable"
                                         class="table table-bordered table-striped table-head-fixed dataTable dtr-inline"
                                         style="width:100%">
@@ -105,7 +105,7 @@
         $(document).ready(function () {
             if ($('#dataTable').length) {
                 $('#dataTable').DataTable({
-                    responsive: false,
+                    responsive: true,
                     dom: 'Bfrtip',
                     buttons: [
                         'excel', 'pdf', 'print'

routes/web.php

@@ -77,6 +77,7 @@ Route::middleware(['auth:admin', 'menu'])->group(function () {
         // Up Country
         Route::get('/up-country', [FormUpCountryController::class, 'index'])->name('forms.up-country');
         Route::get('/up-country/detail/{id}', [FormUpCountryController::class, 'detail'])->name('forms.up-country.detail');
+         Route::get('/up-country/view/{id}', [FormUpCountryController::class, 'view'])->name('forms.up-country.view');
         Route::get('/up-country/create', [FormUpCountryController::class, 'create'])->name('forms.up-country.create');
         Route::post('/up-country/store', [FormUpCountryController::class, 'store'])->name('forms.up-country.store');
         Route::get('/up-country/edit/{id}', [FormUpCountryController::class, 'edit'])->name('forms.up-country.edit');
@@ -113,6 +114,8 @@ Route::middleware(['auth:admin', 'menu'])->group(function () {
 
         // Meeting & Seminar
         Route::get('/meeting-seminar', [FormMeetingSeminarController::class, 'index'])->name('forms.meeting');
+        Route::get('/meeting-seminar/detail/{id}', [FormMeetingSeminarController::class, 'detail'])->name('forms.meeting.detail');
+        Route::get('/meeting-seminar/view/{id}', [FormMeetingSeminarController::class, 'view'])->name('forms.meeting.view');
         Route::get('/meeting-seminar/create', [FormMeetingSeminarController::class, 'create'])->name('forms.meeting.create');
         Route::post('/meeting-seminar/store', [FormMeetingSeminarController::class, 'store'])->name('forms.meeting.store');
         Route::get('/meeting-seminar/edit/{id}', [FormMeetingSeminarController::class, 'edit'])->name('forms.meeting.edit');