diff --git a/src/app/purchase/add/page.tsx b/src/app/purchase/add/page.tsx index 6410f236..d09d5ce0 100644 --- a/src/app/purchase/add/page.tsx +++ b/src/app/purchase/add/page.tsx @@ -1,11 +1,11 @@ -import PurchaseRequisitionsForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; +import PurchaseRequestForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; -const AddPurchaseRequisitions = () => { +const AddPurchaseRequest = () => { return (
- +
); }; -export default AddPurchaseRequisitions; +export default AddPurchaseRequest; diff --git a/src/app/purchase/detail/edit/page.tsx b/src/app/purchase/detail/edit/page.tsx index 97dc8d62..5f0dacd4 100644 --- a/src/app/purchase/detail/edit/page.tsx +++ b/src/app/purchase/detail/edit/page.tsx @@ -2,8 +2,8 @@ import { useRouter, useSearchParams } from 'next/navigation'; import useSWR from 'swr'; -import PurchaseRequisitionsForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; -import { PurchaseRequisitionsApi } from '@/services/api/purchase'; +import PurchaseRequestForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; +import { PurchaseRequestApi } from '@/services/api/purchase'; import { isResponseSuccess, isResponseError } from '@/lib/api-helper'; const PurchaseEdit = () => { @@ -14,7 +14,7 @@ const PurchaseEdit = () => { const { data: purchase, isLoading: isLoadingPurchase } = useSWR( purchaseId, - (id: number) => PurchaseRequisitionsApi.getSingle(id) + (id: number) => PurchaseRequestApi.getSingle(id) ); if (!purchaseId) { @@ -38,7 +38,7 @@ const PurchaseEdit = () => { )} {!isLoadingPurchase && isResponseSuccess(purchase) && ( - + )} ); diff --git a/src/app/purchase/detail/page.tsx b/src/app/purchase/detail/page.tsx index 1559e810..8ea80739 100644 --- a/src/app/purchase/detail/page.tsx +++ b/src/app/purchase/detail/page.tsx @@ -2,8 +2,8 @@ import { useRouter, useSearchParams } from 'next/navigation'; import useSWR from 'swr'; -import PurchaseRequisitionsForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; -import { PurchaseRequisitionsApi } from '@/services/api/purchase'; +import PurchaseRequestForm from '@/components/pages/purchase/form/request/PurchaseRequisitionsForm'; +import { PurchaseRequestApi } from '@/services/api/purchase'; import { isResponseSuccess, isResponseError } from '@/lib/api-helper'; const PurchaseDetail = () => { @@ -14,7 +14,7 @@ const PurchaseDetail = () => { const { data: purchase, isLoading: isLoadingPurchase } = useSWR( purchaseId, - (id: number) => PurchaseRequisitionsApi.getSingle(id) + (id: number) => PurchaseRequestApi.getSingle(id) ); if (!purchaseId) { @@ -38,7 +38,7 @@ const PurchaseDetail = () => { )} {!isLoadingPurchase && isResponseSuccess(purchase) && ( - + )} ); diff --git a/src/components/pages/purchase/PurchaseTable.tsx b/src/components/pages/purchase/PurchaseTable.tsx index ea466fc2..c8a75694 100644 --- a/src/components/pages/purchase/PurchaseTable.tsx +++ b/src/components/pages/purchase/PurchaseTable.tsx @@ -26,7 +26,7 @@ import { isResponseSuccess } from '@/lib/api-helper'; import { useTableFilter } from '@/services/hooks/useTableFilter'; import { ROWS_OPTIONS } from '@/config/constant'; import { Purchase } from '@/types/api/purchase/purchase'; -import { PurchaseRequisitionsApi } from '@/services/api/purchase'; +import { PurchaseRequestApi } from '@/services/api/purchase'; const RowOptionsMenu = ({ type = 'dropdown', @@ -103,8 +103,8 @@ const PurchaseTable = () => { isLoading, mutate: refreshPurchaseRequests, } = useSWR( - `${PurchaseRequisitionsApi.basePath}${getTableFilterQueryString()}`, - PurchaseRequisitionsApi.getAllFetcher + `${PurchaseRequestApi.basePath}${getTableFilterQueryString()}`, + PurchaseRequestApi.getAllFetcher ); // Modal hooks @@ -237,7 +237,7 @@ const PurchaseTable = () => { setIsDeleteLoading(true); try { - await PurchaseRequisitionsApi.delete(selectedPurchase?.id as number); + await PurchaseRequestApi.delete(selectedPurchase?.id as number); refreshPurchaseRequests(); deleteModal.closeModal(); toast.success('Berhasil menghapus data permintaan pembelian!'); @@ -283,7 +283,6 @@ const PurchaseTable = () => { Tambah - {selectedRowIds.length > 0 && (

- {type === 'add' && 'Tambah Purchase Requisitions'} - {type === 'edit' && 'Edit Purchase Requisitions'} - {type === 'detail' && 'Detail Purchase Requisitions'} + {type === 'add' && 'Tambah Purchase Request'} + {type === 'edit' && 'Edit Purchase Request'} + {type === 'detail' && 'Detail Purchase Request'}

{ + async (payload: CreateManagerApprovalRequestPayload) => { const purchaseRequisitionId = searchParams.get('purchaseId') ? parseInt(searchParams.get('purchaseId')!) : purchaseData?.id || 1; @@ -806,7 +807,7 @@ const PurchaseOrderDetail = ({ text: 'Ya, Lanjutkan', color: 'success', onClick: async (notes) => { - const payload: CreateManagerApprovalRequisitionsPayload = { + const payload: CreateManagerApprovalRequestPayload = { notes: notes || null, }; diff --git a/src/services/api/purchase.ts b/src/services/api/purchase.ts index 5553844e..ec329498 100644 --- a/src/services/api/purchase.ts +++ b/src/services/api/purchase.ts @@ -1,20 +1,20 @@ import { - CreatePurchaseRequisitionsPayload, + CreatePurchaseRequestPayload, Purchase, - UpdatePurchaseRequisitionsPayload, - CreateStaffApprovalRequisitionsPayload, - CreateManagerApprovalRequisitionsPayload, - CreateAcceptApprovalRequisitionsPayload, + UpdatePurchaseRequestPayload, + CreateStaffApprovalRequestPayload, + CreateManagerApprovalRequestPayload, + CreateAcceptApprovalRequestPayload, } from '@/types/api/purchase/purchase'; import { BaseApiService } from '@/services/api/base'; import { BaseApiResponse } from '@/types/api/api-general'; -export class PurchaseRequisitionsService extends BaseApiService< +export class PurchaseRequestService extends BaseApiService< Purchase, - CreatePurchaseRequisitionsPayload, - UpdatePurchaseRequisitionsPayload + CreatePurchaseRequestPayload, + UpdatePurchaseRequestPayload > { - constructor(basePath: string = '/purchases/requisitions') { + constructor(basePath: string = '/purchases') { super(basePath); } @@ -51,8 +51,8 @@ export class PurchaseRequisitionsService extends BaseApiService< export class StaffApprovalService extends BaseApiService< Purchase, - CreateStaffApprovalRequisitionsPayload, - CreateAcceptApprovalRequisitionsPayload + CreateStaffApprovalRequestPayload, + CreateAcceptApprovalRequestPayload > { constructor(basePath: string = '') { super(basePath); @@ -60,7 +60,7 @@ export class StaffApprovalService extends BaseApiService< async createStaffApproval( purchaseRequisitionId: number, - payload: CreateStaffApprovalRequisitionsPayload + payload: CreateStaffApprovalRequestPayload ): Promise | undefined> { return await this.customRequest>( `${purchaseRequisitionId}/approvals/staff`, @@ -74,8 +74,8 @@ export class StaffApprovalService extends BaseApiService< export class ManagerApprovalService extends BaseApiService< Purchase, - CreateManagerApprovalRequisitionsPayload, - CreateManagerApprovalRequisitionsPayload + CreateManagerApprovalRequestPayload, + CreateManagerApprovalRequestPayload > { constructor(basePath: string = '') { super(basePath); @@ -83,7 +83,7 @@ export class ManagerApprovalService extends BaseApiService< async createManagerApproval( purchaseRequisitionId: number, - payload: CreateManagerApprovalRequisitionsPayload + payload: CreateManagerApprovalRequestPayload ): Promise | undefined> { return await this.customRequest>( `${purchaseRequisitionId}/approvals/manager`, @@ -97,8 +97,8 @@ export class ManagerApprovalService extends BaseApiService< export class AcceptApprovalService extends BaseApiService< Purchase, - CreateAcceptApprovalRequisitionsPayload, - CreateAcceptApprovalRequisitionsPayload + CreateAcceptApprovalRequestPayload, + CreateAcceptApprovalRequestPayload > { constructor(basePath: string = '') { super(basePath); @@ -106,7 +106,7 @@ export class AcceptApprovalService extends BaseApiService< async acceptApproval( purchaseRequisitionId: number, - payload: CreateAcceptApprovalRequisitionsPayload + payload: CreateAcceptApprovalRequestPayload ): Promise | undefined> { return await this.customRequest>( `${purchaseRequisitionId}/approvals/receipts`, @@ -118,16 +118,10 @@ export class AcceptApprovalService extends BaseApiService< } } -export const PurchaseRequisitionsApi = new PurchaseRequisitionsService(); +export const PurchaseRequestApi = new PurchaseRequestService(); -export const StaffApprovalApi = new StaffApprovalService( - '/purchases/requisitions' -); +export const StaffApprovalApi = new StaffApprovalService('/purchases'); -export const ManagerApprovalApi = new ManagerApprovalService( - '/purchases/requisitions' -); +export const ManagerApprovalApi = new ManagerApprovalService('/purchases'); -export const AcceptApprovalApi = new AcceptApprovalService( - '/purchases/requisitions' -); +export const AcceptApprovalApi = new AcceptApprovalService('/purchases'); diff --git a/src/types/api/purchase/purchase.d.ts b/src/types/api/purchase/purchase.d.ts index 57a5eb9a..9a0cf64b 100644 --- a/src/types/api/purchase/purchase.d.ts +++ b/src/types/api/purchase/purchase.d.ts @@ -45,7 +45,7 @@ export type BasePurchase = { export type Purchase = BaseMetadata & BasePurchase; -export type CreatePurchaseRequisitionsPayload = { +export type CreatePurchaseRequestPayload = { supplier_id: number; area_id: number; location_id: number; @@ -58,7 +58,7 @@ export type CreatePurchaseRequisitionsPayload = { }[]; }; -export type CreateStaffApprovalRequisitionsPayload = { +export type CreateStaffApprovalRequestPayload = { notes?: string | null; items: { purchase_item_id: number; @@ -67,11 +67,11 @@ export type CreateStaffApprovalRequisitionsPayload = { }[]; }; -export type CreateManagerApprovalRequisitionsPayload = { +export type CreateManagerApprovalRequestPayload = { notes?: string | null; }; -export type CreateAcceptApprovalRequisitionsPayload = { +export type CreateAcceptApprovalRequestPayload = { notes?: string; items: { purchase_item_id: number; @@ -87,5 +87,4 @@ export type CreateAcceptApprovalRequisitionsPayload = { }[]; }; -export type UpdatePurchaseRequisitionsPayload = - CreatePurchaseRequisitionsPayload; +export type UpdatePurchaseRequestPayload = CreatePurchaseRequestPayload;