Merge pull request 'Update' (#157) from that-bill into master

Reviewed-on: #157

BACKEND/Modules/Admin/app/Http/Controllers/ElectricityBillController.php

@@ -57,10 +57,10 @@ class ElectricityBillController extends Controller
                 )
                 ->paginate($request->get('per_page', 15));
 
-            return $this->ResultSuccess($responseData);
+            return AbstractController::ResultSuccess($responseData);
         } catch (\Exception $e) {
             Log::error('Error fetching electricity bills: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 
@@ -81,7 +81,7 @@ class ElectricityBillController extends Controller
             // Check if billing_date already exists
             $existingBill = ElectricityBill::where('billing_date', $validated['billing_date'])->first();
             if ($existingBill) {
-                return $this->ResultError('Bill for this month already exists', 422);
+                return AbstractController::ResultError('Bill for this month already exists', 422);
             }
 
             // Calculate total amount
@@ -98,10 +98,10 @@ class ElectricityBillController extends Controller
                 'created_by' => auth('admins')->user()->id ?? null,
             ]);
 
-            return $this->ResultSuccess($bill, 'Electricity bill created successfully');
+            return AbstractController::ResultSuccess($bill, 'Electricity bill created successfully');
         } catch (\Exception $e) {
             Log::error('Error creating electricity bill: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 
@@ -127,7 +127,7 @@ class ElectricityBillController extends Controller
                     ->where('id', '!=', $id)
                     ->first();
                 if ($existingBill) {
-                    return $this->ResultError('Bill for this month already exists', 422);
+                    return AbstractController::ResultError('Bill for this month already exists', 422);
                 }
             }
 
@@ -143,10 +143,10 @@ class ElectricityBillController extends Controller
                 'updated_by' => auth('admins')->user()->id ?? null,
             ]));
 
-            return $this->ResultSuccess($bill, 'Electricity bill updated successfully');
+            return AbstractController::ResultSuccess($bill, 'Electricity bill updated successfully');
         } catch (\Exception $e) {
             Log::error('Error updating electricity bill: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 
@@ -159,10 +159,10 @@ class ElectricityBillController extends Controller
             $bill = ElectricityBill::findOrFail($id);
             $bill->delete();
 
-            return $this->ResultSuccess(null, 'Electricity bill deleted successfully');
+            return AbstractController::ResultSuccess(null, 'Electricity bill deleted successfully');
         } catch (\Exception $e) {
             Log::error('Error deleting electricity bill: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 
@@ -214,7 +214,7 @@ class ElectricityBillController extends Controller
                 ->header('Content-Disposition', 'attachment; filename="' . $fileName . '"');
         } catch (\Exception $e) {
             Log::error('Error exporting electricity bill to PDF: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 
@@ -225,10 +225,10 @@ class ElectricityBillController extends Controller
     {
         try {
             $bill = ElectricityBill::with(['creator', 'updater'])->findOrFail($id);
-            return $this->ResultSuccess($bill);
+            return AbstractController::ResultSuccess($bill);
         } catch (\Exception $e) {
             Log::error('Error fetching electricity bill: ' . $e->getMessage());
-            return $this->ResultError($e->getMessage());
+            return AbstractController::ResultError($e->getMessage());
         }
     }
 

BACKEND/app/Http/Controllers/Controller.php

@@ -9,21 +9,4 @@ use Illuminate\Routing\Controller as BaseController;
 class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
-
-    protected function ResultSuccess($data = null, $message = 'Success', $code = 200)
-    {
-        return response()->json([
-            'success' => true,
-            'message' => $message,
-            'data' => $data
-        ], $code);
-    }
-
-    protected function ResultError($message = 'Error', $code = 500)
-    {
-        return response()->json([
-            'success' => false,
-            'message' => $message
-        ], $code);
-    }
 }

FRONTEND/src/components/DataTable/DataTable.tsx

@@ -692,9 +692,9 @@ export const DataTablePagination = ({
       })
       // Request to get data API
       const res = await get(url, Object.fromEntries(urlParams.entries()))
-      if (res.status || res.success) {
-        setBaseData(res.success ? res?.data : res)
-        setTData(res.success ? res.data.data : res.data)
+      if (res.status) {
+        setBaseData(res.data?.links ? res?.data : res)
+        setTData(res.data?.data ? res.data?.data : res.data)
         setSkeletion(false)
         navigate({
           pathname: location.pathname,

FRONTEND/src/pages/OfficeSupport/OfficeSupport.tsx

@@ -255,7 +255,7 @@ const OfficeSupport = () => {
         res = await put(updateElectricityBill(item.id), params)
       }
 
-      if (res?.success) {
+      if (res?.status) {
         notifications.show({
           title: 'Success',
           message:
@@ -273,8 +273,8 @@ const OfficeSupport = () => {
         }
 
         getAllBills()
-      } else if (!res?.success && res?.errors) {
-        if (!res?.data?.success && res?.data?.message) {
+      } else if (!res?.status && res?.errors) {
+        if (!res?.data?.status && res?.data?.message) {
           setConfirmMessage(res.data?.message)
           setConfirmValues(values)
           setConfirmModal(true)