Merge branch 'develop'

src/components/hook-form/rhf-numeric.tsx

@@ -28,11 +28,8 @@ export function RHFNumeric({
   maxValue,
   minValue,
   readOnly,
-<<<<<<< HEAD
   displayOnly = false,
-=======
   negativeMask = 'prefix',
->>>>>>> c01b578371dc0ae1737eb9b12fc456e83b835b3f
   ...props
 }: RHFNumericProps) {
   const { control } = useFormContext();
@@ -112,13 +109,10 @@ export function RHFNumeric({
               fixedDecimalScale: false,
               maxValue,
               minValue,
-<<<<<<< HEAD
 
               // format-component butuhkan ini agar tidak error
               valueIsNumericString: true,
-=======
               negativeMask,
->>>>>>> c01b578371dc0ae1737eb9b12fc456e83b835b3f
             },
 
             style: displayOnly

src/sections/faktur/fakturPk/hooks/useCetakFakturPK.tsx

-// import { useMutation } from '@tanstack/react-query';
-
-// import fakturApi from '../utils/api';
-
-// const useCetakPdfFakturPK = (options?: any) =>
-//   useMutation({
-//     mutationKey: ['faktur', 'pk', 'cetak-pdf'],
-//     mutationFn: async (params: any) => fakturApi.cetakPdfDetail(params),
-//     ...options,
-//   });
-
-// export default useCetakPdfFakturPK;
-
 import { useMutation } from '@tanstack/react-query';
 import fakturApi from '../utils/api';
 

src/sections/faktur/fakturPk/view/faktur-pk-list-view.tsx

@@ -161,11 +161,6 @@ export function FakturPkListView() {
     const baseParams = {
       page,
       limit: pageSize,
-      // noBupot: '',
-      // idDipotong: '',
-      // namaDipotong: '',
-      // msPajak: '',
-      // thnPajak: '',
       sortingMode: sortModel[0]?.field ?? '',
       sortingMethod: sortModel[0]?.sort ?? '',
     };
@@ -243,19 +238,6 @@ export function FakturPkListView() {
         ),
       },
       { field: 'nomorfaktur', headerName: 'Nomor Faktur Pajak', width: 200 },
-      // {
-      //   field: 'jenisInvoice',
-      //   type: 'singleSelect',
-      //   headerName: 'Jenis Invoice',
-      //   hideable: true,
-      //   width: 150,
-      //   valueOptions: [
-      //     { value: JENIS_INVOICE.UANG_MUKA, label: 'Uang Muka' },
-      //     { value: JENIS_INVOICE.PELUNASAN, label: 'Pelunasan' },
-      //     { value: JENIS_INVOICE.FULL_PAYMENT, label: 'Full Payment' },
-      //   ],
-      //   valueFormatter: (params) => JENIS_INVOICE_TEXT[params.value] ?? '-',
-      // },
       {
         field: 'jenisInvoice',
         headerName: 'Jenis Invoice',

src/sections/faktur/fakturPk/view/fakturPkRekamView.tsx

@@ -2,6 +2,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { LoadingButton } from '@mui/lab';
 import Grid from '@mui/material/Grid';
 import { useEffect, useMemo, useRef, useState } from 'react';
+import type { Resolver } from 'react-hook-form';
 import { FormProvider, useForm } from 'react-hook-form';
 import { CustomBreadcrumbs } from 'src/components/custom-breadcrumbs';
 import { DashboardContent } from 'src/layouts/dashboard';
@@ -107,8 +108,9 @@ const FakturPkRekamView = () => {
 
   const methods = useForm<TFakturPkSchema>({
     mode: 'all',
-    resolver: zodResolver(FakturPkSchema),
-    defaultValues: defaultValues as Partial<TFakturPkSchema>,
+    // resolver: zodResolver(FakturPkSchema),
+    resolver: zodResolver(FakturPkSchema) as Resolver<TFakturPkSchema, any>,
+    defaultValues,
     shouldUnregister: false,
   });
 
@@ -489,7 +491,7 @@ const FakturPkRekamView = () => {
                     };
 
                     // onSubmit(final);
-                    onSubmit(final as TFakturPkSchema);
+                    onSubmit(final);
                   })}
                 >
                   Save as Draft