@@ -107,16 +119,27 @@ export function ProposalDetailsCard({ proposalDetails, className }: ProposalDeta
{(proposalDetails.costBreakup || []).map((item, index) => (
- |
- Estimated Budget (Total)
+ |
+ Estimated Budget (Total Inclusive of GST)
|
{formatCurrency(estimatedTotal)}
diff --git a/src/dealer-claim/components/request-detail/modals/DealerCompletionDocumentsModal.tsx b/src/dealer-claim/components/request-detail/modals/DealerCompletionDocumentsModal.tsx
index cf2b833..c291e11 100644
--- a/src/dealer-claim/components/request-detail/modals/DealerCompletionDocumentsModal.tsx
+++ b/src/dealer-claim/components/request-detail/modals/DealerCompletionDocumentsModal.tsx
@@ -19,7 +19,7 @@ import { Label } from '@/components/ui/label';
import { Textarea } from '@/components/ui/textarea';
import { Badge } from '@/components/ui/badge';
import { CustomDatePicker } from '@/components/ui/date-picker';
-import { Upload, Plus, X, Calendar, FileText, Image, Receipt, CircleAlert, CheckCircle2, Eye, Download } from 'lucide-react';
+import { Upload, Plus, X, Calendar, FileText, Image, Receipt, CircleAlert, CheckCircle2, Eye, Download, IndianRupee } from 'lucide-react';
import { toast } from 'sonner';
import '@/components/common/FilePreview/FilePreview.css';
import './DealerCompletionDocumentsModal.css';
@@ -28,6 +28,19 @@ interface ExpenseItem {
id: string;
description: string;
amount: number;
+ gstRate: number;
+ gstAmt: number;
+ cgstRate: number;
+ cgstAmt: number;
+ sgstRate: number;
+ sgstAmt: number;
+ igstRate: number;
+ igstAmt: number;
+ utgstRate: number;
+ utgstAmt: number;
+ cessRate: number;
+ cessAmt: number;
+ totalAmt: number;
}
interface DealerCompletionDocumentsModalProps {
@@ -82,14 +95,14 @@ export function DealerCompletionDocumentsModal({
const canPreviewFile = (file: File): boolean => {
const type = file.type.toLowerCase();
const name = file.name.toLowerCase();
- return type.includes('image') ||
- type.includes('pdf') ||
- name.endsWith('.pdf') ||
- name.endsWith('.jpg') ||
- name.endsWith('.jpeg') ||
- name.endsWith('.png') ||
- name.endsWith('.gif') ||
- name.endsWith('.webp');
+ return type.includes('image') ||
+ type.includes('pdf') ||
+ name.endsWith('.pdf') ||
+ name.endsWith('.jpg') ||
+ name.endsWith('.jpeg') ||
+ name.endsWith('.png') ||
+ name.endsWith('.gif') ||
+ name.endsWith('.webp');
};
// Cleanup object URLs when component unmounts or file changes
@@ -107,12 +120,12 @@ export function DealerCompletionDocumentsModal({
toast.error('Preview is only available for images and PDF files');
return;
}
-
+
// Cleanup previous preview URL
if (previewFile?.url) {
URL.revokeObjectURL(previewFile.url);
}
-
+
const url = URL.createObjectURL(file);
setPreviewFile({ file, url });
};
@@ -129,11 +142,43 @@ export function DealerCompletionDocumentsModal({
URL.revokeObjectURL(url);
};
- // Calculate total closed expenses
+ // Calculate total closed expenses (inclusive of GST)
const totalClosedExpenses = useMemo(() => {
- return expenseItems.reduce((sum, item) => sum + (item.amount || 0), 0);
+ return expenseItems.reduce((sum, item) => sum + (item.totalAmt || item.amount || 0), 0);
}, [expenseItems]);
+ // GST Calculation Helper
+ const calculateGST = (amount: number, rate: number, type: 'IGST' | 'CGST_SGST' = 'CGST_SGST') => {
+ const gstAmt = (amount * rate) / 100;
+ const totalAmt = amount + gstAmt;
+
+ if (type === 'IGST') {
+ return {
+ gstAmt,
+ igstRate: rate,
+ igstAmt: gstAmt,
+ cgstRate: 0,
+ cgstAmt: 0,
+ sgstRate: 0,
+ sgstAmt: 0,
+ totalAmt
+ };
+ } else {
+ const halfRate = rate / 2;
+ const halfAmt = gstAmt / 2;
+ return {
+ gstAmt,
+ igstRate: 0,
+ igstAmt: 0,
+ cgstRate: halfRate,
+ cgstAmt: halfAmt,
+ sgstRate: halfRate,
+ sgstAmt: halfAmt,
+ totalAmt
+ };
+ }
+ };
+
// Check if all required fields are filled
const isFormValid = useMemo(() => {
const hasCompletionDate = activityCompletionDate !== '';
@@ -150,15 +195,51 @@ export function DealerCompletionDocumentsModal({
const handleAddExpense = () => {
setExpenseItems([
...expenseItems,
- { id: Date.now().toString(), description: '', amount: 0 },
+ {
+ id: Date.now().toString(),
+ description: '',
+ amount: 0,
+ gstRate: 0,
+ gstAmt: 0,
+ cgstRate: 0,
+ cgstAmt: 0,
+ sgstRate: 0,
+ sgstAmt: 0,
+ igstRate: 0,
+ igstAmt: 0,
+ utgstRate: 0,
+ utgstAmt: 0,
+ cessRate: 0,
+ cessAmt: 0,
+ totalAmt: 0
+ },
]);
};
- const handleExpenseChange = (id: string, field: 'description' | 'amount', value: string | number) => {
+ const handleExpenseChange = (id: string, field: string, value: any) => {
setExpenseItems(
- expenseItems.map((item) =>
- item.id === id ? { ...item, [field]: value } : item
- )
+ expenseItems.map((item) => {
+ if (item.id === id) {
+ const updatedItem = { ...item, [field]: value };
+
+ // Re-calculate GST if amount or rate changes
+ if (field === 'amount' || field === 'gstRate') {
+ const amount = field === 'amount' ? parseFloat(value) || 0 : item.amount;
+ const rate = field === 'gstRate' ? parseFloat(value) || 0 : item.gstRate;
+ const gst = calculateGST(amount, rate);
+
+ return {
+ ...updatedItem,
+ amount,
+ gstRate: rate,
+ ...gst
+ };
+ }
+
+ return updatedItem;
+ }
+ return item;
+ })
);
};
@@ -201,7 +282,7 @@ export function DealerCompletionDocumentsModal({
if (validFiles.length > 0) {
setCompletionDocuments([...completionDocuments, ...validFiles]);
}
-
+
if (completionDocsInputRef.current) completionDocsInputRef.current.value = '';
}
};
@@ -243,7 +324,7 @@ export function DealerCompletionDocumentsModal({
if (validFiles.length > 0) {
setActivityPhotos([...activityPhotos, ...validFiles]);
}
-
+
if (photosInputRef.current) photosInputRef.current.value = '';
}
};
@@ -287,7 +368,7 @@ export function DealerCompletionDocumentsModal({
if (validFiles.length > 0) {
setInvoicesReceipts([...invoicesReceipts, ...validFiles]);
}
-
+
if (invoicesInputRef.current) invoicesInputRef.current.value = '';
}
};
@@ -371,7 +452,24 @@ export function DealerCompletionDocumentsModal({
setPreviewFile(null);
setActivityCompletionDate('');
setNumberOfParticipants('');
- setExpenseItems([]);
+ setExpenseItems([{
+ id: '1',
+ description: '',
+ amount: 0,
+ gstRate: 0,
+ gstAmt: 0,
+ cgstRate: 0,
+ cgstAmt: 0,
+ sgstRate: 0,
+ sgstAmt: 0,
+ igstRate: 0,
+ igstAmt: 0,
+ utgstRate: 0,
+ utgstAmt: 0,
+ cessRate: 0,
+ cessAmt: 0,
+ totalAmt: 0
+ }]);
setCompletionDocuments([]);
setActivityPhotos([]);
setInvoicesReceipts([]);
@@ -391,696 +489,739 @@ export function DealerCompletionDocumentsModal({
};
return (
- |