@@ -390,27 +386,6 @@ export function MasterEmployeeContent() {
{/* RIGHT: Export + Add */}
-
-
-
-
-
- handleExport('CSV')}>
- Export CSV
-
- handleExport('Excel')}>
- Export Excel
-
-
-
-
diff --git a/src/figma-make/lib/info.tsx b/src/figma-make/lib/info.tsx
deleted file mode 100644
index 3127f912..00000000
--- a/src/figma-make/lib/info.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO: delete this file later
-
-/* AUTOGENERATED FILE - DO NOT EDIT CONTENTS */
-
-export const projectId = 'xxx';
-export const publicAnonKey = 'xxx';
diff --git a/src/figma-make/lib/supabase.ts b/src/figma-make/lib/supabase.ts
deleted file mode 100644
index 0b693389..00000000
--- a/src/figma-make/lib/supabase.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-import { createClient, SupabaseClient } from '@supabase/supabase-js';
-import { projectId, publicAnonKey } from '@/figma-make/lib/info';
-
-// ============================================
-// 🔍 SUPABASE ENVIRONMENT DEBUG CHECK
-// ============================================
-
-/**
- * Get environment variable from multiple sources
- * Checks in order: __ENV__, window.__ENV__, process.env, import.meta.env
- */
-function getEnv(key: string): string | undefined {
- let value: string | undefined;
- let source: string | undefined;
-
- // Check globalThis.__ENV__
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- if ((globalThis as any).__ENV__?.[key]) {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- value = (globalThis as any).__ENV__[key];
- source = 'globalThis.__ENV__';
- }
- // Check window.__ENV__
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- else if (typeof window !== 'undefined' && (window as any).__ENV__?.[key]) {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- value = (window as any).__ENV__[key];
- source = 'window.__ENV__';
- }
- // Check process.env
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- else if ((globalThis as any).process?.env?.[key]) {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- value = (globalThis as any).process.env[key];
- source = 'process.env';
- }
- // Check import.meta.env (if available)
- else if (
- typeof import.meta !== 'undefined' &&
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (import.meta as any)?.env?.[key]
- ) {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- value = (import.meta as any).env[key];
- source = 'import.meta.env';
- }
-
- if (value && source) {
- console.log(`✅ ${key} loaded from: ${source}`);
- }
-
- return value;
-}
-
-// Try to read from environment variables first
-let supabaseUrl = getEnv('VITE_SUPABASE_URL');
-let supabaseAnonKey = getEnv('VITE_SUPABASE_ANON_KEY');
-
-// Fallback to Figma Make autogenerated credentials
-if (!supabaseUrl || !supabaseAnonKey) {
- console.log(
- '📋 Using Figma Make autogenerated Supabase credentials from /utils/supabase/info.tsx'
- );
- supabaseUrl = `https://${projectId}.supabase.co`;
- supabaseAnonKey = publicAnonKey;
-}
-
-// Helper function to mask sensitive data
-const maskString = (str: string | undefined): string => {
- if (!str) return 'undefined';
- if (str.length <= 20) return str.substring(0, 10) + '...';
- return str.substring(0, 20) + '...' + `(${str.length - 20} chars masked)`;
-};
-
-// Debug logging
-console.group('🔍 Supabase Environment Check');
-console.log('projectId (from info.tsx):', projectId);
-console.log('SUPABASE_URL present?', !!supabaseUrl);
-console.log('SUPABASE_KEY present?', !!supabaseAnonKey);
-console.log('SUPABASE_URL value:', maskString(supabaseUrl));
-console.log('SUPABASE_KEY value:', maskString(supabaseAnonKey));
-console.groupEnd();
-
-// Check if Supabase is configured
-export const isSupabaseConfigured = () => {
- return !!(supabaseUrl && supabaseAnonKey);
-};
-
-// Create Supabase client or throw error
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let supabase: SupabaseClient
;
-
-if (isSupabaseConfigured()) {
- console.log('✅ Creating real Supabase client...');
- supabase = createClient(supabaseUrl!, supabaseAnonKey!);
- console.log('✅ Supabase client created successfully!');
-} else {
- const errorMessage = `
-❌ SUPABASE CONFIGURATION ERROR ❌
-
-Missing required environment variables:
-- VITE_SUPABASE_URL: ${!!supabaseUrl ? '✅ Present' : '❌ Missing'}
-- VITE_SUPABASE_ANON_KEY: ${!!supabaseAnonKey ? '✅ Present' : '❌ Missing'}
-
-Please set Supabase environment variables in:
-→ Figma Make Supabase integration settings
-→ Deployment settings/environment configuration
-
-The app checked the following sources:
-- globalThis.__ENV__
-- window.__ENV__
-- process.env
-- import.meta.env
-
-None of these sources contained the required variables.
- `.trim();
-
- console.error(errorMessage);
- throw new Error(errorMessage);
-}
-
-export { supabase };
-
-// Database types
-export interface Database {
- public: {
- Tables: {
- kandang: {
- Row: {
- id: string;
- name: string;
- created_at?: string;
- };
- Insert: {
- id?: string;
- name: string;
- created_at?: string;
- };
- Update: {
- id?: string;
- name?: string;
- created_at?: string;
- };
- };
- employees: {
- Row: {
- id: string;
- name: string;
- kandang_id: string;
- is_active: boolean;
- created_at?: string;
- };
- Insert: {
- id?: string;
- name: string;
- kandang_id: string;
- is_active?: boolean;
- created_at?: string;
- };
- Update: {
- id?: string;
- name?: string;
- kandang_id?: string;
- is_active?: boolean;
- created_at?: string;
- };
- };
- phases: {
- Row: {
- id: string;
- name: string;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- name: string;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- name?: string;
- created_at?: string;
- updated_at?: string;
- };
- };
- phase_activities: {
- Row: {
- id: string;
- phase_id: string;
- name: string;
- description?: string;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- phase_id: string;
- name: string;
- description?: string;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- phase_id?: string;
- name?: string;
- description?: string;
- created_at?: string;
- updated_at?: string;
- };
- };
- checklists: {
- Row: {
- id: string;
- name: string;
- description?: string;
- phase_id: string;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- name: string;
- description?: string;
- phase_id: string;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- name?: string;
- description?: string;
- phase_id?: string;
- created_at?: string;
- updated_at?: string;
- };
- };
- daily_checklists: {
- Row: {
- id: string;
- date: string;
- kandang_id: string;
- checklist_id: string;
- category: string;
- status: string;
- name?: string;
- total_score?: number;
- document_path?: string;
- reject_reason?: string;
- created_by: string;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- date: string;
- kandang_id: string;
- checklist_id: string;
- category: string;
- status?: string;
- name?: string;
- total_score?: number;
- document_path?: string;
- reject_reason?: string;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- date?: string;
- kandang_id?: string;
- checklist_id?: string;
- category?: string;
- status?: string;
- name?: string;
- total_score?: number;
- document_path?: string;
- reject_reason?: string;
- created_at?: string;
- updated_at?: string;
- };
- };
- daily_checklist_tasks: {
- Row: {
- id: string;
- checklist_id: string;
- activity_id: string;
- notes?: string;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- checklist_id: string;
- activity_id: string;
- notes?: string;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- checklist_id?: string;
- activity_id?: string;
- notes?: string;
- created_at?: string;
- updated_at?: string;
- };
- };
- task_assignees: {
- Row: {
- id: string;
- task_id: string;
- employee_id: string;
- is_completed: boolean;
- created_at?: string;
- updated_at?: string;
- };
- Insert: {
- id?: string;
- task_id: string;
- employee_id: string;
- is_completed?: boolean;
- created_at?: string;
- updated_at?: string;
- };
- Update: {
- id?: string;
- task_id?: string;
- employee_id?: string;
- is_completed?: boolean;
- created_at?: string;
- updated_at?: string;
- };
- };
- };
- };
-}
diff --git a/src/services/api/daily-checklist/configuration.ts b/src/services/api/daily-checklist/configuration.ts
new file mode 100644
index 00000000..27331aee
--- /dev/null
+++ b/src/services/api/daily-checklist/configuration.ts
@@ -0,0 +1,19 @@
+import { BaseApiService } from '@/services/api/base';
+import {
+ CreateDailyChecklistConfigurationPayload,
+ DailyChecklistConfiguration,
+ UpdateDailyChecklistConfigurationPayload,
+} from '@/types/api/daily-checklist/configuration';
+
+export class DailyChecklistConfigurationApiService extends BaseApiService<
+ DailyChecklistConfiguration,
+ CreateDailyChecklistConfigurationPayload,
+ UpdateDailyChecklistConfigurationPayload
+> {
+ constructor(basePath: string = '/master-data/config-checklists') {
+ super(basePath);
+ }
+}
+
+export const DailyChecklistConfigurationApi =
+ new DailyChecklistConfigurationApiService('/master-data/config-checklists');
diff --git a/src/services/api/daily-checklist/daily-checklist.ts b/src/services/api/daily-checklist/daily-checklist.ts
index 48b789a8..b8f72201 100644
--- a/src/services/api/daily-checklist/daily-checklist.ts
+++ b/src/services/api/daily-checklist/daily-checklist.ts
@@ -1,13 +1,18 @@
import axios from 'axios';
+import * as XLSX from 'xlsx';
import { BaseApiService } from '@/services/api/base';
-import { httpClient } from '@/services/http/client';
+import { httpClient, httpClientFetcher } from '@/services/http/client';
import { BaseApiResponse } from '@/types/api/api-general';
import {
CreateDailyChecklistPayload,
DailyChecklist,
+ DailyChecklistReport,
DetailDailyChecklist,
} from '@/types/api/daily-checklist/daily-checklist';
+import { isResponseError } from '@/lib/api-helper';
+import { toast } from 'sonner';
+import { formatDate } from '@/lib/helper';
export class DailyChecklistApiService extends BaseApiService<
DailyChecklist,
@@ -134,15 +139,26 @@ export class DailyChecklistApiService extends BaseApiService<
}
}
- async submit(id: string) {
+ async submit(
+ id: string,
+ files: File[] = [],
+ deletedDocumentIds: number[] = []
+ ) {
try {
+ const formData = new FormData();
+
+ formData.append('status', 'SUBMITTED');
+
+ formData.append('reject_reason', '');
+
+ files.forEach((file) => formData.append(`documents`, file));
+
+ formData.append('deleted_document_ids', deletedDocumentIds.join(','));
+
const submitPath = `${this.basePath}/${id}`;
const submitRes = await httpClient(submitPath, {
method: 'PATCH',
- body: {
- status: 'SUBMITTED',
- reject_reason: '',
- },
+ body: formData,
});
return submitRes;
@@ -156,13 +172,16 @@ export class DailyChecklistApiService extends BaseApiService<
async approve(id: string) {
try {
+ const formData = new FormData();
+
+ formData.append('status', 'APPROVED');
+
+ formData.append('reject_reason', '');
+
const approvePath = `${this.basePath}/${id}`;
const approveRes = await httpClient(approvePath, {
method: 'PATCH',
- body: {
- status: 'APPROVED',
- reject_reason: '',
- },
+ body: formData,
});
return approveRes;
@@ -176,13 +195,16 @@ export class DailyChecklistApiService extends BaseApiService<
async reject(id: string, rejectReason: string) {
try {
+ const formData = new FormData();
+
+ formData.append('status', 'REJECTED');
+
+ formData.append('reject_reason', rejectReason);
+
const rejectPath = `${this.basePath}/${id}`;
const rejectRes = await httpClient(rejectPath, {
method: 'PATCH',
- body: {
- status: 'REJECTED',
- reject_reason: rejectReason,
- },
+ body: formData,
});
return rejectRes;
@@ -193,6 +215,111 @@ export class DailyChecklistApiService extends BaseApiService<
return undefined;
}
}
+
+ async uploadImage(
+ id: number,
+ status: string,
+ files: File[],
+ deletedDocumentIds: number[] = []
+ ) {
+ try {
+ const formData = new FormData();
+
+ formData.append('status', status);
+
+ files.forEach((file) => formData.append(`documents`, file));
+
+ formData.append('deleted_document_ids', deletedDocumentIds.join(','));
+
+ const uploadImagePath = `${this.basePath}/${id}`;
+ const uploadImageRes = await httpClient(
+ uploadImagePath,
+ {
+ method: 'PATCH',
+ body: formData,
+ }
+ );
+
+ return uploadImageRes;
+ } catch (error) {
+ if (axios.isAxiosError(error)) {
+ return error.response?.data;
+ }
+ return undefined;
+ }
+ }
+
+ async exportDailyChecklistReportToExcel(initialQueryString: string) {
+ const params = new URLSearchParams(initialQueryString);
+
+ params.set('limit', '2000');
+
+ const queryString = `?${params.toString()}`;
+
+ try {
+ const dailyMarketingsReport = await httpClientFetcher<
+ BaseApiResponse
+ >(`${this.basePath}/report${queryString}`);
+
+ if (isResponseError(dailyMarketingsReport)) {
+ toast.error('Gagal melakukan export daily checklist! Coba lagi.');
+ return;
+ }
+
+ const currentMonthMaxDay = new Date(
+ Number(params.get('tahun')),
+ Number(params.get('bulan')),
+ 0
+ ).getDate();
+
+ const rows = dailyMarketingsReport.data;
+
+ const formattedRows = [];
+
+ for (let i = 0; i < rows.length; i++) {
+ const formattedData: Record = {
+ Area: rows[i].area.name,
+ Farm: rows[i].farm.name,
+ Kandang: rows[i].kandang.name,
+ ABK: rows[i].abk.name,
+ Phase: rows[i].phase,
+ };
+
+ // Add day
+ for (let j = 1; j <= currentMonthMaxDay; j++) {
+ formattedData[`Day ${j}`] = rows[i].daily_activities[`${j}`];
+ }
+
+ // add summary
+ formattedData['Total Checklist'] = rows[i].summary.total_checklist;
+ formattedData['Jumlah Hari Efektif'] =
+ rows[i].summary.jumlah_hari_efektif;
+ formattedData['ABK %'] = rows[i].summary.abk_percentage;
+ formattedData['Kandang %'] = rows[i].summary.kandang_percentage;
+ formattedData['Kategori Kurang'] = rows[i].summary.kategori.kurang;
+ formattedData['Kategori Cukup'] = rows[i].summary.kategori.cukup;
+ formattedData['Kategori Baik'] = rows[i].summary.kategori.baik;
+
+ formattedRows.push(formattedData);
+ }
+
+ const ws = XLSX.utils.json_to_sheet(formattedRows);
+ const wb = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(
+ wb,
+ ws,
+ `Daily Checklist ${params.get('tahun')}-${params.get('bulan')?.slice(0, 3)}`
+ );
+
+ // triggers download in browser
+ XLSX.writeFile(
+ wb,
+ `laporan-daily-checklist-${params.get('tahun')}-${params.get('bulan')}.xlsx`
+ );
+ } catch (error) {
+ toast.error('Gagal melakukan export daily checklist! Coba lagi.');
+ }
+ }
}
export const DailyChecklistApi = new DailyChecklistApiService(
diff --git a/src/services/api/report/finance-report.ts b/src/services/api/report/finance-report.ts
index 014b9fec..db3092fe 100644
--- a/src/services/api/report/finance-report.ts
+++ b/src/services/api/report/finance-report.ts
@@ -63,4 +63,8 @@ export class FinanceApiService extends BaseApiService<
}
}
-export const FinanceApi = new FinanceApiService('reports');
+// export const FinanceApi = new FinanceApiService('reports');
+
+export const FinanceApi = new FinanceApiService(
+ 'http://localhost:4010/api/reports/finance'
+);
diff --git a/src/services/api/report/marketing-report.ts b/src/services/api/report/marketing-report.ts
index 5d81605e..f55336ac 100644
--- a/src/services/api/report/marketing-report.ts
+++ b/src/services/api/report/marketing-report.ts
@@ -2,11 +2,14 @@ import * as XLSX from 'xlsx';
import toast from 'react-hot-toast';
import { BaseApiService } from '@/services/api/base';
-import { httpClient, httpClientFetcher } from '@/services/http/client';
+import { httpClientFetcher } from '@/services/http/client';
import { BaseApiResponse } from '@/types/api/api-general';
-import { DailyMarketingReport } from '@/types/api/report/marketing';
+import {
+ DailyMarketingReport,
+ DailyMarketingReportResponse,
+} from '@/types/api/report/marketing';
import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { formatDate, sleep } from '@/lib/helper';
+import { formatDate } from '@/lib/helper';
export class MarketingReportApiService extends BaseApiService<
DailyMarketingReport,
@@ -19,10 +22,8 @@ export class MarketingReportApiService extends BaseApiService<
async getAllDailyMarketingFetcher(
endpoint: string
- ): Promise> {
- return await httpClientFetcher>(
- endpoint
- );
+ ): Promise {
+ return await httpClientFetcher(endpoint);
}
async exportDailyMarketingToExcel(initialQueryString: string) {
@@ -42,16 +43,19 @@ export class MarketingReportApiService extends BaseApiService<
return;
}
- const rows = dailyMarketingsReport.data.rows;
+ const rows = dailyMarketingsReport.data;
const formattedRows = [];
for (let i = 0; i < rows.length; i++) {
formattedRows.push({
...rows[i],
- created_user: rows[i].created_user.name,
- created_at: formatDate(rows[i].created_at, 'YYYY-MM-DD'),
- updated_at: formatDate(rows[i].updated_at, 'YYYY-MM-DD'),
+ // created_user: rows[i].created_user.name,
+ // created_at: formatDate(rows[i].created_at, 'YYYY-MM-DD'),
+ // updated_at: formatDate(rows[i].updated_at, 'YYYY-MM-DD'),
+ so_date: formatDate(rows[i].so_date, 'YYYY-MM-DD'),
+ realization_date: formatDate(rows[i].realization_date, 'YYYY-MM-DD'),
+ sales: rows[i].sales.name,
warehouse: rows[i].warehouse.name,
customer: rows[i].customer.name,
product: rows[i].product.name,
diff --git a/src/types/api/api-general.d.ts b/src/types/api/api-general.d.ts
index 5b9f04e3..d3deb616 100644
--- a/src/types/api/api-general.d.ts
+++ b/src/types/api/api-general.d.ts
@@ -116,3 +116,10 @@ export type BaseGroupedApproval = {
export type Approvals = BaseApiResponse;
export type GroupedApprovals = BaseApiResponse;
+
+export type Document = {
+ id: number;
+ name: string;
+ size: number;
+ url: string;
+};
diff --git a/src/types/api/daily-checklist/configuration.d.ts b/src/types/api/daily-checklist/configuration.d.ts
new file mode 100644
index 00000000..7e94c69b
--- /dev/null
+++ b/src/types/api/daily-checklist/configuration.d.ts
@@ -0,0 +1,22 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseConfiguration = {
+ id: number;
+ date: string;
+ percentage_threshold_bad: number;
+ percentage_threshold_enough: number;
+};
+
+export type DailyChecklistConfiguration = BaseMetadata & BaseConfiguration;
+
+export type CreateDailyChecklistConfigurationPayload = {
+ date: string;
+ percentage_threshold_bad: number;
+ percentage_threshold_enough: number;
+};
+
+export type UpdateDailyChecklistConfigurationPayload = {
+ date: string;
+ percentage_threshold_bad: number;
+ percentage_threshold_enough: number;
+};
diff --git a/src/types/api/daily-checklist/daily-checklist.d.ts b/src/types/api/daily-checklist/daily-checklist.d.ts
index 9f01ae1f..5e5a3fe8 100644
--- a/src/types/api/daily-checklist/daily-checklist.d.ts
+++ b/src/types/api/daily-checklist/daily-checklist.d.ts
@@ -1,7 +1,10 @@
-import { BaseMetadata } from '@/types/api/api-general';
+import { BaseMetadata, Document } from '@/types/api/api-general';
import { BaseKandang } from '@/types/api/master-data/kandang';
import { Phase } from '@/types/api/daily-checklist/phase';
import { PhaseActivity } from '@/types/api/daily-checklist/phase-activity';
+import { BaseArea } from '@/types/api/master-data/area';
+import { BaseLocation } from '@/types/api/master-data/location';
+import { BaseEmployee } from '@/types/api/master-data/employee';
export type BaseDailyChecklist = {
id: number;
@@ -46,6 +49,7 @@ export type DetailDailyChecklist = BaseDailyChecklist & {
id: number;
name: string;
}[];
+ document_urls: Document[];
};
export type CreateDailyChecklistPayload = {
@@ -54,3 +58,49 @@ export type CreateDailyChecklistPayload = {
category: string;
status: string;
};
+
+export type PerformanceOverviewItem = {
+ employee_id: number;
+ employee_name: string;
+ total_activity: number;
+ activity_done: number;
+ activity_left: number;
+ kandang: Pick;
+};
+
+export type TrackingAbkItem = {
+ employee_id: number;
+ employee_name: string;
+ kandang_id: number;
+ kandang_name: string;
+ total_activity: number;
+ activity_done: number;
+ activity_left: number;
+ completion_rate: number;
+ last_activity: string;
+};
+
+export type DailyChecklistSummary = {
+ performance_overview: PerformanceOverviewItem[];
+ tracking_abk: TrackingAbkItem[];
+};
+
+export type DailyChecklistReport = {
+ area: Pick;
+ farm: Pick;
+ kandang: Pick;
+ abk: Pick;
+ phase: string;
+ daily_activities: Record;
+ summary: {
+ total_checklist: number;
+ jumlah_hari_efektif: number;
+ abk_percentage: number;
+ kandang_percentage: number;
+ kategori: {
+ kurang: number;
+ cukup: number;
+ baik: number;
+ };
+ };
+};
diff --git a/src/types/api/report/customer-payment.d.ts b/src/types/api/report/customer-payment.d.ts
index 776d640d..bfa059c9 100644
--- a/src/types/api/report/customer-payment.d.ts
+++ b/src/types/api/report/customer-payment.d.ts
@@ -1,15 +1,13 @@
-import { BaseMetadata } from '@/types/api/api-general';
import { BaseCustomer } from '@/types/api/master-data/customer';
-import { BaseProduct } from '@/types/api/master-data/product';
+import { BaseMetadata } from '@/types/api/api-general';
export type CustomerPaymentRow = {
- no: number;
+ id: number;
do_date: string;
- payment_date: string;
realization_date: string;
- aging: number;
+ aging_day: number | null;
reference: string;
- vehicle_plate: string;
+ vehicle_plate: string[];
qty: number;
weight: number;
average_weight: number;
@@ -23,7 +21,6 @@ export type CustomerPaymentRow = {
notes: string;
pickup_info: string;
sales_marketing: string;
- product?: BaseProduct;
};
export type CustomerPaymentSummary = {
@@ -40,8 +37,6 @@ export type CustomerPaymentSummary = {
export type CustomerPaymentReport = BaseMetadata & {
customer: BaseCustomer;
- customer_npwp: string;
- customer_address: string;
rows: CustomerPaymentRow[];
summary: CustomerPaymentSummary;
};
diff --git a/src/types/api/report/marketing.d.ts b/src/types/api/report/marketing.d.ts
index d1e81f77..4a0ab306 100644
--- a/src/types/api/report/marketing.d.ts
+++ b/src/types/api/report/marketing.d.ts
@@ -1,4 +1,4 @@
-import { BaseMetadata } from '@/types/api/api-general';
+import { BaseApiResponse, BaseMetadata } from '@/types/api/api-general';
import { BaseCustomer, Customer } from '@/types/api/master-data/customer';
import {
BaseWarehouseArea,
@@ -9,16 +9,17 @@ import {
import { Location } from '@/types/api/master-data/location';
import { Area } from '@/types/api/master-data/area';
import { BaseProduct } from '@/types/api/master-data/product';
+import { BaseUser } from '@/types/api/user';
export type BaseDailyMarketingRow = {
- no: number;
- so_date: string; // e.g. "01-Dec-2025"
- do_date: string; // e.g. "08-Dec-2025"
+ id: number;
+ so_date: string;
+ realization_date: string;
aging_days: number;
warehouse: BaseWarehouseArea | BaseWarehouseLocation | BaseWarehouseKandang;
customer: BaseCustomer;
- sales: string;
+ sales: BaseUser;
product: BaseProduct;
do_number: string;
@@ -43,12 +44,13 @@ export interface SalesSummary {
total_weight_kg: number;
total_sales_amount: number;
total_hpp_amount: number;
+ total_hpp_price_per_kg: number;
}
-export type DailyMarketingReport = {
- rows: DailyMarketingRow[];
- summary: SalesSummary;
-};
+export type DailyMarketingReport = DailyMarketingRow[];
+
+export type DailyMarketingReportResponse =
+ BaseApiResponse & { total: SalesSummary };
export type MarketingReportFilters = {
area_id?: number;