fix(FE): resolve merge conflict

This commit is contained in:
randy-ar
2025-12-10 16:41:21 +07:00
8 changed files with 102 additions and 184 deletions
+5 -4
View File
@@ -63,10 +63,11 @@ export class ClosingApiService extends BaseApiService<Closing, null, null> {
id: number
): Promise<BaseApiResponse<ClosingSales> | undefined> {
try {
const getPenjualanPath = `${id}/penjualan`;
return await this.customRequest<BaseApiResponse<ClosingSales>>(
getPenjualanPath
);
const getPenjualanPath = `${this.basePath}/${id}/penjualan`;
const getPenjualanRes =
await httpClient<BaseApiResponse<ClosingSales>>(getPenjualanPath);
return getPenjualanRes;
} catch (error) {
if (axios.isAxiosError<BaseApiResponse<ClosingSales>>(error)) {
return error.response?.data;