diff --git a/src/dealer-claim/components/request-creation/ClaimManagementWizard.tsx b/src/dealer-claim/components/request-creation/ClaimManagementWizard.tsx index df419c4..646b830 100644 --- a/src/dealer-claim/components/request-creation/ClaimManagementWizard.tsx +++ b/src/dealer-claim/components/request-creation/ClaimManagementWizard.tsx @@ -208,6 +208,8 @@ export function ClaimManagementWizard({ onBack, onSubmit }: ClaimManagementWizar city: result['re city'] || result.city || '', state: result['re state code'] || result.state || '', isLoggedIn: true, // We'll verify this in the next step + parentCode: result.parentcode || null, + itemGroup: result['item group'] || null, }; setDealerSearchResults([mappedDealer]); } else { @@ -589,11 +591,20 @@ export function ClaimManagementWizard({ onBack, onSubmit }: ClaimManagementWizar - + {activityTypes.length > 0 ? ( activityTypes.map((type) => ( - - {type.title} + +
+ + {type.title} + +
+ {type.creditPostingOn && {type.creditPostingOn}} + {type.creditPostingOn && type.taxationType && } + {type.taxationType && {type.taxationType}} +
+
)) ) : ( @@ -662,18 +673,21 @@ export function ClaimManagementWizard({ onBack, onSubmit }: ClaimManagementWizar
{dealer.dealerName || dealer.displayName}
-
+
{dealer.dealerCode} {dealer.email && ( <> - + {dealer.email} )}
- {dealer.city && dealer.state && ( -
- {dealer.city}, {dealer.state} +
+ {dealer.city}, {dealer.state} +
+ {dealer.itemGroup && ( +
+ {dealer.itemGroup}
)}
diff --git a/src/dealer-claim/components/request-detail/claim-cards/ProcessDetailsCard.tsx b/src/dealer-claim/components/request-detail/claim-cards/ProcessDetailsCard.tsx index b4c319a..c24f09e 100644 --- a/src/dealer-claim/components/request-detail/claim-cards/ProcessDetailsCard.tsx +++ b/src/dealer-claim/components/request-detail/claim-cards/ProcessDetailsCard.tsx @@ -47,6 +47,7 @@ interface CostBreakdownItem { amount: number; gstAmt?: number; totalAmt?: number; + hsnCode?: string; } interface RoleBasedVisibility { @@ -320,11 +321,31 @@ export function ProcessDetailsCard({
{estimatedBudgetBreakdown.map((item, index) => ( -
-
{item.description}
- - {formatCurrency(item.totalAmt ?? (item.amount + (item.gstAmt ?? 0)))} - +
+
+
+ {item.description} +
+ + {formatCurrency(item.totalAmt ?? (item.amount + (item.gstAmt ?? 0)))} + +
+ {(item.gstAmt ?? 0) > 0 && ( +
+
+ Base: {formatCurrency(item.amount)} + GST: {formatCurrency(item.gstAmt)} +
+ {item.hsnCode && ( + HSN/SAC: {item.hsnCode} + )} +
+ )} + {!(item.gstAmt ?? 0) && item.hsnCode && ( +
+ HSN/SAC: {item.hsnCode} +
+ )}
))}
@@ -348,11 +369,31 @@ export function ProcessDetailsCard({
{closedExpensesBreakdown.map((item, index) => ( -
-
{item.description}
- - {formatCurrency(item.totalAmt ?? (item.amount + (item.gstAmt ?? 0)))} - +
+
+
+ {item.description} +
+ + {formatCurrency(item.totalAmt ?? (item.amount + (item.gstAmt ?? 0)))} + +
+ {(item.gstAmt ?? 0) > 0 && ( +
+
+ Base: {formatCurrency(item.amount)} + GST: {formatCurrency(item.gstAmt)} +
+ {item.hsnCode && ( + HSN/SAC: {item.hsnCode} + )} +
+ )} + {!(item.gstAmt ?? 0) && item.hsnCode && ( +
+ HSN/SAC: {item.hsnCode} +
+ )}
))}
diff --git a/src/services/dealerApi.ts b/src/services/dealerApi.ts index 3315540..f58c3f4 100644 --- a/src/services/dealerApi.ts +++ b/src/services/dealerApi.ts @@ -27,6 +27,7 @@ export interface DealerInfo { dealerPrincipalName?: string | null; dealerPrincipalEmailId?: string | null; itemGroup?: string | null; + parentCode?: string | null; } /** diff --git a/src/utils/claimDataMapper.ts b/src/utils/claimDataMapper.ts index 760ee9d..b9640c9 100644 --- a/src/utils/claimDataMapper.ts +++ b/src/utils/claimDataMapper.ts @@ -36,6 +36,7 @@ export interface ClaimManagementRequest { sgstAmt?: number; igstAmt?: number; totalAmt?: number; + hsnCode?: string; }>; description?: string; }; @@ -61,6 +62,7 @@ export interface ClaimManagementRequest { sgstAmt?: number; igstAmt?: number; totalAmt?: number; + hsnCode?: string; }>; totalEstimatedBudget: number; timelineMode?: 'date' | 'days'; @@ -184,7 +186,8 @@ export function mapToClaimManagementRequest( cgstAmt: exp.cgstAmt ?? exp.cgst_amt, sgstAmt: exp.sgstAmt ?? exp.sgst_amt, igstAmt: exp.igstAmt ?? exp.igst_amt, - totalAmt: exp.totalAmt ?? exp.total_amt + totalAmt: exp.totalAmt ?? exp.total_amt, + hsnCode: exp.hsnCode || exp.hsn_code || exp.hsnCd || exp.hsn_cd || '' })) : (completionDetails?.closedExpenses || completionDetails?.closed_expenses || @@ -260,7 +263,8 @@ export function mapToClaimManagementRequest( cgstAmt: Number(item.cgstAmt ?? item.cgst_amt ?? 0), sgstAmt: Number(item.sgstAmt ?? item.sgst_amt ?? 0), igstAmt: Number(item.igstAmt ?? item.igst_amt ?? 0), - totalAmt: Number(item.totalAmt ?? item.total_amt ?? 0) + totalAmt: Number(item.totalAmt ?? item.total_amt ?? 0), + hsnCode: item.hsnCode || item.hsn_code || '' })) : Array.isArray(proposalDetails.costBreakup || proposalDetails.cost_breakup) ? (proposalDetails.costBreakup || proposalDetails.cost_breakup).map((item: any) => ({ @@ -271,7 +275,8 @@ export function mapToClaimManagementRequest( cgstAmt: item.cgstAmt ?? item.cgst_amt, sgstAmt: item.sgstAmt ?? item.sgst_amt, igstAmt: item.igstAmt ?? item.igst_amt, - totalAmt: item.totalAmt ?? item.total_amt + totalAmt: item.totalAmt ?? item.total_amt, + hsnCode: item.hsnCode || item.hsn_code || '' })) : [], totalEstimatedBudget: proposalDetails.totalEstimatedBudget || proposalDetails.total_estimated_budget || 0,