fix(FE): resolve merge conflict

This commit is contained in:
randy-ar
2025-11-19 10:30:21 +07:00
26 changed files with 4148 additions and 20 deletions
+23
View File
@@ -47,3 +47,26 @@ export const MARKETING_APPROVAL_LINE: ApprovalLine = [
step_name: 'Delivery Order',
},
];
export const EXPENSE_REQUEST_APPROVAL_LINE: ApprovalLine = [
{
step_number: 1,
step_name: 'Pengajuan',
},
{
step_number: 2,
step_name: 'Approval Manager Area',
},
{
step_number: 3,
step_name: 'Approval Finance',
},
{
step_number: 4,
step_name: 'Realisasi',
},
{
step_number: 5,
step_name: 'Selesai',
},
] as const;
+15
View File
@@ -40,6 +40,12 @@ export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
],
},
{
title: 'Biaya Operasional',
link: '/expense',
icon: 'uil:wallet',
},
{
title: 'Penjualan',
link: '/marketing/sales-orders',
@@ -231,3 +237,12 @@ export const RECORDING_FLAG_OPTIONS = [
{ label: 'Ayam Culling', value: 'Ayam Culling' },
{ label: 'Ayam Mati', value: 'Ayam Mati' },
];
export const ACCEPTED_FILE_TYPE = {
PDF: {
'application/pdf': ['.pdf'],
},
IMAGE: {
'image/*': [],
},
};