@silexpert/core 1.0.182 → 1.0.184

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.0.182",
+  "version": "1.0.184",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
   "main": "js/index.js",

package/ts/api/resources/Notification.ts

@@ -1,7 +1,16 @@
+import { IAppNotification, UpdateAppNotificationStatus } from '../../types';
 import { Resource } from '../Resource';
 
 export class Notification extends Resource {
   createTestNotification(idUser: number): Promise<string> {
-    return this.axios.$post(`/notifications/${idUser}`);
+    return this.axios.$post(`/mobile/notifications/${idUser}`);
+  }
+
+  getAllBySociety(id: number): Promise<IAppNotification[]> {
+    return this.axios.$get(`societies/${id}/notifications`);
+  }
+
+  updateStatus(params: UpdateAppNotificationStatus): Promise<number> {
+    return this.axios.$put('/notifications/status', params);
   }
 }

package/ts/types/Enum/BrandPourcentage.ts

@@ -3,7 +3,7 @@ export const BrandPourcentage = [
     idTypeBrand: 1,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'Pourcentage OnLine',
+    name: 'Pourcentage Online',
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',
@@ -90,7 +90,7 @@ export const BrandPourcentage = [
     idTypeBrand: 2,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'Paris', // Sofrageco
+    name: 'Pourcentage Paris', // Sofrageco
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',
@@ -177,7 +177,7 @@ export const BrandPourcentage = [
     idTypeBrand: 3,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'Nancy', // AEC54
+    name: 'Pourcentage Nancy', // AEC54
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',
@@ -264,7 +264,7 @@ export const BrandPourcentage = [
     idTypeBrand: 4,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'EPINAL', // Pourcentage EPINAL
+    name: 'Pourcentage Epinal', // Pourcentage EPINAL
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',
@@ -351,7 +351,7 @@ export const BrandPourcentage = [
     idTypeBrand: 5,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'NICE', // AMEX
+    name: 'Pourcentage Nice', // AMEX
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',
@@ -435,10 +435,10 @@ export const BrandPourcentage = [
     },
   },
   {
-    idTypeBrand: 1,
+    idTypeBrand: 6,
     urlS3: 'https://s3.eu-west-3.amazonaws.com/resources-pourcentage/',
     logoS3: 'config/pourcentage-logo.png',
-    name: 'Marseille', // Pourcentage Marseille
+    name: 'Pourcentage Marseille', // Pourcentage Marseille
     colors: {
       primary: '#1e6f5c',
       primary50: '#DFF9F1',

package/ts/types/Enum/CommercialImportHeader.ts

@@ -16,77 +16,84 @@ export const commercialImportHeader: CommercialImportHeader = {
     required: true,
     description: 'Montant total toutes taxes comprises',
   },
+  TAX_EXCLUDED: {
+    originalName: 'taxExcludedAmount_0',
+    name: 'Montant sans TVA',
+    required: false,
+    description: 'Total hors taxes des prestations ou marchandises facturées sans TVA',
+  },
+  AMOUNT_VAT_0: {
+    originalName: 'amountVat_0',
+    name: 'Montant TVA sans TVA',
+    required: false,
+    description: 'Montant en euros de la TVA à 0',
+    relatedField: 'taxExcludedAmount_0',
+  },
   TAX_EXCLUDED_AMOUNT_20: {
     originalName: 'taxExcludedAmount_20',
     name: 'Montant HT TVA 20%',
-    required: true,
+    required: false,
     description: 'Total hors taxes des prestations ou marchandises facturées avec la TVA 20%',
   },
   AMOUNT_VAT_20: {
     originalName: 'amountVat_20',
     name: 'Montant TVA 20%',
-    required: true,
+    required: false,
     description: 'Montant en euros de la TVA 20%',
     relatedField: 'taxExcludedAmount_20',
   },
   TAX_EXCLUDED_10: {
     originalName: 'taxExcludedAmount_10',
     name: 'Montant HT TVA 10%',
-    required: true,
+    required: false,
     description: 'Total hors taxes des prestations ou marchandises facturées avec la TVA 10%',
   },
   AMOUNT_VAT_10: {
     originalName: 'amountVat_10',
     name: 'Montant TVA 10%',
-    required: true,
+    required: false,
     description: 'Montant en euros de la TVA 10%',
     relatedField: 'taxExcludedAmount_10',
   },
   TAX_EXCLUDED_8_5: {
     originalName: 'taxExcludedAmount_8_5',
     name: 'Montant HT TVA 8,5%',
-    required: true,
+    required: false,
     description: 'Total hors taxes des prestations ou marchandises facturées avec la TVA 8,5%',
   },
   AMOUNT_VAT_8_5: {
     originalName: 'amountVat_8_5',
     name: 'Montant TVA 8,5%',
-    required: true,
+    required: false,
     description: 'Montant en euros de la TVA 8,5%',
     relatedField: 'taxExcludedAmount_8_5',
   },
   TAX_EXCLUDED_5_5: {
     originalName: 'taxExcludedAmount_5_5',
     name: 'Montant HT TVA 5,5%',
-    required: true,
+    required: false,
     description: 'Total hors taxes des prestations ou marchandises facturées avec la TVA 5,5%',
   },
   AMOUNT_VAT_5_5: {
     originalName: 'amountVat_5_5',
     name: 'Montant TVA 5,5%',
-    required: true,
+    required: false,
     description: 'Montant en euros de la TVA 5,5%',
     relatedField: 'taxExcludedAmount_5_5',
   },
   TAX_EXCLUDED_2_1: {
     originalName: 'taxExcludedAmount_2_1',
     name: 'Montant HT TVA 2,1%',
-    required: true,
+    required: false,
     description: 'Total hors taxes des prestations ou marchandises facturées avec la TVA 2,1%',
   },
   AMOUNT_VAT_2_1: {
     originalName: 'amountVat_2_1',
     name: 'Montant TVA 2,1%',
-    required: true,
+    required: false,
     description: 'Montant en euros de la TVA 2,1%',
     relatedField: 'taxExcludedAmount_2_1',
   },
-  TAX_EXCLUDED: {
-    originalName: 'taxExcludedAmount',
-    name: 'Montant sans TVA',
-    required: true,
-    description: 'Total hors taxes des prestations ou marchandises facturées sans TVA',
-  },
   CUSTOMER_NAME: {
     originalName: 'customerName',
     name: 'Nom de client',

package/ts/types/Enum/NotificationType.ts

@@ -1,4 +1,45 @@
-export enum NotificationType {
+export enum NotificationTypeEnum {
   ANNOTATE_COUNT = 1,
   BANK_ACCOUNT_SYNCHRONISATION = 2,
-}
+  INVOICE_HAS_BEEN_PAID = 3,
+  ESTIMATE_ALMOST_EXPIRED = 4,
+  INVOICE_ALMOST_EXPIRED = 5,
+}
+
+export type NotificationTypeType = {
+  id: number;
+  title: string;
+  linkTitle: string;
+};
+
+export type NotificationTypeTypeEnum = {
+  [key: string]: NotificationTypeType
+};
+
+export const NotificationType: NotificationTypeTypeEnum = {
+  ANNOTATE_COUNT: {
+    id: NotificationTypeEnum.ANNOTATE_COUNT,
+    title: 'Vous avez des lignes non annotées',
+    linkTitle: 'Annoter',
+  },
+  BANK_ACCOUNT_SYNCHRONISATION: {
+    id: NotificationTypeEnum.BANK_ACCOUNT_SYNCHRONISATION,
+    title: 'Un de vos comptes bancaires est désynchronisé',
+    linkTitle: 'Synchroniser mon compte',
+  },
+  INVOICE_HAS_BEEN_PAID: {
+    id: NotificationTypeEnum.INVOICE_HAS_BEEN_PAID,
+    title: 'Vous avez été payé !',
+    linkTitle: 'Consulter la facture',
+  },
+  ESTIMATE_ALMOST_EXPIRED: {
+    id: NotificationTypeEnum.ESTIMATE_ALMOST_EXPIRED,
+    title: 'Un devis est bientôt expiré',
+    linkTitle: 'Consulter le devis',
+  },
+  INVOICE_ALMOST_EXPIRED: {
+    id: NotificationTypeEnum.INVOICE_ALMOST_EXPIRED,
+    title: 'Une facture arrive à échéance',
+    linkTitle: 'Consulter la facture',
+  },
+};

package/ts/types/Interface/api/appNotification/Update.ts

@@ -0,0 +1,13 @@
+import { IsBoolean } from 'class-validator';
+import { ApiPropertyOptional, ApiProperty } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class UpdateAppNotificationStatus {
+  @ApiPropertyOptional()
+  idNotifications?: number[] | null;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+  markAsRead: boolean;
+}

package/ts/types/Interface/api/aspone/ReadInterchange.ts

@@ -1,5 +1,5 @@
 export type PaymentState = {
-  isError: boolean;
+  isError: boolean | null;
   details: string[];
 };
 

package/ts/types/Interface/api/commercialImport/Query.ts

@@ -11,7 +11,8 @@ export type HeadersMappingImport =
 'customerName' |
 'invoiceNumber' |
 'taxIncludedAmount' |
-'taxExcludedAmount' |
+'taxExcludedAmount_0' |
+'amountVat_0' |
 'taxExcludedAmount_2_1' |
 'amountVat_2_1' |
 'taxExcludedAmount_5_5' |

package/ts/types/Interface/api/commercialImport/Read.ts

@@ -21,7 +21,8 @@ export interface ImportRow {
 
 export interface ImportRawRow {
   taxIncludedAmount: number;
-  taxExcludedAmount: number;
+  taxExcludedAmount_0: number;
+  amountVat_0: number;
   taxExcludedAmount_20: number;
   amountVat_20: number;
   taxExcludedAmount_10: number;

package/ts/types/Interface/api/notification/CreateNotification.ts

@@ -1,12 +1,12 @@
 import { IsEnum, IsInt } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
-import { NotificationType } from '../../../Enum/NotificationType';
+import { NotificationTypeEnum } from '../../../Enum/NotificationType';
 
 export class CreateNotification {
   @ApiProperty()
   @IsInt()
-  @IsEnum(NotificationType)
-  notificationType: NotificationType;
+  @IsEnum(NotificationTypeEnum)
+  notificationType: NotificationTypeEnum;
 
   @ApiProperty()
   token: string;

package/ts/types/Interface/api/notificationSetting/CreateNotificationSetting.ts

@@ -1,13 +1,13 @@
 import { IsBoolean, IsEnum, IsInt } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
-import { NotificationType } from '../../../Enum/NotificationType';
+import { NotificationTypeEnum } from '../../../Enum/NotificationType';
 
 export class CreateNotificationSetting {
   @ApiProperty()
   @IsInt()
-  @IsEnum(NotificationType)
-  notificationType: NotificationType;
+  @IsEnum(NotificationTypeEnum)
+  notificationType: NotificationTypeEnum;
 
   @ApiProperty()
   @IsBoolean()

package/ts/types/Interface/api/notificationSetting/UpdateNotificationSetting.ts

@@ -1,13 +1,13 @@
 import { IsBoolean, IsEnum, IsInt } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
-import { NotificationType } from '../../../Enum/NotificationType';
+import { NotificationTypeEnum } from '../../../Enum/NotificationType';
 
 export class UpdateNotificationSetting {
   @ApiProperty()
   @IsInt()
-  @IsEnum(NotificationType)
-  notificationType: NotificationType;
+  @IsEnum(NotificationTypeEnum)
+  notificationType: NotificationTypeEnum;
 
   @ApiProperty()
   @IsBoolean()

package/ts/types/Interface/models/IAppNotification.ts

@@ -0,0 +1,22 @@
+import { NotificationTypeEnum } from '../../Enum/NotificationType';
+import { ISociety } from './ISociety';
+import { IUser } from './IUser';
+
+export interface IAppNotification {
+  id: number;
+  title: string;
+  message: string;
+  link?: string;
+  documentId?: number;
+  read: boolean;
+  idNotificationtype: NotificationTypeEnum;
+  idSociety: number;
+  idUser: number;
+  idBankAccount?: number;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+
+  // associations
+  society: ISociety;
+  user: IUser;
+}

package/ts/types/Interface/models/IMobileNotificationLog.ts

@@ -1,8 +1,8 @@
-import { NotificationType } from '../../Enum/NotificationType';
+import { NotificationTypeEnum } from '../../Enum/NotificationType';
 
 export interface IMobileNotificationLog {
   id: number;
-  idType: NotificationType;
+  idType: NotificationTypeEnum;
   lastSent: Date | null;
   nextSend: Date | null;
   success: boolean;

package/ts/types/Interface/models/IMobileNotificationSetting.ts

@@ -1,8 +1,8 @@
-import { NotificationType } from '../../Enum/NotificationType';
+import { NotificationTypeEnum } from '../../Enum/NotificationType';
 
 export interface IMobileNotificationSetting {
   id: number;
-  idType: NotificationType;
+  idType: NotificationTypeEnum;
   active: boolean;
   idUser: number;
   createdAt?: Date | null;

package/ts/types/index.ts

@@ -322,6 +322,7 @@ export * from './Interface/models/IRegistration';
 export * from './Interface/models/IVatRegimeHistory';
 export * from './Interface/models/ICustomerAcceptance';
 export * from './Interface/models/IUnpaidCallHistory';
+export * from './Interface/models/IAppNotification';
 // Forms
 export * from './Form/FormAuthenticate';
 export * from './Form/FormConnector';
@@ -915,4 +916,5 @@ export * from './Interface/api/affectedPatrimony/CreateInKindAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/ResultCreateAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/ReadAffectedPatrimony';
 export * from './Interface/api/notificationSetting/CreateNotificationSetting';
-export * from './Interface/api/notificationSetting/UpdateNotificationSetting';
+export * from './Interface/api/notificationSetting/UpdateNotificationSetting';
+export * from './Interface/api/appNotification/Update';