@7365admin1/core 2.39.0 → 2.41.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 2.41.0
+
+### Minor Changes
+
+- a91bf1e: get latest changes
+
+## 2.40.0
+
+### Minor Changes
+
+- 7f45968: get latest changes for billing API
+
 ## 2.39.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -6,7 +6,6 @@ import * as bson from 'bson';
 import { z } from 'zod';
 import * as urllib from 'urllib';
 import { Server } from 'socket.io';
-import * as axios from 'axios';
 
 interface IBaseModel {
     unitNumber?: string;
@@ -399,7 +398,7 @@ declare function useVerificationService(): {
         metadata: TKeyValuePair;
     }) => Promise<bson.ObjectId>;
     createForgetPassword: (email: string) => Promise<string>;
-    createServiceProviderInvite: ({ email, orgId, siteId, siteName, }: {
+    createServiceProviderInvite: ({ email, orgId, siteId, siteName }: {
         email: string;
         orgId: string;
         siteId: string;
@@ -1770,6 +1769,7 @@ type TBuildingUnit = {
     companyRegistrationNumber?: number | string;
     leaseStart?: Date | string;
     leaseEnd?: Date | string;
+    unitNumber?: number | null;
 };
 declare const schemaBilling: Joi.ObjectSchema<any>;
 declare const schemaBuildingUnit: Joi.ObjectSchema<any>;
@@ -1810,6 +1810,7 @@ declare function MBuildingUnit(value: TBuildingUnit): {
     leaseStart: string | Date;
     leaseEnd: string | Date;
     billing: TBilling[];
+    unitNumber: number | null;
 };
 
 declare const buildings_namespace_collection = "buildings";
@@ -1866,6 +1867,7 @@ declare function useBuildingUnitRepo(): {
     updateByBuildingId: (building: string | ObjectId, value: Partial<Pick<TBuildingUnit, "buildingName" | "block">>, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getBuildingUnits: (site: string | ObjectId, block: number, level: string) => Promise<{}>;
     getBuildingUnitsWithOwner: (site: string | ObjectId, unitIds?: ObjectId[]) => Promise<{}>;
+    getUnitByBlockLevelUnitNumber: (block: number, level: string, unitNumber: string, site: string | ObjectId, session?: ClientSession) => Promise<TBuildingUnit>;
 };
 
 declare function useBuildingUnitService(): {
@@ -2000,6 +2002,8 @@ type TVehicle = {
     recNo?: string;
     seasonPassType?: string;
     peopleId?: string | ObjectId;
+    vehicleModel?: string;
+    vehicleColor?: string;
     createdAt?: Date | string;
     updatedAt?: Date | string;
     deletedAt?: Date | string;
@@ -2026,6 +2030,7 @@ declare function MVehicle(value: TVehicle): {
     status: string;
     unitName: string;
     peopleId: string | ObjectId;
+    vehicleModel: string;
     createdAt: string;
     updatedAt: string | Date;
     deletedAt: string | Date;
@@ -2134,7 +2139,7 @@ declare function useVehicleService(): {
     processDeletingExpiredVehicles: () => Promise<string>;
     reactivateVehicleById: (id: string, orgId: string, siteId: string) => Promise<string>;
     updateVehicleById: (_id: string, value: TVehicle) => Promise<void>;
-    bulkUpsertVehicles: (values: TVehicle[]) => Promise<{
+    bulkUpsertVehicles: (values: TVehicle[], site: string, org: string) => Promise<{
         matchedCount: number;
         modifiedCount: number;
         upsertedCount: number;
@@ -2160,7 +2165,6 @@ declare function useVehicleController(): {
     getVehiclesByNRIC: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     reactivateVehicleById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAllVehiclesByUnitId: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    uploadCsvVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     uploadExcelVehicles: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
@@ -6226,13 +6230,9 @@ declare function manpowerEvents(io: Server): Promise<void>;
 declare function useRedDotPaymentController(): {
     redirectPaymentTransaction: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     enquirePaymentTransaction: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+    createPayment: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
 };
 
-type TPaymentRequest = {
-    cardNumber: string;
-    rdpMid: string;
-    orderId: string;
-};
 interface IDirectPayment extends IBaseModel {
     _id?: ObjectId;
     mid?: string | ObjectId;
@@ -6264,11 +6264,38 @@ interface IDirectPayment extends IBaseModel {
 declare const useRedDotPaymentSvc: () => {
     redirectPaymentTransaction: (payload: IDirectPayment) => Promise<any>;
     enquirePaymentTransaction: (payload: IDirectPayment) => Promise<any>;
-    payInvoice: (payload: TPaymentRequest) => Promise<axios.AxiosResponse<any, any, {}>>;
+};
+
+type TBillingItems = {
+    _id: ObjectId | string;
+    name: string;
+};
+type TBillingPayments = {
+    _id?: ObjectId;
+    unitBillingItems?: TBillingItems[];
+    unitId?: string | ObjectId;
+    unitOwner?: string;
+    category?: string;
+    totalAmount?: number;
+    referenceNumber?: string;
+    status?: string;
+    paidBy?: string | ObjectId;
+    datePaid?: string | Date;
+    transaction_id?: string;
+    message?: string;
+    method?: string;
+    createdAt?: Date;
+    updatedAt?: string | Date;
+    deletedAt?: string | Date;
 };
 
 declare const useRedDotPaymentRepo: () => {
     paySingleUnitBill: (refId: string, payload: Partial<TUnitBilling>) => Promise<mongodb.WithId<bson.Document> | null>;
+    createPayment: (type: string, payload: Partial<TBillingPayments>, session?: ClientSession) => Promise<ObjectId | undefined>;
+    payMultipleUnitBill: (refId: string[], payload: Partial<TUnitBilling>) => Promise<{
+        message: string;
+        remainingBalance: number;
+    }>;
 };
 
 declare enum VerificationType {