Merge branch 'development' into 'production'

Development See merge request mbugroup/lti-web-client!484
2026-05-20 13:32:00 +00:00 · 2026-05-19 06:48:45 +00:00 · 2026-05-12 09:31:27 +00:00 · 2026-05-11 08:32:23 +00:00 · 2026-05-05 14:12:28 +07:00 · 2026-05-02 13:43:29 +07:00
12 changed files with 840 additions and 1632 deletions
@@ -48,6 +48,3 @@ next-env.d.ts

 # rtk
 rtk.exe
-
-# local specs
-/local-specs
@@ -80,124 +80,76 @@ Data tables across all modules (master-data, inventory, finance, purchase, etc.)
   - Apply to: search handlers, filter form submissions, reset handlers

 3. **Create custom formikResetHandler function**
-   - Call `resetFilter()` (single call — resets all `useTableFilter` state to defaults)
-   - Reset any local error state (e.g. `setHasDateError(false)`, dismiss toasts)
-   - Call `formik.resetForm({ values: { ...defaults } })` to sync formik to defaults
-   - Call `filterModal.closeModal()` at the end
-   - Attach to form `onReset` handler (not `formik.handleReset`)
+   - Clear each filter with `updateFilter(fieldName, defaultValue, true)`
+   - Call `formik.resetForm({ values: { ...defaults } })`
+   - Close the modal at the end
+   - Attach to both button `onClick` and form `onReset` handler

-   ```tsx
-   const formikResetHandler = () => {
-     resetFilter();
-     setHasDateError(false);
-     if (dateErrorShown) { toast.dismiss(); setDateErrorShown(false); }
-     formik.resetForm({ values: { start_date: '', end_date: '', customers: [], filterBy: undefined } });
-     filterModal.closeModal();
-   };
-   // ...
-   <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
-   ```
+**Optimization: Avoid useCallback for simple handlers**

-**Optimization: Avoid useCallback and useMemo for trivial operations**
-
- `useCallback` and `useMemo` add overhead; only use them when the computation is expensive or the result is passed to a memoized child
- Simple derivations and pass-through handlers don't need them:
+- `useCallback` adds overhead and is only useful for complex logic or memoized child components
+- Simple pass-through handlers don't need it:

  ```tsx
-  // ✅ Good: plain derivation
-  const data = isResponseSuccess(response) ? (response.data ?? []) : [];
-  const meta =
-    isResponseSuccess(response) && response.meta ? response.meta : null;
+  // ✅ Good: Simple handler without useCallback
+  const handleFilterChange = (val) => setFieldValue('location', val);

-  // ❌ Avoid: useMemo for trivial conditional access
-  const data = useMemo(
-    () => (isResponseSuccess(response) ? (response.data ?? []) : []),
-    [response]
-  );
-
-  // ✅ Good: simple handler
-  const handleChange = (val) => setFieldValue('location', val);
-
-  // ❌ Avoid: unnecessary useCallback
-  const handleChange = useCallback(
+  // ❌ Avoid: Unnecessary useCallback overhead
+  const handleFilterChange = useCallback(
    (val) => setFieldValue('location', val),
    [setFieldValue]
  );
  ```

- `useMemo` IS justified for large column definition arrays (TanStack Table re-processes on every render)
-
 **Best practice: Store OptionType objects directly, not IDs**

-For select inputs, store the complete `OptionType` object (or `OptionType[]` for multi-select) in both formik state and tableFilterState. `useTableFilter`'s `serializeValue` handles serialization automatically:
-
- `OptionType<T>` → serialized as `String(value)` in the query string
- `OptionType<T>[]` → serialized as comma-separated values (CSV) — ideal for multi-select API params like `customer_ids`, `sales_ids`
+For select inputs, store the complete `OptionType` object in both formik state and tableFilterState. This eliminates the need for computed helper values (like searching options arrays to find the matching object).

 ```tsx
+// Type the useTableFilter with the filter state structure
 const { state: tableFilterState, updateFilter, ... } = useTableFilter<{
  search: string;
-  customers: OptionType<number>[];     // multi-select → serializes as CSV
-  location?: OptionType<string>;       // single-select → serializes as value string
-  filterBy?: OptionType<string>;       // single-select radio
+  locationFilter?: OptionType<string>;
+  picFilter?: OptionType<string>;
 }>({
  initial: {
    search: '',
-    customers: [],
-    location: undefined,
-    filterBy: undefined,
+    locationFilter: undefined,
+    picFilter: undefined
  },
  paramMap: {
    page: 'page',
    pageSize: 'limit',
-    customers: 'customer_ids',   // serializes OptionType[] → "1,2,3"
-    location: 'location_id',     // serializes OptionType → "abc"
-    filterBy: 'filter_by',
+    locationFilter: 'location_id',
+    picFilter: 'pic_id',
  },
  persist: true,
-  storeName: 'my-table',
+  storeName: 'kandangs-table',
 });

-// Initialize formik directly from tableFilterState (no hardcoded defaults)
-const formik = useFormik({
+// Initialize formik with tableFilterState values (now typed OptionType objects)
+const formik = useFormik<KandangFilterType>({
  initialValues: {
-    customers: tableFilterState.customers,
-    location: tableFilterState.location,
-    filterBy: tableFilterState.filterBy,
+    location: tableFilterState.locationFilter,
+    pic: tableFilterState.picFilter,
  },
  ...
 });

-// Use formik values directly — no computed helpers needed
-<SelectInputCheckbox value={formik.values.customers} onChange={(val) => formik.setFieldValue('customers', Array.isArray(val) ? val : [])} />
-<SelectInput        value={formik.values.location}  onChange={(val) => formik.setFieldValue('location', val)} />
-<SelectInputRadio   value={formik.values.filterBy ?? null} onChange={(val) => formik.setFieldValue('filterBy', !Array.isArray(val) ? (val ?? undefined) : undefined)} />
+// Handlers store the complete OptionType, not just the ID
+const handleFilterLocationChange = useCallback(
+  (val) => setFieldValue('location', val),
+  [setFieldValue]
+);
+
+// Use formik values directly in select inputs (no computed helpers needed)
+<SelectInput
+  value={formik.values.location}
+  onChange={handleFilterLocationChange}
+  ...
+/>
 ```

-**Filter field naming convention**
-
- Multi-select fields: use plural entity name — `customers`, `salesPersons`, `locations`
- Single-select fields: use descriptive camelCase — `filterBy`, `status`, `category`
- No `Filter` suffix (e.g. avoid `customerFilter`, `locationFilter`)
-
-**Filter modal: pass `openModal` directly, never use `enableReinitialize`**
-
-`enableReinitialize: true` resets formik mid-interaction whenever `tableFilterState` changes, breaking the modal UX. Pass `filterModal.openModal` directly to the button — no ref wrapper needed. Formik retains its last state across open/close, which is acceptable UX (values sync with `tableFilterState` on submit and reset anyway).
-
-```tsx
-// ❌ Avoid: enableReinitialize breaks modal mid-interaction
-const formik = useFormik({ initialValues: { ... }, enableReinitialize: true });
-
-// ❌ Avoid: unnecessary ref indirection
-const handleFilterModalOpenRef = useRef(() => {});
-handleFilterModalOpenRef.current = () => { formik.setValues({...}); filterModal.openModal(); };
-
-// ✅ Correct: pass openModal directly
-<ButtonFilter onClick={filterModal.openModal} ... />
-```
-
-Include `filterModal.openModal` in the `useEffect` deps array when it's used inside the effect.
-
 **Apply this pattern to:**

 - Any data table component across any module that needs persistent filters
@@ -207,31 +159,7 @@ Include `filterModal.openModal` in the `useEffect` deps array when it's used ins
 **Reference implementations:**

 - `SupplierTable`, `KandangsTable`, `LocationsTable`, `CustomersTable` in `src/components/pages/master-data/`
- `BalanceMonitoringTab` in `src/components/pages/report/finance/tab/` — multi-select + radio + date range
-
-## SWR fetch pattern
-
-Use `FinanceApi.getAllFetcher` (or the relevant service's `getAllFetcher`) when the result type matches the service generic `T`. When it differs, use `httpClientFetcher` with an explicit type:
-
-```tsx
-// ✅ Same type as service generic — use getAllFetcher
-const { data } = useSWR(
-  `${Api.basePath}${getTableFilterQueryString()}`,
-  Api.getAllFetcher
-);
-
-// ✅ Different type — use httpClientFetcher with explicit useSWR type
-const { data } = useSWR<
-  BaseApiResponse<BalanceMonitoringRow[]>,
-  AxiosError<BaseApiResponse>,
-  SWRHttpKey
->(
-  `${FinanceApi.basePath}/balance-monitoring${getTableFilterQueryString()}`,
-  httpClientFetcher
-);
-```
-
-Always name the `toQueryString` alias `getTableFilterQueryString` when destructuring from `useTableFilter`.
+- Use same pattern for data tables in other modules (inventory, finance, purchase, etc.)

 ## Server-side sorting pattern

@@ -1,11 +0,0 @@
-import SuspenseHelper from '@/components/helper/SuspenseHelper';
-
-const Layout = ({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) => {
-  return <SuspenseHelper>{children}</SuspenseHelper>;
-};
-
-export default Layout;
@@ -6,7 +6,6 @@ export interface TabItem {
  label: ReactNode;
  content?: ReactNode;
  disabled?: boolean;
-  hide?: boolean;
 }

 export interface TabsProps
@@ -123,19 +122,17 @@ const Tabs = ({
    >
      <div className={getSideContentClasses()}>
        <div role='tablist' className={getTabsClasses()}>
-          {tabs.map(({ id, label, disabled, hide }) =>
-            hide ? null : (
-              <button
-                key={id}
-                role='tab'
-                className={getTabClasses(id === activeTabId, disabled)}
-                onClick={() => !disabled && handleTabChange(id)}
-                disabled={disabled}
-              >
-                {label}
-              </button>
-            )
-          )}
+          {tabs.map(({ id, label, disabled }) => (
+            <button
+              key={id}
+              role='tab'
+              className={getTabClasses(id === activeTabId, disabled)}
+              onClick={() => !disabled && handleTabChange(id)}
+              disabled={disabled}
+            >
+              {label}
+            </button>
+          ))}
        </div>
        {sideContent && sideContent}
      </div>
@@ -1,47 +1,25 @@
 'use client';

-import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import { useState } from 'react';
 import Tabs from '@/components/Tabs';
 import CustomerPaymentTab from '@/components/pages/report/finance/tab/CustomerPaymentTab';
 import DebtSupplierTab from '@/components/pages/report/finance/tab/DebtSupplierTab';
-import BalanceMonitoringTab from '@/components/pages/report/finance/tab/BalanceMonitoringTab';
 import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';

-const VALID_TAB_IDS = [
-  'debt-supplier',
-  'customer-payment',
-  'balance-monitoring',
-];
-
 const FinanceTabs = () => {
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const tabParam = searchParams.get('tab') ?? 'debt-supplier';
-  const activeTabId = VALID_TAB_IDS.includes(tabParam)
-    ? tabParam
-    : 'debt-supplier';
+  const [activeTabId, setActiveTabId] = useState<string>('1');
  const tabActions = useTabActionsStore((state) => state.tabActions);

-  const handleTabChange = (tabId: string) => {
-    router.push(`${pathname}?tab=${tabId}`);
-  };
-
  const tabs = [
    {
-      id: 'debt-supplier',
+      id: '1',
      label: 'Rekapitulasi Hutang Ke Supplier',
-      content: <DebtSupplierTab tabId={'debt-supplier'} />,
+      content: <DebtSupplierTab tabId={'1'} />,
    },
    {
-      id: 'customer-payment',
+      id: '2',
      label: 'Kontrol Pembayaran Customer',
-      content: <CustomerPaymentTab tabId={'customer-payment'} />,
-    },
-    {
-      id: 'balance-monitoring',
-      label: 'Monitoring Saldo',
-      content: <BalanceMonitoringTab tabId={'balance-monitoring'} />,
+      content: <CustomerPaymentTab tabId={'2'} />,
    },
  ];

@@ -51,7 +29,7 @@ const FinanceTabs = () => {
        tabs={tabs}
        variant='boxed'
        activeTabId={activeTabId}
-        onTabChange={handleTabChange}
+        onTabChange={setActiveTabId}
        className={{
          tabHeaderWrapper:
            'justify-between items-center p-3 border-b border-base-content/10',
@@ -1,602 +0,0 @@
-'use client';
-
-import { useState, useMemo, useEffect } from 'react';
-import useSWR from 'swr';
-import { Icon } from '@iconify/react';
-import { useFormik } from 'formik';
-import toast from 'react-hot-toast';
-import { ColumnDef } from '@tanstack/react-table';
-import { AxiosError } from 'axios';
-import { FinanceApi } from '@/services/api/report/finance-report';
-import { CustomerApi } from '@/services/api/master-data';
-import { UserApi } from '@/services/api/user';
-import { useSelect, OptionType } from '@/components/input/SelectInput';
-import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
-import { BaseApiResponse } from '@/types/api/api-general';
-import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
-import SelectInputRadio from '@/components/input/SelectInputRadio';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';
-import ButtonFilter from '@/components/helper/ButtonFilter';
-import { formatCurrency, formatNumber } from '@/lib/helper';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { BalanceMonitoringRow } from '@/types/api/report/balance-monitoring';
-import { CustomerPaymentRow } from '@/types/api/report/customer-payment';
-import Modal, { useModal } from '@/components/Modal';
-import Button from '@/components/Button';
-import DateInput from '@/components/input/DateInput';
-import Table from '@/components/Table';
-import CustomerSupplierSkeleton from '@/components/pages/report/finance/skeleton/CustomerSupplierSkeleton';
-
-interface BalanceMonitoringTabProps {
-  tabId: string;
-}
-
-const filterByOptions: OptionType<string>[] = [
-  { label: 'Tanggal Penjualan (SO Date)', value: 'sold_at' },
-  { label: 'Tanggal Realisasi (Delivery Date)', value: 'realized_at' },
-];
-
-const BalanceMonitoringTab = ({ tabId }: BalanceMonitoringTabProps) => {
-  const [hasDateError, setHasDateError] = useState(false);
-  const [dateErrorShown, setDateErrorShown] = useState(false);
-
-  const filterModal = useModal();
-
-  const setTabActions = useTabActionsStore((state) => state.setTabActions);
-  const clearTabActions = useTabActionsStore((state) => state.clearTabActions);
-
-  const {
-    state: tableFilterState,
-    updateFilter,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterQueryString,
-    reset: resetFilter,
-  } = useTableFilter<{
-    start_date: string;
-    end_date: string;
-    customers: OptionType<number>[];
-    salesPersons: OptionType<number>[];
-    filterBy?: OptionType<string>;
-    sort_by: string;
-    order_by: string;
-  }>({
-    initial: {
-      start_date: '',
-      end_date: '',
-      customers: [],
-      salesPersons: [],
-      filterBy: undefined,
-      sort_by: '',
-      order_by: '',
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-      start_date: 'start_date',
-      end_date: 'end_date',
-      customers: 'customer_ids',
-      salesPersons: 'sales_ids',
-      filterBy: 'filter_by',
-      sort_by: 'sort_by',
-      order_by: 'sort_order',
-    },
-    persist: true,
-    storeName: 'balance-monitoring-table',
-  });
-
-  // const sorting: SortingState = tableFilterState.sort_by
-  //   ? [
-  //       {
-  //         id: tableFilterState.sort_by,
-  //         desc: tableFilterState.order_by === 'desc',
-  //       },
-  //     ]
-  //   : [];
-
-  // const handleSortingChange = (updater: Updater<SortingState>) => {
-  //   const next = typeof updater === 'function' ? updater(sorting) : updater;
-  //   if (next.length > 0) {
-  //     updateFilter('sort_by', next[0].id, true);
-  //     updateFilter('order_by', next[0].desc ? 'desc' : 'asc', true);
-  //   } else {
-  //     updateFilter('sort_by', '', true);
-  //     updateFilter('order_by', '', true);
-  //   }
-  // };
-
-  const {
-    options: customerOptions,
-    setInputValue: setCustomerInput,
-    isLoadingOptions: isLoadingCustomers,
-    loadMore: loadMoreCustomers,
-  } = useSelect(CustomerApi.basePath, 'id', 'name', 'search');
-
-  const {
-    options: salesOptions,
-    setInputValue: setSalesInput,
-    isLoadingOptions: isLoadingSales,
-    loadMore: loadMoreSales,
-  } = useSelect(UserApi.basePath, 'id', 'name', 'search');
-
-  const formik = useFormik({
-    initialValues: {
-      start_date: tableFilterState.start_date,
-      end_date: tableFilterState.end_date,
-      customers: tableFilterState.customers,
-      salesPersons: tableFilterState.salesPersons,
-      filterBy: tableFilterState.filterBy,
-    },
-    onSubmit: (values) => {
-      updateFilter('start_date', values.start_date, true);
-      updateFilter('end_date', values.end_date, true);
-      updateFilter('customers', values.customers, true);
-      updateFilter('salesPersons', values.salesPersons, true);
-      updateFilter('filterBy', values.filterBy, true);
-      filterModal.closeModal();
-    },
-  });
-
-  const formikResetHandler = () => {
-    resetFilter();
-
-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
-
-    formik.resetForm({
-      values: {
-        start_date: '',
-        end_date: '',
-        customers: [],
-        salesPersons: [],
-        filterBy: undefined,
-      },
-    });
-
-    filterModal.closeModal();
-  };
-
-  const handleStartDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('start_date', value);
-
-    if (value && formik.values.end_date) {
-      if (new Date(formik.values.end_date) < new Date(value)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
-        }
-      } else {
-        setHasDateError(false);
-        if (dateErrorShown) {
-          toast.dismiss();
-          setDateErrorShown(false);
-        }
-      }
-    } else {
-      setHasDateError(false);
-    }
-  };
-
-  const handleEndDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('end_date', value);
-
-    if (value && formik.values.start_date) {
-      if (new Date(value) < new Date(formik.values.start_date)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
-        }
-        return;
-      }
-    }
-
-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
-  };
-
-  const { data: balanceMonitoringsResponse, isLoading } = useSWR<
-    BaseApiResponse<BalanceMonitoringRow[]>,
-    AxiosError<BaseApiResponse>,
-    SWRHttpKey
-  >(
-    `${FinanceApi.basePath}/balance-monitoring${getTableFilterQueryString()}`,
-    httpClientFetcher
-  );
-
-  const balanceMonitorings: BalanceMonitoringRow[] = isResponseSuccess(
-    balanceMonitoringsResponse
-  )
-    ? ((balanceMonitoringsResponse.data as BalanceMonitoringRow[]) ?? [])
-    : [];
-
-  const meta =
-    isResponseSuccess(balanceMonitoringsResponse) &&
-    balanceMonitoringsResponse.meta
-      ? balanceMonitoringsResponse.meta
-      : null;
-
-  // Inject tab actions directly — no nested component, no remount cycle
-  useEffect(() => {
-    setTabActions(
-      tabId,
-      <div className='flex flex-row gap-3'>
-        <ButtonFilter
-          values={{
-            start_date: tableFilterState.start_date,
-            end_date: tableFilterState.end_date,
-            customers: tableFilterState.customers,
-            salesPersons: tableFilterState.salesPersons,
-            filterBy: tableFilterState.filterBy,
-          }}
-          fieldGroups={[['start_date', 'end_date']]}
-          onClick={filterModal.openModal}
-          variant='outline'
-          className='px-3 py-2.5'
-        />
-      </div>
-    );
-  }, [tabId, setTabActions, tableFilterState, filterModal.openModal]);
-
-  useEffect(() => {
-    return () => clearTabActions(tabId);
-  }, [tabId, clearTabActions]);
-
-  const columns = useMemo(
-    (): ColumnDef<BalanceMonitoringRow>[] => [
-      {
-        header: 'No',
-        enableSorting: false,
-        cell: (props) =>
-          (tableFilterState.page - 1) * tableFilterState.pageSize +
-          props.row.index +
-          1,
-      },
-      {
-        header: 'Customer',
-        accessorKey: 'customer.name',
-        enableSorting: true,
-        id: 'customer_name',
-        cell: ({ row }) => row.original.customer.name,
-      },
-      {
-        header: 'Saldo Awal',
-        accessorKey: 'saldo_awal',
-        id: 'saldo_awal',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div className='text-right'>
-            {formatCurrency(row.original.saldo_awal)}
-          </div>
-        ),
-      },
-      {
-        header: 'Penjualan Ayam',
-        columns: [
-          {
-            header: 'Ekor',
-            accessorKey: 'penjualan_ayam.ekor',
-            id: 'penjualan_ayam_ekor',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatNumber(row.original.penjualan_ayam.ekor)}
-              </div>
-            ),
-          },
-          {
-            header: 'Kg',
-            accessorKey: 'penjualan_ayam.kg',
-            id: 'penjualan_ayam_kg',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatNumber(row.original.penjualan_ayam.kg)}
-              </div>
-            ),
-          },
-          {
-            header: 'Nominal',
-            accessorKey: 'penjualan_ayam.nominal',
-            id: 'penjualan_ayam_nominal',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatCurrency(row.original.penjualan_ayam.nominal)}
-              </div>
-            ),
-          },
-        ],
-      },
-      {
-        header: 'Penjualan Telur',
-        columns: [
-          {
-            header: 'Butir',
-            accessorKey: 'penjualan_telur.butir',
-            id: 'penjualan_telur_butir',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatNumber(row.original.penjualan_telur.butir)}
-              </div>
-            ),
-          },
-          {
-            header: 'Kg',
-            accessorKey: 'penjualan_telur.kg',
-            id: 'penjualan_telur_kg',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatNumber(row.original.penjualan_telur.kg)}
-              </div>
-            ),
-          },
-          {
-            header: 'Nominal',
-            accessorKey: 'penjualan_telur.nominal',
-            id: 'penjualan_telur_nominal',
-            enableSorting: true,
-            cell: ({ row }) => (
-              <div className='text-right'>
-                {formatCurrency(row.original.penjualan_telur.nominal)}
-              </div>
-            ),
-          },
-        ],
-      },
-      {
-        header: 'Penjualan Trading',
-        accessorKey: 'penjualan_trading.nominal',
-        id: 'penjualan_trading',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div className='text-right'>
-            {formatCurrency(row.original.penjualan_trading.nominal)}
-          </div>
-        ),
-      },
-      {
-        header: 'Pembayaran',
-        accessorKey: 'pembayaran',
-        id: 'pembayaran',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div className='text-right'>
-            {formatCurrency(row.original.pembayaran)}
-          </div>
-        ),
-      },
-      {
-        header: 'Aging',
-        accessorKey: 'aging',
-        id: 'aging',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div className='text-center'>
-            {formatNumber(row.original.aging)} hari
-          </div>
-        ),
-      },
-      {
-        header: 'Aging Rata-Rata',
-        accessorKey: 'aging_rata_rata',
-        id: 'aging_rata_rata',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div className='text-center'>
-            {formatNumber(row.original.aging_rata_rata)} hari
-          </div>
-        ),
-      },
-      {
-        header: 'Saldo Akhir',
-        accessorKey: 'saldo_akhir',
-        id: 'saldo_akhir',
-        enableSorting: true,
-        cell: ({ row }) => (
-          <div
-            className={`text-right font-semibold ${row.original.saldo_akhir < 0 ? 'text-error' : ''}`}
-          >
-            {formatCurrency(row.original.saldo_akhir)}
-          </div>
-        ),
-      },
-    ],
-    [tableFilterState.page, tableFilterState.pageSize]
-  );
-
-  return (
-    <>
-      <div className='w-full p-0 sm:p-3 flex flex-col gap-3'>
-        {isLoading && (
-          <div className='w-full flex flex-row justify-center items-center p-4'>
-            <span className='loading loading-spinner loading-xl' />
-          </div>
-        )}
-
-        {!isLoading && balanceMonitorings.length === 0 && (
-          <CustomerSupplierSkeleton
-            columns={columns as unknown as ColumnDef<CustomerPaymentRow>[]}
-            icon={
-              <Icon
-                icon='heroicons:chart-bar'
-                className='text-white'
-                width={20}
-                height={20}
-              />
-            }
-            title='Data Not Yet Available'
-            subtitle='Please change your filters to get the data.'
-          />
-        )}
-
-        {!isLoading && balanceMonitorings.length > 0 && (
-          <>
-            <div className='w-full overflow-x-auto'>
-              <Table
-                data={balanceMonitorings}
-                columns={columns}
-                pageSize={tableFilterState.pageSize || 10}
-                page={tableFilterState.page || 1}
-                totalItems={meta?.total_results || 0}
-                onPageChange={setPage}
-                onPageSizeChange={setPageSize}
-                // sorting={sorting}
-                // setSorting={handleSortingChange}
-                // manualSorting
-                className={{
-                  containerClassName: 'w-full mb-0!',
-                  tableWrapperClassName: 'overflow-x-auto',
-                  tableClassName: 'w-full table-auto text-sm',
-                  headerRowClassName: 'border-b border-b-gray-200 bg-gray-50',
-                  headerColumnClassName:
-                    'px-4 py-3 text-xs font-semibold text-gray-700 text-left border border-gray-200 text-nowrap',
-                  bodyRowClassName:
-                    'hover:bg-gray-50 transition-colors border-b border-l border-r border-b-gray-200 border-l-gray-200 border-r-gray-200',
-                  bodyColumnClassName:
-                    'px-4 py-3 text-xs text-gray-900 whitespace-nowrap',
-                }}
-              />
-            </div>
-          </>
-        )}
-      </div>
-
-      {/* Filter Modal */}
-      <Modal
-        ref={filterModal.ref}
-        className={{
-          modal: 'p-0',
-          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
-        }}
-      >
-        {/* Modal Header */}
-        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
-          <div className='flex items-center gap-2 text-primary'>
-            <Icon icon='heroicons:funnel' width={20} height={20} />
-            <h3 className='font-medium text-sm'>Filter Data</h3>
-          </div>
-          <Button
-            variant='link'
-            onClick={filterModal.closeModal}
-            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
-          >
-            <Icon icon='heroicons:x-mark' width={20} height={20} />
-          </Button>
-        </div>
-
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
-          <div className='p-4 flex flex-col gap-3'>
-            <div>
-              <label className='block text-xs font-semibold text-base-content py-2'>
-                Tanggal
-              </label>
-              <div className='flex flex-row gap-1.5 items-center justify-between'>
-                <DateInput
-                  name='start_date'
-                  value={formik.values.start_date || ''}
-                  onChange={handleStartDateChange}
-                  className={{ wrapper: 'w-full' }}
-                  isNestedModal
-                />
-                <hr className='w-full max-w-3 h-px border-base-content/10' />
-                <DateInput
-                  name='end_date'
-                  value={formik.values.end_date || ''}
-                  onChange={handleEndDateChange}
-                  className={{ wrapper: 'w-full' }}
-                  isNestedModal
-                  isError={hasDateError}
-                />
-              </div>
-            </div>
-
-            <SelectInputCheckbox
-              label='Customer'
-              placeholder='Pilih Customer'
-              options={customerOptions}
-              value={formik.values.customers}
-              onChange={(val) =>
-                formik.setFieldValue('customers', Array.isArray(val) ? val : [])
-              }
-              onInputChange={setCustomerInput}
-              isLoading={isLoadingCustomers}
-              isClearable
-              onMenuScrollToBottom={loadMoreCustomers}
-              className={{ wrapper: 'w-full' }}
-            />
-
-            <SelectInputCheckbox
-              label='Sales'
-              placeholder='Pilih Sales'
-              options={salesOptions}
-              value={formik.values.salesPersons}
-              onChange={(val) =>
-                formik.setFieldValue(
-                  'salesPersons',
-                  Array.isArray(val) ? val : []
-                )
-              }
-              onInputChange={setSalesInput}
-              isLoading={isLoadingSales}
-              isClearable
-              onMenuScrollToBottom={loadMoreSales}
-              className={{ wrapper: 'w-full' }}
-            />
-
-            <SelectInputRadio
-              label='Filter Berdasarkan'
-              placeholder='Pilih Filter Berdasarkan'
-              options={filterByOptions}
-              value={formik.values.filterBy ?? null}
-              onChange={(val) =>
-                formik.setFieldValue(
-                  'filterBy',
-                  !Array.isArray(val) ? (val ?? undefined) : undefined
-                )
-              }
-              isClearable
-              className={{ wrapper: 'w-full' }}
-            />
-          </div>
-
-          {/* Modal Footer */}
-          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
-            <Button
-              type='reset'
-              variant='soft'
-              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
-            >
-              Reset Filter
-            </Button>
-            <Button
-              type='submit'
-              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
-              disabled={hasDateError}
-            >
-              Apply Filter
-            </Button>
-          </div>
-        </form>
-      </Modal>
-    </>
-  );
-};
-
-export default BalanceMonitoringTab;
@@ -1,17 +1,14 @@
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useMemo, useCallback, useEffect, useRef } from 'react';
 import useSWR from 'swr';
 import { Icon } from '@iconify/react';
-import { AxiosError } from 'axios';
 import Card from '@/components/Card';
 import StatusBadge from '@/components/helper/StatusBadge';
-import { useSelect, OptionType } from '@/components/input/SelectInput';
+import { useSelect } from '@/components/input/SelectInput';
 import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
 import DateInput from '@/components/input/DateInput';
 import { CustomerApi } from '@/services/api/master-data';
 import { FinanceApi } from '@/services/api/report/finance-report';
-import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
-import { BaseApiResponse } from '@/types/api/api-general';
 import Table from '@/components/Table';
 import { ColumnDef } from '@tanstack/react-table';
 import {
@@ -30,70 +27,56 @@ import Dropdown from '@/components/Dropdown';
 import Modal, { useModal } from '@/components/Modal';
 import toast from 'react-hot-toast';
 import { useFormik } from 'formik';
+import {
+  CustomerPaymentFilterSchema,
+  CustomerPaymentFilterType,
+} from '@/components/pages/report/finance/filter/CustomerPaymentFilter';
+import { generateCustomerPaymentExcel } from '@/components/pages/report/finance/export/CustomerPaymentExportXLSX';
 import { generateCustomerPaymentPDF } from '@/components/pages/report/finance/export/CustomerPaymentExportPDF';
 import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';
 import CustomerSupplierSkeleton from '@/components/pages/report/finance/skeleton/CustomerSupplierSkeleton';
+import { OptionType } from '@/components/table/TableRowSizeSelector';
 import { Color } from '@/types/theme';
 import ButtonFilter from '@/components/helper/ButtonFilter';
 import Pagination from '@/components/Pagination';
-import { useTableFilter } from '@/services/hooks/useTableFilter';

 interface CustomerPaymentTabProps {
  tabId: string;
 }

-const dataTypeOptions: OptionType<string>[] = [
-  { value: 'trans_date', label: 'Tanggal Jual/Bayar' },
-  { value: 'realization_date', label: 'Tanggal Realisasi' },
-];
+interface FilterParams {
+  customer_ids?: string;
+  start_date?: string;
+  end_date?: string;
+  filter_by?: string;
+}

 const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
  // ===== STATE MANAGEMENT =====
  const [isPdfExportLoading, setIsPdfExportLoading] = useState(false);
  const [isExcelExportLoading, setIsExcelExportLoading] = useState(false);
-  const [isExcelGeneralExportLoading, setIsExcelGeneralExportLoading] =
-    useState(false);
-  const isAnyExportLoading =
-    isPdfExportLoading || isExcelExportLoading || isExcelGeneralExportLoading;
+  const isAnyExportLoading = isPdfExportLoading || isExcelExportLoading;

+  // ===== PAGINATION STATE =====
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+
+  // ===== SUBMISSION STATE =====
+  const [filterParams, setFilterParams] = useState<FilterParams>({});
  const [dateErrorShown, setDateErrorShown] = useState(false);
  const [hasDateError, setHasDateError] = useState(false);

+  const handleFilterModalOpenRef = useRef(() => {});
+
  const filterModal = useModal();

-  const setTabActions = useTabActionsStore((state) => state.setTabActions);
-  const clearTabActions = useTabActionsStore((state) => state.clearTabActions);
-
-  const {
-    state: tableFilterState,
-    updateFilter,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterQueryString,
-    reset: resetFilter,
-  } = useTableFilter<{
-    start_date: string;
-    end_date: string;
-    customers: OptionType<number>[];
-    filterBy?: OptionType<string>;
-  }>({
-    initial: {
-      start_date: '',
-      end_date: '',
-      customers: [],
-      filterBy: undefined,
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-      start_date: 'start_date',
-      end_date: 'end_date',
-      customers: 'customer_ids',
-      filterBy: 'filter_by',
-    },
-    persist: true,
-    storeName: 'customer-payment-report-table',
-  });
+  const dataTypeOptions = useMemo(
+    () => [
+      { value: 'trans_date', label: 'Tanggal Jual/Bayar' },
+      { value: 'realization_date', label: 'Tanggal Realisasi' },
+    ],
+    []
+  );

  const {
    options: customerOptions,
@@ -103,188 +86,236 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
  } = useSelect(CustomerApi.basePath, 'id', 'name', 'search');

  // ===== FORMIK SETUP =====
-  const formik = useFormik({
+  const formik = useFormik<CustomerPaymentFilterType>({
    initialValues: {
-      start_date: tableFilterState.start_date,
-      end_date: tableFilterState.end_date,
-      customers: tableFilterState.customers,
-      filterBy: tableFilterState.filterBy,
+      start_date: null,
+      end_date: null,
+      customer_ids: null,
+      filter_by: null,
    },
-    onSubmit: (values) => {
-      updateFilter('start_date', values.start_date, true);
-      updateFilter('end_date', values.end_date, true);
-      updateFilter('customers', values.customers, true);
-      updateFilter('filterBy', values.filterBy, true);
+    validationSchema: CustomerPaymentFilterSchema,
+    onSubmit: (values, { setSubmitting }) => {
+      setFilterParams({
+        start_date: values.start_date || undefined,
+        end_date: values.end_date || undefined,
+        customer_ids: values.customer_ids || undefined,
+        filter_by: values.filter_by || undefined,
+      });
+      filterModal.closeModal();
+      setCurrentPage(1);
+      setSubmitting(false);
+    },
+    onReset: () => {
+      setFilterParams({});
+      setCurrentPage(1);
+      setHasDateError(false);
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
      filterModal.closeModal();
    },
  });

-  const formikResetHandler = () => {
-    resetFilter();
-
-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
-
-    formik.resetForm({
-      values: {
-        start_date: '',
-        end_date: '',
-        customers: [],
-        filterBy: undefined,
-      },
+  handleFilterModalOpenRef.current = () => {
+    formik.setValues({
+      start_date: filterParams.start_date || null,
+      end_date: filterParams.end_date || null,
+      customer_ids: filterParams.customer_ids || null,
+      filter_by: filterParams.filter_by || null,
    });
-
-    filterModal.closeModal();
+    filterModal.openModal();
  };

  const getPaymentStatusBadgeColor = (notes: string): Color => {
    const normalizedValue = notes.toLowerCase();
-    if (normalizedValue === 'lunas') return 'primary';
-    if (normalizedValue.includes('belum')) return 'warning';
+
+    if (normalizedValue === 'lunas') {
+      return 'primary';
+    }
+
+    if (normalizedValue.includes('belum')) {
+      return 'warning';
+    }
+
    return 'neutral';
  };

  // ===== DATE CHANGE HANDLERS =====
-  const handleStartDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('start_date', value);
+  const handleStartDateChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value;
+      formik.setFieldValue('start_date', value || null);

-    if (value && formik.values.end_date) {
-      if (new Date(formik.values.end_date) < new Date(value)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
+      if (value && formik.values.end_date) {
+        const startDate = new Date(value);
+        const endDateObj = new Date(formik.values.end_date);
+
+        if (endDateObj < startDate) {
+          setHasDateError(true);
+          if (!dateErrorShown) {
+            toast.error('Tanggal akhir tidak boleh masa lampau', {
+              duration: Infinity,
+            });
+            setDateErrorShown(true);
+          }
+        } else {
+          setHasDateError(false);
+          if (dateErrorShown) {
+            toast.dismiss();
+            setDateErrorShown(false);
+          }
        }
      } else {
        setHasDateError(false);
-        if (dateErrorShown) {
-          toast.dismiss();
-          setDateErrorShown(false);
-        }
      }
-    } else {
-      setHasDateError(false);
-    }
-  };
-
-  const handleEndDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('end_date', value);
-
-    if (value && formik.values.start_date) {
-      if (new Date(value) < new Date(formik.values.start_date)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
-        }
-        return;
-      }
-    }
-
-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
-  };
-
-  // ===== DATA FETCHING =====
-  const { data: customerPayment, isLoading } = useSWR<
-    BaseApiResponse<CustomerPaymentReport>,
-    AxiosError<BaseApiResponse>,
-    SWRHttpKey
-  >(
-    `${FinanceApi.basePath}/customer-payment${getTableFilterQueryString()}`,
-    httpClientFetcher
+    },
+    [formik, dateErrorShown]
  );

-  const data: CustomerPaymentReport[] = isResponseSuccess(customerPayment)
-    ? (customerPayment?.data as unknown as CustomerPaymentReport[]) || []
-    : [];
+  const handleEndDateChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const value = e.target.value;
+      formik.setFieldValue('end_date', value || null);

-  const meta =
-    isResponseSuccess(customerPayment) && customerPayment.meta
-      ? customerPayment.meta
-      : null;
+      if (value && formik.values.start_date) {
+        const startDateObj = new Date(formik.values.start_date);
+        const endDate = new Date(value);
+
+        if (endDate < startDateObj) {
+          setHasDateError(true);
+          if (!dateErrorShown) {
+            toast.error('Tanggal akhir tidak boleh masa lampau', {
+              duration: Infinity,
+            });
+            setDateErrorShown(true);
+          }
+          return;
+        }
+      }
+
+      setHasDateError(false);
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
+    },
+    [formik, dateErrorShown]
+  );
+
+  // ===== FILTER HELPERS =====
+  const customerIdsValue = useMemo(() => {
+    if (!formik.values.customer_ids) return [];
+    return customerOptions.filter((opt) =>
+      formik.values.customer_ids?.split(',').includes(String(opt.value))
+    );
+  }, [formik.values.customer_ids, customerOptions]);
+
+  const filterByValue = useMemo(() => {
+    if (!formik.values.filter_by) return null;
+    return (
+      dataTypeOptions.find((opt) => opt.value === formik.values.filter_by) ||
+      null
+    );
+  }, [formik.values.filter_by, dataTypeOptions]);
+
+  // ===== DATA FETCHING =====
+  const { data: customerPayment, isLoading } = useSWR(
+    () => {
+      const params = {
+        customer_ids: filterParams.customer_ids,
+        filter_by: filterParams.filter_by as
+          | 'trans_date'
+          | 'realization_date'
+          | undefined,
+        start_date: filterParams.start_date,
+        end_date: filterParams.end_date,
+        page: currentPage,
+        limit: pageSize,
+      };
+
+      return ['customer-payment-report', params];
+    },
+    ([, params]) =>
+      FinanceApi.getCustomerPaymentReport(
+        params.customer_ids,
+        params.filter_by,
+        params.start_date,
+        params.end_date,
+        params.page,
+        params.limit
+      )
+  );
+
+  const data: CustomerPaymentReport[] = useMemo(
+    () =>
+      isResponseSuccess(customerPayment)
+        ? (customerPayment?.data as unknown as CustomerPaymentReport[]) || []
+        : [],
+    [customerPayment]
+  );
+
+  const meta = useMemo(
+    () =>
+      isResponseSuccess(customerPayment) && customerPayment.meta
+        ? customerPayment.meta
+        : null,
+    [customerPayment]
+  );

  // ===== EXPORT DATA FETCHER =====
  const customerPaymentExport = useCallback(async (): Promise<
    CustomerPaymentReport[] | null
  > => {
-    const customer_ids =
-      tableFilterState.customers.length > 0
-        ? tableFilterState.customers.map((o) => String(o.value)).join(',')
-        : undefined;
-    const filter_by = tableFilterState.filterBy?.value as
-      | 'trans_date'
-      | 'realization_date'
-      | undefined;
+    const params = {
+      customer_ids: filterParams.customer_ids,
+      filter_by: filterParams.filter_by as
+        | 'trans_date'
+        | 'realization_date'
+        | undefined,
+      start_date: filterParams.start_date,
+      end_date: filterParams.end_date,
+      limit: 100,
+      page: 1,
+    };

    const response = await FinanceApi.getCustomerPaymentReport(
-      customer_ids,
-      filter_by,
-      tableFilterState.start_date || undefined,
-      tableFilterState.end_date || undefined,
-      1,
-      100
+      params.customer_ids,
+      params.filter_by,
+      params.start_date,
+      params.end_date,
+      params.page,
+      params.limit
    );

    return isResponseSuccess(response)
      ? (response.data as unknown as CustomerPaymentReport[])
      : null;
-  }, [tableFilterState]);
+  }, [filterParams]);

  // ===== EXPORT HANDLERS =====
-  const handleExportExcelGeneral = useCallback(async () => {
-    setIsExcelGeneralExportLoading(true);
-    try {
-      const customer_ids =
-        tableFilterState.customers.length > 0
-          ? tableFilterState.customers.map((o) => String(o.value)).join(',')
-          : undefined;
-      await FinanceApi.exportCustomerPaymentToExcelGeneral(
-        customer_ids,
-        tableFilterState.filterBy?.value,
-        tableFilterState.start_date || undefined,
-        tableFilterState.end_date || undefined
-      );
-      toast.success('Excel General berhasil dibuat dan diunduh.');
-    } catch {
-      toast.error('Gagal membuat Excel General. Silakan coba lagi.');
-    } finally {
-      setIsExcelGeneralExportLoading(false);
-    }
-  }, [tableFilterState]);
-
  const handleExportExcel = useCallback(async () => {
    setIsExcelExportLoading(true);
    try {
-      const customer_ids =
-        tableFilterState.customers.length > 0
-          ? tableFilterState.customers.map((o) => String(o.value)).join(',')
-          : undefined;
-      await FinanceApi.exportCustomerPaymentToExcelCustomerPerSheet(
-        customer_ids,
-        tableFilterState.filterBy?.value,
-        tableFilterState.start_date || undefined,
-        tableFilterState.end_date || undefined
-      );
+      const allDataForExport = await customerPaymentExport();
+
+      if (
+        !allDataForExport ||
+        !Array.isArray(allDataForExport) ||
+        allDataForExport.length === 0
+      ) {
+        toast.error('Tidak ada data untuk diekspor.');
+        return;
+      }
+
+      await generateCustomerPaymentExcel({ data: allDataForExport });
      toast.success('Excel berhasil dibuat dan diunduh.');
    } catch {
      toast.error('Gagal membuat Excel. Silakan coba lagi.');
    } finally {
      setIsExcelExportLoading(false);
    }
-  }, [tableFilterState]);
+  }, [customerPaymentExport]);

  const handleExportPdf = useCallback(async () => {
    setIsPdfExportLoading(true);
@@ -300,18 +331,22 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
        return;
      }

-      const customerName =
-        tableFilterState.customers.length > 0
-          ? tableFilterState.customers.map((o) => o.label).join(', ')
-          : 'Semua Customer';
+      const customerName = filterParams.customer_ids
+        ? customerOptions
+            .filter((opt) =>
+              filterParams.customer_ids?.split(',').includes(String(opt.value))
+            )
+            .map((opt) => opt.label)
+            .join(', ') || 'Semua Customer'
+        : 'Semua Customer';

      await generateCustomerPaymentPDF({
        data: allDataForExport,
        params: {
          customer_name: customerName,
-          start_date: tableFilterState.start_date || undefined,
-          end_date: tableFilterState.end_date || undefined,
-          filter_by: tableFilterState.filterBy?.value as
+          start_date: filterParams.start_date,
+          end_date: filterParams.end_date,
+          filter_by: filterParams.filter_by as
            | 'trans_date'
            | 'realization_date'
            | undefined,
@@ -323,103 +358,106 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
    } finally {
      setIsPdfExportLoading(false);
    }
-  }, [customerPaymentExport, tableFilterState]);
+  }, [customerPaymentExport, filterParams, customerOptions]);

-  // ===== TAB ACTIONS =====
-  useEffect(() => {
-    setTabActions(
-      tabId,
-      <div className='flex flex-row gap-3'>
-        <ButtonFilter
-          values={{
-            start_date: tableFilterState.start_date,
-            end_date: tableFilterState.end_date,
-            customers: tableFilterState.customers,
-            filterBy: tableFilterState.filterBy,
-          }}
-          fieldGroups={[['start_date', 'end_date']]}
-          onClick={filterModal.openModal}
-          variant='outline'
-          className='px-3 py-2.5'
-        />
+  // ===== TAB ACTIONS COMPONENT =====
+  const TabActions = useMemo(() => {
+    return function TabActionsComponent() {
+      const setTabActions = useTabActionsStore((state) => state.setTabActions);
+      const clearTabActions = useTabActionsStore(
+        (state) => state.clearTabActions
+      );

-        <Dropdown
-          align='end'
-          direction='bottom'
-          className={{
-            content:
-              'mt-1 rounded-xl border border-base-content/5 shadow-sm overflow-hidden',
-          }}
-          trigger={
-            <Button
+      useEffect(() => {
+        setTabActions(
+          tabId,
+          <div className='flex flex-row gap-3'>
+            <ButtonFilter
+              values={filterParams}
+              fieldGroups={[['start_date', 'end_date']]}
+              onClick={() => handleFilterModalOpenRef.current()}
              variant='outline'
-              color='none'
-              isLoading={isAnyExportLoading}
-              className='px-3 py-2.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
+              className='px-3 py-2.5'
+            />
+
+            <Dropdown
+              align='end'
+              direction='bottom'
+              className={{
+                content:
+                  'mt-1 rounded-xl border border-base-content/5 shadow-sm overflow-hidden',
+              }}
+              trigger={
+                <Button
+                  variant='outline'
+                  color='none'
+                  isLoading={isAnyExportLoading}
+                  className='px-3 py-2.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
+                >
+                  <div className='flex flex-row items-center gap-1.5'>
+                    <Icon
+                      icon='heroicons:cloud-arrow-down'
+                      width={20}
+                      height={20}
+                    />
+
+                    <span>Export</span>
+
+                    <div className='w-px self-stretch bg-base-content/10' />
+
+                    <Icon
+                      icon='heroicons:chevron-down'
+                      width={14}
+                      height={14}
+                    />
+                  </div>
+                </Button>
+              }
            >
-              <div className='flex flex-row items-center gap-1.5'>
-                <Icon
-                  icon='heroicons:cloud-arrow-down'
-                  width={20}
-                  height={20}
-                />
-                <span>Export</span>
-                <div className='w-px self-stretch bg-base-content/10' />
-                <Icon icon='heroicons:chevron-down' width={14} height={14} />
-              </div>
-            </Button>
-          }
-        >
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportExcel}
-            isLoading={isExcelExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:table-cells' width={20} height={20} />
-            Export to Excel - Customer Per Sheet
-          </Button>
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportExcelGeneral}
-            isLoading={isExcelGeneralExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:table-cells' width={20} height={20} />
-            Export to Excel - General
-          </Button>
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportPdf}
-            isLoading={isPdfExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:document' width={20} height={20} />
-            Export to PDF
-          </Button>
-        </Dropdown>
-      </div>
-    );
+              <Button
+                variant='ghost'
+                color='none'
+                onClick={handleExportExcel}
+                isLoading={isExcelExportLoading}
+                className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
+              >
+                <Icon icon='heroicons:table-cells' width={20} height={20} />
+                Export to Excel
+              </Button>
+              <Button
+                variant='ghost'
+                color='none'
+                onClick={handleExportPdf}
+                isLoading={isPdfExportLoading}
+                className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
+              >
+                <Icon icon='heroicons:document' width={20} height={20} />
+                Export to PDF
+              </Button>
+            </Dropdown>
+          </div>
+        );
+      }, [setTabActions]);
+
+      useEffect(() => {
+        return () => {
+          clearTabActions(tabId);
+        };
+      }, [clearTabActions]);
+
+      return null;
+    };
  }, [
    tabId,
-    setTabActions,
-    tableFilterState,
-    filterModal.openModal,
    isAnyExportLoading,
    handleExportExcel,
-    handleExportExcelGeneral,
    handleExportPdf,
    isExcelExportLoading,
-    isExcelGeneralExportLoading,
    isPdfExportLoading,
+    filterParams,
  ]);

-  useEffect(() => {
-    return () => clearTabActions(tabId);
-  }, [tabId, clearTabActions]);
+  const TabActionsElement = useMemo(() => <TabActions />, [TabActions]);

  const getTableColumns = (
    summary: CustomerPaymentSummary
@@ -626,7 +664,11 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
        enableSorting: false,
        cell: (props) => {
          const value = props.row.original.status;
-          if (!value) return '-';
+
+          if (!value) {
+            return '-';
+          }
+
          return (
            <StatusBadge
              color={getPaymentStatusBadgeColor(value)}
@@ -665,6 +707,7 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {

  return (
    <>
+      {TabActionsElement}
      <div className='w-full p-0 sm:p-3 flex flex-col gap-3'>
        {isLoading && (
          <div className='w-full flex flex-row justify-center items-center p-4'>
@@ -693,16 +736,16 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
            <Pagination
              totalItems={meta.total_results || 0}
              itemsPerPage={meta.limit || 0}
-              currentPage={tableFilterState.page}
-              onPrevPage={() => setPage(Math.max(1, tableFilterState.page - 1))}
+              currentPage={meta.page || 0}
+              onPrevPage={() =>
+                setCurrentPage((curr) => (curr > 1 ? curr - 1 : curr))
+              }
              onNextPage={() =>
-                setPage(
-                  meta.total_pages && tableFilterState.page < meta.total_pages
-                    ? tableFilterState.page + 1
-                    : tableFilterState.page
+                setCurrentPage((curr) =>
+                  meta.total_pages && curr < meta.total_pages ? curr + 1 : curr
                )
              }
-              onPageChange={setPage}
+              onPageChange={(pageNumber) => setCurrentPage(pageNumber)}
              rowOptions={[10, 20, 50, 100]}
              onRowChange={setPageSize}
            />
@@ -809,16 +852,16 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
            <Pagination
              totalItems={meta.total_results || 0}
              itemsPerPage={meta.limit || 0}
-              currentPage={tableFilterState.page}
-              onPrevPage={() => setPage(Math.max(1, tableFilterState.page - 1))}
+              currentPage={meta.page || 0}
+              onPrevPage={() =>
+                setCurrentPage((curr) => (curr > 1 ? curr - 1 : curr))
+              }
              onNextPage={() =>
-                setPage(
-                  meta.total_pages && tableFilterState.page < meta.total_pages
-                    ? tableFilterState.page + 1
-                    : tableFilterState.page
+                setCurrentPage((curr) =>
+                  meta.total_pages && curr < meta.total_pages ? curr + 1 : curr
                )
              }
-              onPageChange={setPage}
+              onPageChange={(pageNumber) => setCurrentPage(pageNumber)}
              rowOptions={[10, 20, 50, 100]}
              onRowChange={setPageSize}
            />
@@ -848,7 +891,7 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
            <Icon icon='heroicons:x-mark' width={20} height={20} />
          </Button>
        </div>
-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
          <div className='p-4 flex flex-col gap-1.5'>
            <div>
              <label className='block text-xs font-semibold text-base-content py-2'>
@@ -858,18 +901,29 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
                <DateInput
                  name='start_date'
                  value={formik.values.start_date || ''}
+                  errorMessage={formik.errors.start_date}
                  onChange={handleStartDateChange}
                  className={{ wrapper: 'w-full' }}
                  isNestedModal
+                  isError={
+                    formik.touched.start_date &&
+                    Boolean(formik.errors.start_date)
+                  }
                />
                <hr className='w-full max-w-3 h-px border-base-content/10' />
+
                <DateInput
                  name='end_date'
                  value={formik.values.end_date || ''}
+                  errorMessage={formik.errors.end_date}
                  onChange={handleEndDateChange}
                  className={{ wrapper: 'w-full' }}
                  isNestedModal
-                  isError={hasDateError}
+                  isError={
+                    (formik.touched.end_date &&
+                      Boolean(formik.errors.end_date)) ||
+                    hasDateError
+                  }
                />
              </div>
            </div>
@@ -878,10 +932,15 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
              label='Customer'
              placeholder='Pilih Customer'
              options={customerOptions}
-              value={formik.values.customers}
-              onChange={(val) =>
-                formik.setFieldValue('customers', Array.isArray(val) ? val : [])
-              }
+              value={customerIdsValue}
+              onChange={(val) => {
+                formik.setFieldValue(
+                  'customer_ids',
+                  Array.isArray(val) && val.length > 0
+                    ? val.map((v: OptionType) => String(v.value)).join(',')
+                    : null
+                );
+              }}
              onInputChange={setCustomerInputValue}
              isLoading={isLoadingCustomers}
              isClearable
@@ -893,15 +952,14 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
              label='Filter Berdasarkan'
              placeholder='Pilih Filter Berdasarkan'
              options={dataTypeOptions}
-              value={formik.values.filterBy ?? null}
-              onChange={(val) =>
-                formik.setFieldValue(
-                  'filterBy',
-                  !Array.isArray(val) ? (val ?? undefined) : undefined
-                )
-              }
+              value={filterByValue}
+              onChange={(val) => {
+                if (!Array.isArray(val)) {
+                  formik.setFieldValue('filter_by', val?.value || null);
+                }
+              }}
              className={{ wrapper: 'w-full' }}
-              isClearable
+              isClearable={true}
            />
          </div>

@@ -917,7 +975,7 @@ const CustomerPaymentTab = ({ tabId }: CustomerPaymentTabProps) => {
            <Button
              type='submit'
              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
-              disabled={hasDateError}
+              disabled={hasDateError || !formik.isValid || formik.isSubmitting}
            >
              Apply Filter
            </Button>
@@ -9,15 +9,24 @@ import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
 import { isResponseSuccess } from '@/lib/api-helper';
 import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
 import { SupplierApi } from '@/services/api/master-data';
-import { DebtRow, DebtSupplier } from '@/types/api/report/debt-supplier';
+import {
+  DebtRow,
+  DebtSupplier,
+  DebtSupplierFilter,
+} from '@/types/api/report/debt-supplier';
+import { generateDebtSupplierExcel } from '@/components/pages/report/finance/export/DebtSupplierExportXLSX';
 import { generateDebtSupplierPDF } from '@/components/pages/report/finance/export/DebtSupllierExportPDF';
 import { Icon } from '@iconify/react';
 import { ColumnDef } from '@tanstack/react-table';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import toast from 'react-hot-toast';
 import useSWR from 'swr';
 import { DebtSupplierApi } from '@/services/api/report/debt-supplier';
 import { useFormik } from 'formik';
+import {
+  DebtSupplierFilterSchema,
+  DebtSupplierFilterType,
+} from '@/components/pages/report/finance/filter/DebtSupplierFilter';
 import ButtonFilter from '@/components/helper/ButtonFilter';
 import { Color } from '@/types/theme';
 import { Supplier } from '@/types/api/master-data/supplier';
@@ -26,10 +35,6 @@ import SelectInputRadio from '@/components/input/SelectInputRadio';
 import { useTabActionsStore } from '@/stores/tab-actions/tab-actions.store';
 import StatusBadge from '@/components/helper/StatusBadge';
 import DebtSupplierSkeleton from '@/components/pages/report/finance/skeleton/DebtSupplierSkeleton';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { httpClientFetcher, SWRHttpKey } from '@/services/http/client';
-import { BaseApiResponse } from '@/types/api/api-general';
-import { AxiosError } from 'axios';

 const dueStatus: Record<string, Color> = {
  'Sudah Jatuh Tempo': 'error',
@@ -47,6 +52,7 @@ const getPillBadge = (
  statusText: string,
  type: 'due' | 'payment' = 'payment'
 ) => {
+  // Get color based on type
  const color =
    type === 'due'
      ? dueStatus[statusText] || 'neutral'
@@ -63,11 +69,6 @@ const getPillBadge = (
  );
 };

-const dataTypeOptions: OptionType<string>[] = [
-  { value: 'received_date', label: 'Tanggal Terima' },
-  { value: 'po_date', label: 'Tanggal PO' },
-];
-
 interface DebtSupplierTabProps {
  tabId: string;
 }
@@ -76,50 +77,28 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
  // ===== STATE MANAGEMENT =====
  const [isPdfExportLoading, setIsPdfExportLoading] = useState(false);
  const [isExcelExportLoading, setIsExcelExportLoading] = useState(false);
-  const [isExcelGeneralExportLoading, setIsExcelGeneralExportLoading] =
-    useState(false);
-  const isAnyExportLoading =
-    isPdfExportLoading || isExcelExportLoading || isExcelGeneralExportLoading;
+  const isAnyExportLoading = isPdfExportLoading || isExcelExportLoading;

+  // ===== PAGINATION STATE =====
+  const [currentPage, setCurrentPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+
+  // ===== SUBMISSION STATE =====
+  const [filterParams, setFilterParams] = useState<DebtSupplierFilter>({
+    start_date: undefined,
+    end_date: undefined,
+    supplier_ids: undefined,
+    filter_by: undefined,
+  });
+
+  // ===== DATE ERROR STATE =====
  const [dateErrorShown, setDateErrorShown] = useState(false);
  const [hasDateError, setHasDateError] = useState(false);

+  const handleFilterModalOpenRef = useRef(() => {});
+
  const filterModal = useModal();

-  const setTabActions = useTabActionsStore((state) => state.setTabActions);
-  const clearTabActions = useTabActionsStore((state) => state.clearTabActions);
-
-  const {
-    state: tableFilterState,
-    updateFilter,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterQueryString,
-    reset: resetFilter,
-  } = useTableFilter<{
-    start_date: string;
-    end_date: string;
-    suppliers: OptionType<number>[];
-    filterBy?: OptionType<string>;
-  }>({
-    initial: {
-      start_date: '',
-      end_date: '',
-      suppliers: [],
-      filterBy: undefined,
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-      start_date: 'start_date',
-      end_date: 'end_date',
-      suppliers: 'supplier_ids',
-      filterBy: 'filter_by',
-    },
-    persist: true,
-    storeName: 'debt-supplier-report-table',
-  });
-
  const {
    setInputValue: setSupplierInputValue,
    options: supplierOptions,
@@ -127,180 +106,168 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
    loadMore: loadMoreSuppliers,
  } = useSelect<Supplier>(SupplierApi.basePath, 'id', 'name');

+  const dataTypeOptions = useMemo(
+    () => [
+      { value: 'received_date', label: 'Tanggal Terima' },
+      { value: 'po_date', label: 'Tanggal PO' },
+    ],
+    []
+  );
+
  // ===== FORMIK SETUP =====
-  const formik = useFormik({
+  const formik = useFormik<DebtSupplierFilterType>({
    initialValues: {
-      start_date: tableFilterState.start_date,
-      end_date: tableFilterState.end_date,
-      suppliers: tableFilterState.suppliers,
-      filterBy: tableFilterState.filterBy,
+      startDate: null,
+      endDate: null,
+      supplierIds: null,
+      filterBy: null,
    },
+    validationSchema: DebtSupplierFilterSchema,
    onSubmit: (values) => {
-      updateFilter('start_date', values.start_date, true);
-      updateFilter('end_date', values.end_date, true);
-      updateFilter('suppliers', values.suppliers, true);
-      updateFilter('filterBy', values.filterBy, true);
+      setFilterParams({
+        start_date: values.startDate?.toString() || undefined,
+        end_date: values.endDate?.toString() || undefined,
+        supplier_ids:
+          values.supplierIds?.map((v) => String(v.value)).join(',') ||
+          undefined,
+        filter_by: values.filterBy?.value?.toString() || undefined,
+      });
+      filterModal.closeModal();
+      setCurrentPage(1);
+    },
+    onReset: () => {
+      setFilterParams({
+        start_date: undefined,
+        end_date: undefined,
+        supplier_ids: undefined,
+        filter_by: undefined,
+      });
+      setCurrentPage(1);
      filterModal.closeModal();
    },
  });

-  const formikResetHandler = () => {
-    resetFilter();
+  handleFilterModalOpenRef.current = () => {
+    const restoredFilterBy =
+      dataTypeOptions.find((opt) => opt.value === filterParams.filter_by) ||
+      null;

-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
+    const supplierIdList = filterParams.supplier_ids
+      ? filterParams.supplier_ids.split(',')
+      : [];
+    const restoredSupplierIds = supplierOptions.filter((opt) =>
+      supplierIdList.includes(String(opt.value))
+    );

-    formik.resetForm({
-      values: {
-        start_date: '',
-        end_date: '',
-        suppliers: [],
-        filterBy: undefined,
-      },
+    formik.setValues({
+      startDate: filterParams.start_date || null,
+      endDate: filterParams.end_date || null,
+      supplierIds: restoredSupplierIds.length > 0 ? restoredSupplierIds : null,
+      filterBy: restoredFilterBy,
    });
-
-    filterModal.closeModal();
-  };
-
-  // ===== DATE CHANGE HANDLERS =====
-  const handleStartDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('start_date', value);
-
-    if (value && formik.values.end_date) {
-      if (new Date(formik.values.end_date) < new Date(value)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
-        }
-      } else {
-        setHasDateError(false);
-        if (dateErrorShown) {
-          toast.dismiss();
-          setDateErrorShown(false);
-        }
-      }
-    } else {
-      setHasDateError(false);
-    }
-  };
-
-  const handleEndDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = e.target.value;
-    formik.setFieldValue('end_date', value);
-
-    if (value && formik.values.start_date) {
-      if (new Date(value) < new Date(formik.values.start_date)) {
-        setHasDateError(true);
-        if (!dateErrorShown) {
-          toast.error('Tanggal akhir tidak boleh masa lampau', {
-            duration: Infinity,
-          });
-          setDateErrorShown(true);
-        }
-        return;
-      }
-    }
-
-    setHasDateError(false);
-    if (dateErrorShown) {
-      toast.dismiss();
-      setDateErrorShown(false);
-    }
+    filterModal.openModal();
  };

  // ===== DATA FETCHING =====
-  const { data: debtSupplierResponse, isLoading } = useSWR<
-    BaseApiResponse<DebtSupplier[]>,
-    AxiosError<BaseApiResponse>,
-    SWRHttpKey
-  >(
-    `${DebtSupplierApi.basePath}/debt-supplier${getTableFilterQueryString()}`,
-    httpClientFetcher
+  const { data: debtSupplier, isLoading } = useSWR(
+    () => {
+      const params = {
+        supplier_ids: filterParams.supplier_ids,
+        filter_by: filterParams.filter_by,
+        start_date: filterParams.start_date,
+        end_date: filterParams.end_date,
+        page: currentPage,
+        limit: pageSize,
+      };
+
+      return ['debt-supplier-report', params];
+    },
+    ([, params]) =>
+      DebtSupplierApi.getDebtSupplierReport(
+        params.supplier_ids,
+        params.filter_by,
+        params.start_date,
+        params.end_date,
+        params.page,
+        params.limit
+      )
  );

-  const data: DebtSupplier[] = isResponseSuccess(debtSupplierResponse)
-    ? ((debtSupplierResponse?.data as unknown as DebtSupplier[]) ?? [])
-    : [];
+  const data: DebtSupplier[] = useMemo(
+    () =>
+      isResponseSuccess(debtSupplier)
+        ? (debtSupplier?.data as unknown as DebtSupplier[]) || []
+        : [],
+    [debtSupplier]
+  );

-  const meta =
-    isResponseSuccess(debtSupplierResponse) && debtSupplierResponse.meta
-      ? debtSupplierResponse.meta
-      : null;
+  const meta = useMemo(
+    () =>
+      isResponseSuccess(debtSupplier) && debtSupplier.meta
+        ? debtSupplier.meta
+        : null,
+    [debtSupplier]
+  );

  // ===== EXPORT DATA FETCHER =====
  const debtSupplierExport = useCallback(async (): Promise<
    DebtSupplier[] | null
  > => {
-    const supplier_ids =
-      tableFilterState.suppliers.length > 0
-        ? tableFilterState.suppliers.map((o) => String(o.value)).join(',')
-        : undefined;
+    const params = {
+      supplier_ids:
+        formik.values.supplierIds && formik.values.supplierIds.length > 0
+          ? formik.values.supplierIds.map((v) => String(v.value)).join(',')
+          : undefined,
+      filter_by: formik.values.filterBy?.value?.toString() || undefined,
+      start_date: formik.values.startDate || undefined,
+      end_date: formik.values.endDate || undefined,
+      date_type: formik.values.filterBy
+        ? formik.values.filterBy.value
+        : undefined,
+      limit: 100,
+      page: 1,
+    };

    const response = await DebtSupplierApi.getDebtSupplierReport(
-      supplier_ids,
-      tableFilterState.filterBy?.value,
-      tableFilterState.start_date || undefined,
-      tableFilterState.end_date || undefined,
-      1,
-      100
+      params.supplier_ids,
+      params.filter_by,
+      params.start_date,
+      params.end_date
    );

    return isResponseSuccess(response)
      ? (response.data as unknown as DebtSupplier[])
      : null;
-  }, [tableFilterState]);
+  }, [
+    formik.values.supplierIds,
+    formik.values.startDate,
+    formik.values.endDate,
+    formik.values.filterBy,
+  ]);

  // ===== EXPORT HANDLERS =====
  const handleExportExcel = useCallback(async () => {
    setIsExcelExportLoading(true);
    try {
-      const supplier_ids =
-        tableFilterState.suppliers.length > 0
-          ? tableFilterState.suppliers.map((o) => String(o.value)).join(',')
-          : undefined;
-      await DebtSupplierApi.exportToExcelSupplierPerSheet(
-        supplier_ids,
-        tableFilterState.filterBy?.value,
-        tableFilterState.start_date || undefined,
-        tableFilterState.end_date || undefined
-      );
+      const allDataForExport = await debtSupplierExport();
+
+      if (
+        !allDataForExport ||
+        !Array.isArray(allDataForExport) ||
+        allDataForExport.length === 0
+      ) {
+        toast.error('Tidak ada data untuk diekspor.');
+        return;
+      }
+
+      generateDebtSupplierExcel({ data: allDataForExport });
      toast.success('Excel berhasil dibuat dan diunduh.');
    } catch {
      toast.error('Gagal membuat Excel. Silakan coba lagi.');
    } finally {
      setIsExcelExportLoading(false);
    }
-  }, [tableFilterState]);
-
-  const handleExportExcelGeneral = useCallback(async () => {
-    setIsExcelGeneralExportLoading(true);
-    try {
-      const supplier_ids =
-        tableFilterState.suppliers.length > 0
-          ? tableFilterState.suppliers.map((o) => String(o.value)).join(',')
-          : undefined;
-
-      await DebtSupplierApi.exportToExcelGeneral(
-        supplier_ids,
-        tableFilterState.filterBy?.value,
-        tableFilterState.start_date || undefined,
-        tableFilterState.end_date || undefined
-      );
-
-      toast.success('Excel General berhasil dibuat dan diunduh.');
-    } catch {
-      toast.error('Gagal membuat Excel General. Silakan coba lagi.');
-    } finally {
-      setIsExcelGeneralExportLoading(false);
-    }
-  }, [tableFilterState]);
+  }, [debtSupplierExport]);

  const handleExportPdf = useCallback(async () => {
    setIsPdfExportLoading(true);
@@ -316,18 +283,15 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
        return;
      }

-      const supplierName =
-        tableFilterState.suppliers.length > 0
-          ? tableFilterState.suppliers.map((o) => o.label).join(', ')
-          : undefined;
-
      await generateDebtSupplierPDF({
        data: allDataForExport,
        params: {
-          supplier_name: supplierName,
-          filter_by: tableFilterState.filterBy?.label,
-          start_date: tableFilterState.start_date || undefined,
-          end_date: tableFilterState.end_date || undefined,
+          supplier_name: formik.values.supplierIds
+            ?.map((v) => v.label)
+            .join(', '),
+          filter_by: formik.values.filterBy?.label,
+          start_date: formik.values.startDate || undefined,
+          end_date: formik.values.endDate || undefined,
        },
      });
      toast.success('PDF berhasil dibuat dan diunduh.');
@@ -336,103 +300,129 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
    } finally {
      setIsPdfExportLoading(false);
    }
-  }, [debtSupplierExport, tableFilterState]);
+  }, [
+    debtSupplierExport,
+    formik.values.supplierIds,
+    formik.values.filterBy,
+    formik.values.startDate,
+    formik.values.endDate,
+  ]);

-  // ===== TAB ACTIONS =====
-  useEffect(() => {
-    setTabActions(
-      tabId,
-      <div className='flex flex-row gap-3'>
-        <ButtonFilter
-          values={{
-            start_date: tableFilterState.start_date,
-            end_date: tableFilterState.end_date,
-            suppliers: tableFilterState.suppliers,
-            filterBy: tableFilterState.filterBy,
-          }}
-          fieldGroups={[['start_date', 'end_date']]}
-          onClick={filterModal.openModal}
-          variant='outline'
-          className='px-3 py-2.5'
-        />
+  // ===== TAB ACTIONS COMPONENT =====
+  const TabActions = useMemo(() => {
+    return function TabActionsComponent() {
+      const setTabActions = useTabActionsStore((state) => state.setTabActions);
+      const clearTabActions = useTabActionsStore(
+        (state) => state.clearTabActions
+      );

-        <Dropdown
-          align='end'
-          direction='bottom'
-          className={{
-            content:
-              'mt-1 rounded-xl border border-base-content/5 shadow-sm overflow-hidden',
-          }}
-          trigger={
-            <Button
+      useEffect(() => {
+        setTabActions(
+          tabId,
+          <div className='flex flex-row gap-3'>
+            <ButtonFilter
+              values={filterParams}
+              fieldGroups={[['start_date', 'end_date']]}
+              onClick={() => handleFilterModalOpenRef.current()}
              variant='outline'
-              color='none'
-              isLoading={isAnyExportLoading}
-              className='px-3 py-2.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
+              className='px-3 py-2.5'
+            />
+
+            <Dropdown
+              align='end'
+              direction='bottom'
+              className={{
+                content:
+                  'mt-1 rounded-xl border border-base-content/5 shadow-sm overflow-hidden',
+              }}
+              trigger={
+                <Button
+                  variant='outline'
+                  color='none'
+                  isLoading={isAnyExportLoading}
+                  className='px-3 py-2.5 text-sm text-base-content/50 border border-base-content/10 rounded-xl shadow-button-soft'
+                >
+                  <div className='flex flex-row items-center gap-1.5'>
+                    <Icon
+                      icon='heroicons:cloud-arrow-down'
+                      width={20}
+                      height={20}
+                    />
+
+                    <span>Export</span>
+
+                    <div className='w-px self-stretch bg-base-content/10' />
+
+                    <Icon
+                      icon='heroicons:chevron-down'
+                      width={14}
+                      height={14}
+                    />
+                  </div>
+                </Button>
+              }
            >
-              <div className='flex flex-row items-center gap-1.5'>
-                <Icon
-                  icon='heroicons:cloud-arrow-down'
-                  width={20}
-                  height={20}
-                />
-                <span>Export</span>
-                <div className='w-px self-stretch bg-base-content/10' />
-                <Icon icon='heroicons:chevron-down' width={14} height={14} />
-              </div>
-            </Button>
-          }
-        >
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportExcel}
-            isLoading={isExcelExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:table-cells' width={20} height={20} />
-            Export to Excel - Supplier Per Sheet
-          </Button>
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportExcelGeneral}
-            isLoading={isExcelGeneralExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:table-cells' width={20} height={20} />
-            Export to Excel - General
-          </Button>
-          <Button
-            variant='ghost'
-            color='none'
-            onClick={handleExportPdf}
-            isLoading={isPdfExportLoading}
-            className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
-          >
-            <Icon icon='heroicons:document' width={20} height={20} />
-            Export to PDF
-          </Button>
-        </Dropdown>
-      </div>
-    );
+              <Button
+                variant='ghost'
+                color='none'
+                onClick={handleExportExcel}
+                isLoading={isExcelExportLoading}
+                className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
+              >
+                <Icon icon='heroicons:table-cells' width={20} height={20} />
+                Export to Excel
+              </Button>
+              <Button
+                variant='ghost'
+                color='none'
+                onClick={handleExportPdf}
+                isLoading={isPdfExportLoading}
+                className='w-full p-3 justify-start text-sm text-base-content/50 font-semibold text-nowrap'
+              >
+                <Icon icon='heroicons:document' width={20} height={20} />
+                Export to PDF
+              </Button>
+            </Dropdown>
+          </div>
+        );
+      }, [setTabActions]);
+
+      useEffect(() => {
+        return () => {
+          clearTabActions(tabId);
+        };
+      }, [clearTabActions]);
+
+      return null;
+    };
  }, [
    tabId,
-    setTabActions,
-    tableFilterState,
-    filterModal.openModal,
+    filterParams,
    isAnyExportLoading,
    handleExportExcel,
-    handleExportExcelGeneral,
    handleExportPdf,
    isExcelExportLoading,
-    isExcelGeneralExportLoading,
    isPdfExportLoading,
  ]);

+  const TabActionsElement = useMemo(() => <TabActions />, [TabActions]);
+
  useEffect(() => {
-    return () => clearTabActions(tabId);
-  }, [tabId, clearTabActions]);
+    return () => {
+      if (dateErrorShown) {
+        toast.dismiss();
+      }
+    };
+  }, [dateErrorShown]);
+
+  useEffect(() => {
+    return () => {
+      if (dateErrorShown) {
+        toast.dismiss();
+        setDateErrorShown(false);
+      }
+    };
+  }, [filterModal.open, dateErrorShown]);

  const getTableColumns = (supplier?: DebtSupplier): ColumnDef<DebtRow>[] => [
    {
@@ -647,9 +637,9 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
      },
    },
  ];
-
  return (
    <>
+      {TabActionsElement}
      <div className='w-full p-0 sm:p-3 flex flex-col gap-3'>
        {isLoading && (
          <div className='w-full flex flex-row justify-center items-center p-4'>
@@ -678,16 +668,16 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
            <Pagination
              totalItems={meta.total_results || 0}
              itemsPerPage={meta.limit || 0}
-              currentPage={tableFilterState.page}
-              onPrevPage={() => setPage(Math.max(1, tableFilterState.page - 1))}
+              currentPage={meta.page || 0}
+              onPrevPage={() =>
+                setCurrentPage((curr) => (curr > 1 ? curr - 1 : curr))
+              }
              onNextPage={() =>
-                setPage(
-                  meta.total_pages && tableFilterState.page < meta.total_pages
-                    ? tableFilterState.page + 1
-                    : tableFilterState.page
+                setCurrentPage((curr) =>
+                  meta.total_pages && curr < meta.total_pages ? curr + 1 : curr
                )
              }
-              onPageChange={setPage}
+              onPageChange={(pageNumber) => setCurrentPage(pageNumber)}
              rowOptions={[10, 20, 50, 100]}
              onRowChange={setPageSize}
            />
@@ -787,16 +777,16 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
            <Pagination
              totalItems={meta.total_results || 0}
              itemsPerPage={meta.limit || 0}
-              currentPage={tableFilterState.page}
-              onPrevPage={() => setPage(Math.max(1, tableFilterState.page - 1))}
+              currentPage={meta.page || 0}
+              onPrevPage={() =>
+                setCurrentPage((curr) => (curr > 1 ? curr - 1 : curr))
+              }
              onNextPage={() =>
-                setPage(
-                  meta.total_pages && tableFilterState.page < meta.total_pages
-                    ? tableFilterState.page + 1
-                    : tableFilterState.page
+                setCurrentPage((curr) =>
+                  meta.total_pages && curr < meta.total_pages ? curr + 1 : curr
                )
              }
-              onPageChange={setPage}
+              onPageChange={(pageNumber) => setCurrentPage(pageNumber)}
              rowOptions={[10, 20, 50, 100]}
              onRowChange={setPageSize}
            />
@@ -812,23 +802,23 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
          modalBox: 'p-0 rounded-[0.875rem] xl:max-w-4/12 max-w-sm',
        }}
      >
-        {/* Modal Header */}
-        <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
-          <div className='flex items-center gap-2 text-primary'>
-            <Icon icon='heroicons:funnel' width={20} height={20} />
-            <h3 className='font-medium text-sm'>Filter Data</h3>
+        <form onSubmit={formik.handleSubmit} onReset={formik.handleReset}>
+          {/* Modal Header */}
+          <div className='flex items-center justify-between gap-2 border-b border-base-content/10 p-4'>
+            <div className='flex items-center gap-2 text-primary'>
+              <Icon icon='heroicons:funnel' width={20} height={20} />
+              <h3 className='font-medium text-sm'>Filter Data</h3>
+            </div>
+            <Button
+              variant='link'
+              type='button'
+              onClick={filterModal.closeModal}
+              className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
+            >
+              <Icon icon='heroicons:x-mark' width={20} height={20} />
+            </Button>
          </div>
-          <Button
-            variant='link'
-            type='button'
-            onClick={filterModal.closeModal}
-            className='text-base-content/50 hover:text-base-content transition-colors cursor-pointer'
-          >
-            <Icon icon='heroicons:x-mark' width={20} height={20} />
-          </Button>
-        </div>

-        <form onSubmit={formik.handleSubmit} onReset={formikResetHandler}>
          {/* Modal Body */}
          <div className='p-4 flex flex-col gap-1.5'>
            <div>
@@ -837,68 +827,153 @@ const DebtSupplierTab = ({ tabId }: DebtSupplierTabProps) => {
              </label>
              <div className='flex flex-row gap-1.5 items-center justify-between'>
                <DateInput
-                  name='start_date'
-                  value={formik.values.start_date || ''}
-                  onChange={handleStartDateChange}
+                  name='startDate'
+                  value={formik.values.startDate || ''}
+                  onChange={(e) => {
+                    const value = e.target.value;
+                    formik.setFieldValue('startDate', value || null);
+
+                    if (value && formik.values.endDate) {
+                      const startDate = new Date(value);
+                      const endDateObj = new Date(formik.values.endDate);
+
+                      if (endDateObj < startDate) {
+                        setHasDateError(true);
+                        if (!dateErrorShown) {
+                          toast.error('Tanggal akhir tidak boleh masa lampau', {
+                            duration: Infinity,
+                          });
+                          setDateErrorShown(true);
+                        }
+                      } else {
+                        setHasDateError(false);
+                        if (dateErrorShown) {
+                          toast.dismiss();
+                          setDateErrorShown(false);
+                        }
+                      }
+                    } else {
+                      setHasDateError(false);
+                    }
+                  }}
                  className={{ wrapper: 'w-full' }}
+                  isError={
+                    formik.touched.startDate && !!formik.errors.startDate
+                  }
+                  errorMessage={formik.errors.startDate}
                  isNestedModal
                />
-                <hr className='w-full max-w-3 h-px border-base-content/10' />
+                <hr className='w-full max-w-3 h-px border-base-content/10'></hr>
                <DateInput
-                  name='end_date'
-                  value={formik.values.end_date || ''}
-                  onChange={handleEndDateChange}
+                  name='endDate'
+                  value={formik.values.endDate || ''}
+                  onChange={(e) => {
+                    const value = e.target.value;
+                    formik.setFieldValue('endDate', value || null);
+
+                    if (value && formik.values.startDate) {
+                      const startDateObj = new Date(formik.values.startDate);
+                      const endDate = new Date(value);
+
+                      if (endDate < startDateObj) {
+                        setHasDateError(true);
+                        if (!dateErrorShown) {
+                          toast.error('Tanggal akhir tidak boleh masa lampau', {
+                            duration: Infinity,
+                          });
+                          setDateErrorShown(true);
+                        }
+                        return;
+                      }
+                    }
+
+                    setHasDateError(false);
+                    if (dateErrorShown) {
+                      toast.dismiss();
+                      setDateErrorShown(false);
+                    }
+                  }}
                  className={{ wrapper: 'w-full' }}
+                  isError={
+                    (formik.touched.endDate && !!formik.errors.endDate) ||
+                    hasDateError
+                  }
+                  errorMessage={formik.errors.endDate}
                  isNestedModal
-                  isError={hasDateError}
                />
              </div>
            </div>

-            <SelectInputCheckbox
-              label='Supplier'
-              placeholder='Pilih Supplier'
-              options={supplierOptions}
-              value={formik.values.suppliers}
-              onChange={(val) =>
-                formik.setFieldValue('suppliers', Array.isArray(val) ? val : [])
-              }
-              onInputChange={setSupplierInputValue}
-              onMenuScrollToBottom={loadMoreSuppliers}
-              isLoading={isLoadingSupplierOptions}
-              isClearable
-              className={{ wrapper: 'w-full' }}
-            />
+            <div>
+              <SelectInputCheckbox
+                label='Supplier'
+                placeholder='Pilih Supplier'
+                isMulti
+                options={supplierOptions}
+                value={
+                  (formik.values.supplierIds as
+                    | { value: number; label: string }
+                    | { value: number; label: string }[]
+                    | null
+                    | undefined) || []
+                }
+                onChange={(val) => {
+                  formik.setFieldValue(
+                    'supplierIds',
+                    Array.isArray(val) ? val : val ? [val] : null
+                  );
+                }}
+                onInputChange={setSupplierInputValue}
+                onMenuScrollToBottom={loadMoreSuppliers}
+                isLoading={isLoadingSupplierOptions}
+                isClearable
+                className={{ wrapper: 'w-full' }}
+                isError={
+                  formik.touched.supplierIds && !!formik.errors.supplierIds
+                }
+                errorMessage={formik.errors.supplierIds as string}
+              />
+            </div>

-            <SelectInputRadio
-              label='Filter Berdasarkan'
-              placeholder='Pilih Filter Berdasarkan'
-              options={dataTypeOptions}
-              value={formik.values.filterBy ?? null}
-              onChange={(val) =>
-                formik.setFieldValue(
-                  'filterBy',
-                  !Array.isArray(val) ? (val ?? undefined) : undefined
-                )
-              }
-              className={{ wrapper: 'w-full' }}
-              isClearable
-            />
+            <div>
+              <SelectInputRadio
+                label='Filter Berdasarkan'
+                placeholder='Pilih Filter Berdasarkan'
+                options={dataTypeOptions}
+                value={
+                  (formik.values.filterBy as
+                    | { value: string; label: string }
+                    | { value: string; label: string }[]
+                    | null
+                    | undefined) || null
+                }
+                onChange={(val) => {
+                  formik.setFieldValue(
+                    'filterBy',
+                    val ? (val as OptionType) : null
+                  );
+                }}
+                className={{ wrapper: 'w-full' }}
+                isClearable
+                isError={formik.touched.filterBy && !!formik.errors.filterBy}
+                errorMessage={formik.errors.filterBy as string}
+              />
+            </div>
          </div>

-          {/* Modal Footer */}
+          {/* Action Buttons */}
          <div className='flex justify-between items-center gap-4 p-4 border-t border-base-content/10 bg-gray-50'>
            <Button
-              type='reset'
              variant='soft'
+              color='none'
              className='rounded-lg text-base-content/65 bg-transparent border-none hover:bg-base-content/10 hover:text-base-content/65 transition-colors px-3 py-2'
+              type='reset'
            >
              Reset Filter
            </Button>
            <Button
-              type='submit'
              className='min-w-40 text-sm rounded-lg py-3 text-white font-semibold'
-              disabled={hasDateError}
+              type='submit'
            >
              Apply Filter
            </Button>
@@ -184,11 +184,6 @@ export function DailyChecklistContent() {
  const [emptyKandangEndDateError, setEmptyKandangEndDateError] =
    useState<string>('');

-  const [preloadedKandang, setPreloadedKandang] = useState<{
-    id: string;
-    name: string;
-  } | null>(null);
-
  const [existingDocuments, setExistingDocuments] = useState<Document[]>([]);
  const [documents, setDocuments] = useState<File[]>([]);
  const [deletedDocumentIds, setDeletedDocumentIds] = useState<number[]>([]);
@@ -233,11 +228,7 @@ export function DailyChecklistContent() {
        const rawDate = data.date || '';
        setDate(rawDate.length > 10 ? rawDate.slice(0, 10) : rawDate);
        skipKandangClearRef.current = true;
-        const loadedKandangId = String(data.kandang?.id || '');
-        setKandangId(loadedKandangId);
-        if (data.kandang?.name) {
-          setPreloadedKandang({ id: loadedKandangId, name: data.kandang.name });
-        }
+        setKandangId(String(data.kandang?.id || ''));

        const isEmptyKandang =
          !!data.empty_kandang || data.category === 'empty_kandang';
@@ -1171,17 +1162,9 @@ export function DailyChecklistContent() {
                    <SelectValue placeholder='Pilih kandang' />
                  </SelectTrigger>
                  <SelectContent onScroll={handleKandangScroll}>
-                    {preloadedKandang &&
-                      !kandangOptions.some(
-                        (k) => String(k.value) === preloadedKandang.id
-                      ) && (
-                        <SelectItem value={preloadedKandang.id}>
-                          {preloadedKandang.name}
-                        </SelectItem>
-                      )}
-                    {kandangOptions.map((kandang, kandangIdx) => (
+                    {kandangOptions.map((kandang) => (
                      <SelectItem
-                        key={`${kandang.value}-${kandangIdx}`}
+                        key={kandang.value}
                        value={String(kandang.value)}
                      >
                        {kandang.label}
@@ -1,6 +1,4 @@
 import { BaseApiService } from '@/services/api/base';
-import { httpClient } from '@/services/http/client';
-import { formatDate } from '@/lib/helper';
 import { BaseApiResponse } from '@/types/api/api-general';
 import { DebtSupplier } from '@/types/api/report/debt-supplier';

@@ -13,82 +11,6 @@ export class DebtSupplierApiService extends BaseApiService<
    super(basePath);
  }

-  async exportToExcelGeneral(
-    supplier_ids?: string,
-    filter_by?: string,
-    start_date?: string,
-    end_date?: string
-  ) {
-    const params = new URLSearchParams();
-
-    if (supplier_ids) params.set('supplier_ids', supplier_ids);
-    if (filter_by) params.set('filter_by', filter_by);
-    if (start_date) params.set('start_date', start_date);
-    if (end_date) params.set('end_date', end_date);
-    params.set('export', 'excel-all');
-    params.set('page', '1');
-    params.set('limit', '99999999999');
-
-    const queryString = `?${params.toString()}`;
-
-    const res = await httpClient<Blob>(
-      `${this.basePath.replace(/\/$/, '')}/debt-supplier${queryString}`,
-      {
-        method: 'GET',
-        responseType: 'blob',
-      }
-    );
-
-    const url = window.URL.createObjectURL(new Blob([res]));
-    const link = document.createElement('a');
-    link.href = url;
-
-    const fileName = `laporan-hutang-supplier-general-${formatDate(Date.now(), 'DD-MM-YYYY')}.xlsx`;
-    link.setAttribute('download', fileName);
-
-    document.body.appendChild(link);
-    link.click();
-    link.remove();
-  }
-
-  async exportToExcelSupplierPerSheet(
-    supplier_ids?: string,
-    filter_by?: string,
-    start_date?: string,
-    end_date?: string
-  ) {
-    const params = new URLSearchParams();
-
-    if (supplier_ids) params.set('supplier_ids', supplier_ids);
-    if (filter_by) params.set('filter_by', filter_by);
-    if (start_date) params.set('start_date', start_date);
-    if (end_date) params.set('end_date', end_date);
-    params.set('export', 'excel');
-    params.set('page', '1');
-    params.set('limit', '99999999999');
-
-    const queryString = `?${params.toString()}`;
-
-    const res = await httpClient<Blob>(
-      `${this.basePath.replace(/\/$/, '')}/debt-supplier${queryString}`,
-      {
-        method: 'GET',
-        responseType: 'blob',
-      }
-    );
-
-    const url = window.URL.createObjectURL(new Blob([res]));
-    const link = document.createElement('a');
-    link.href = url;
-
-    const fileName = `laporan-hutang-supplier-per-sheet-${formatDate(Date.now(), 'DD-MM-YYYY')}.xlsx`;
-    link.setAttribute('download', fileName);
-
-    document.body.appendChild(link);
-    link.click();
-    link.remove();
-  }
-
  async getDebtSupplierReport(
    supplier_ids?: string,
    filter_by?: string,
@@ -1,9 +1,6 @@
 import { BaseApiService } from '@/services/api/base';
 import { BaseApiResponse } from '@/types/api/api-general';
 import { CustomerPaymentReport } from '@/types/api/report/customer-payment';
-import { httpClient } from '@/services/http/client';
-import { formatDate } from '@/lib/helper';
-import { BalanceMonitoringRow } from '@/types/api/report/balance-monitoring';

 export class FinanceApiService extends BaseApiService<
  CustomerPaymentReport,
@@ -14,95 +11,6 @@ export class FinanceApiService extends BaseApiService<
    super(basePath);
  }

-  async exportCustomerPaymentToExcelGeneral(
-    customer_ids?: string,
-    filter_by?: string,
-    start_date?: string,
-    end_date?: string
-  ) {
-    const params = new URLSearchParams();
-
-    if (customer_ids) params.set('customer_ids', customer_ids);
-    if (filter_by) params.set('filter_by', filter_by);
-    if (start_date) params.set('start_date', start_date);
-    if (end_date) params.set('end_date', end_date);
-    params.set('export', 'excel-all');
-    params.set('page', '1');
-    params.set('limit', '9999999999');
-
-    const res = await httpClient<Blob>(
-      `${this.basePath}/customer-payment?${params.toString()}`,
-      {
-        method: 'GET',
-        responseType: 'blob',
-      }
-    );
-
-    const url = window.URL.createObjectURL(new Blob([res]));
-    const link = document.createElement('a');
-    link.href = url;
-
-    const fileName = `laporan-piutang-customer-general-${formatDate(Date.now(), 'DD-MM-YYYY')}.xlsx`;
-    link.setAttribute('download', fileName);
-
-    document.body.appendChild(link);
-    link.click();
-    link.remove();
-  }
-
-  async exportCustomerPaymentToExcelCustomerPerSheet(
-    customer_ids?: string,
-    filter_by?: string,
-    start_date?: string,
-    end_date?: string
-  ) {
-    const params = new URLSearchParams();
-
-    if (customer_ids) params.set('customer_ids', customer_ids);
-    if (filter_by) params.set('filter_by', filter_by);
-    if (start_date) params.set('start_date', start_date);
-    if (end_date) params.set('end_date', end_date);
-    params.set('export', 'excel');
-    params.set('page', '1');
-    params.set('limit', '9999999999');
-
-    const res = await httpClient<Blob>(
-      `${this.basePath}/customer-payment?${params.toString()}`,
-      {
-        method: 'GET',
-        responseType: 'blob',
-      }
-    );
-
-    const url = window.URL.createObjectURL(new Blob([res]));
-    const link = document.createElement('a');
-    link.href = url;
-
-    const fileName = `laporan-piutang-customer-per-sheet-${formatDate(Date.now(), 'DD-MM-YYYY')}.xlsx`;
-    link.setAttribute('download', fileName);
-
-    document.body.appendChild(link);
-    link.click();
-    link.remove();
-  }
-
-  async getBalanceMonitoringReport(params: {
-    start_date?: string;
-    end_date?: string;
-    customer_ids?: string;
-    sales_ids?: string;
-    filter_by?: string;
-    sort_by?: string;
-    sort_order?: string;
-    page?: number;
-    limit?: number;
-  }): Promise<BaseApiResponse<BalanceMonitoringRow[]> | undefined> {
-    return await this.customRequest<BaseApiResponse<BalanceMonitoringRow[]>>(
-      'balance-monitoring',
-      { method: 'GET', params }
-    );
-  }
-
  async getCustomerPaymentReport(
    customer_ids?: string,
    // TODO: Uncomment when BE is ready
@@ -1,25 +0,0 @@
-import { Customer } from '@/services/api/master-data';
-
-export type BalanceMonitoringRow = {
-  customer: Customer;
-  saldo_awal: number;
-  penjualan_ayam: {
-    ekor: number;
-    kg: number;
-    nominal: number;
-  };
-  penjualan_telur: {
-    butir: number;
-    kg: number;
-    nominal: number;
-  };
-  penjualan_trading: {
-    qty: number;
-    kg: number;
-    nominal: number;
-  };
-  pembayaran: number;
-  aging: number;
-  aging_rata_rata: number;
-  saldo_akhir: number;
-};
Author	SHA1	Message	Date
Giovanni Gabriel Septriadi	a314a62f1f	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!484	2026-05-19 06:48:45 +00:00
Giovanni Gabriel Septriadi	2bf5f36a77	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!474	2026-05-12 09:31:27 +00:00
Giovanni Gabriel Septriadi	989e30fbed	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!468	2026-05-11 08:32:23 +00:00
Adnan Zahir	40139cd636	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!456	2026-05-05 14:12:28 +07:00
Adnan Zahir	8c03f10043	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!454	2026-05-02 13:43:29 +07:00
Adnan Zahir	89a6e51b48	Merge branch 'development' into 'production' Revert "fixing devops" See merge request mbugroup/lti-web-client!449	2026-04-30 09:54:39 +07:00
Adnan Zahir	f6727dc4dc	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!446	2026-04-29 12:53:07 +07:00
Adnan Zahir	1284b22345	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!441	2026-04-28 13:43:32 +07:00
Adnan Zahir	f73ea182ae	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!435	2026-04-26 00:13:15 +07:00
Adnan Zahir	047266b6d8	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!432	2026-04-25 14:46:53 +07:00
Adnan Zahir	6b95edfb72	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!427	2026-04-23 12:38:36 +07:00
Adnan Zahir	4b62b02a13	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!420	2026-04-22 13:12:50 +07:00
Adnan Zahir	12a50c6100	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!410	2026-04-20 08:24:51 +07:00
Adnan Zahir	09537d84d0	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!407	2026-04-18 09:41:09 +07:00
Adnan Zahir	1aa2ca9b31	Merge branch 'development' into 'production' refactor(FE-add-param): Update MarketingFilter to refine API calls and See merge request mbugroup/lti-web-client!400	2026-04-14 13:20:27 +07:00
Adnan Zahir	c87107b4ee	Merge branch 'development' into 'production' refactor(FE-load-more-option): Add infinite scroll to location and See merge request mbugroup/lti-web-client!396	2026-04-13 14:08:57 +07:00
Adnan Zahir	55b13988bf	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!393	2026-04-13 11:17:24 +07:00
Adnan Zahir	19033278b3	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!388	2026-04-11 14:13:02 +07:00
Adnan Zahir	4a6ac8a57d	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!382	2026-04-09 15:36:40 +07:00
Adnan Zahir	2b9847e1a9	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!378	2026-04-08 13:39:17 +07:00
Adnan Zahir	167769a711	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!375	2026-04-07 22:56:27 +07:00
Adnan Zahir	417dbba458	Merge branch 'development' into 'production' Development See merge request mbugroup/lti-web-client!373	2026-04-07 16:53:36 +07:00