@silexpert/core 1.3.72-1 → 1.3.73

package/ts/utils/vat/registration.ts

@@ -2,9 +2,9 @@ import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
 import { reverse, sumBy } from 'lodash';
 import {
+  AnyCerfa3310_Century,
   Cerfa2571_2023,
   Cerfa2573_2024,
-  Cerfa3310_2023,
   Cerfa3514_2022,
   CerfaType,
   CustomerVatType,
@@ -17,7 +17,7 @@ import {
   RegistrationTickState,
   TaxType,
 } from '../../types';
-import { Cerfa3517_2023 } from '../../types/Interface/api/cerfa/3517';
+import { AnyCerfa3517Century } from '../../types/Interface/api/cerfa/3517';
 
 const waitingState: ReadRegistrationTick = {
   state: RegistrationTickState.IN_PROGRESS,
@@ -147,9 +147,10 @@ export function getTypeAndAmountFromRegistration(registration: IRegistration): {
   amount: number | null;
   collectable: number;
   deductible: number;
+  amountBase?: number;
 } {
   if (registration.idCerfaType === CerfaType.CERFA_3310) {
-    const payload = registration.payload.cerfa3310 as Cerfa3310_2023;
+    const payload = registration.payload.cerfa3310 as AnyCerfa3310_Century;
     const other = { collectable: payload.vat?.grossDue, deductible: payload.vat?.deductible.total };
     if (payload?.isNil) return { type: CustomerVatType.VAT_TO_NIL, amount: 0, ...other };
     if (payload?.toPay?.total > 0) return { type: CustomerVatType.VAT_TO_PAY, amount: payload.toPay.total, ...other };
@@ -169,8 +170,12 @@ export function getTypeAndAmountFromRegistration(registration: IRegistration): {
     return { type: CustomerVatType.VAT_TO_PAY, amount: 0, ...other };
   }
   if (registration.idCerfaType === CerfaType.CERFA_3517) {
-    const payload = registration.payload.cerfa3517 as Cerfa3517_2023;
-    const other = { collectable: payload.other.total, deductible: payload.deductible.total };
+    const payload = registration.payload.cerfa3517 as AnyCerfa3517Century;
+    const other = {
+      collectable: payload.other.total,
+      deductible: payload.deductible.total,
+      amountBase: payload?.total,
+    };
     if (payload?.isNil) return { type: CustomerVatType.VAT_TO_NIL, amount: 0, ...other };
     if (payload?.recapitulation?.toPay > 0)
       return { type: CustomerVatType.VAT_TO_PAY, amount: payload?.recapitulation?.toPay, ...other };