revised approve system and some minor fixes

app/Http/Controllers/Backend/AuditTrailController.php

@@ -22,7 +22,8 @@ class AuditTrailController extends Controller
         return view(
             'backend.pages.audit_trail.index',
             [
-                'data' => AuditTrail::orderBy('id', 'desc')->get(),
+                // sort by newest
+                'data' => AuditTrail::orderBy('created_at', 'desc')->get(),
 				'pageInfo' => $pageInfo,
             ]
         );

app/Http/Controllers/Backend/DashboardController.php

@@ -63,7 +63,7 @@ class DashboardController extends Controller
 
         // Sum the filtered queries
         foreach ($forms as $key => $query) {
-            $forms[$key] = $query->sum('total');
+            $forms[$key] = $query->sum('approved_total');
         }
 
         return view(

app/Http/Controllers/Forms/FormUpCountryController.php

@@ -65,6 +65,17 @@ class FormUpCountryController extends Controller
 		]);
 	}
 
+  public function detail($id)
+  {
+    $this->checkAuthorization(auth()->user(), ['forms.country.view']);
+
+    $form = FormUpCountry::with(['rayon', 'user'])->findOrFail($id);
+    $form->bukti1 = NextCloudHelper::getFileUrl($form->bukti1);
+    $form->bukti2 = NextCloudHelper::getFileUrl($form->bukti2);
+    $form->bukti3 = NextCloudHelper::getFileUrl($form->bukti3);
+    return response()->json($form);
+  }
+
 	public function create()
 	{
     $this->checkAuthorization(auth()->user(), ['forms.country.create']);
@@ -273,15 +284,28 @@ class FormUpCountryController extends Controller
     return redirect()->back();
 	}
 
-  public function approve($id)
+  public function approve(Request $request, $id)
   {
     $this->checkAuthorization(auth()->user(), ['approval.approve']);
 
     $form = FormUpCountry::findOrfail($id);
+    $approved_data = [
+      'allowance' => $request->allowance ? $form->allowance : 0,
+      'transport_dalkot' => $request->transport_dalkot ? $form->transport_dalkot : 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_dalkot' => $approved_data['transport_dalkot'],
+      'approved_transport_ankot' => $approved_data['transport_ankot'],
+      'approved_hotel' => $approved_data['hotel'],
+      'approved_total' => array_sum($approved_data),
     ]);
 
     $heads = $form->user->getCabangAndRegionHead();