@mydoormot/app-types 1.7.15 → 1.7.17

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @mydoormot/app-types@1.7.14 build /Users/chuksben/Desktop/projects/microservices/mydoormot/packages/app-types
+> @mydoormot/app-types@1.7.16 build /Users/chuksben/Desktop/projects/microservices/mydoormot/packages/app-types
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -9,10 +9,10 @@
 ESM Build start
 CJS Build start
 ESM dist/index.js 6.17 KB
-ESM ⚡️ Build success in 136ms
+ESM ⚡️ Build success in 61ms
 CJS dist/index.cjs 7.84 KB
-CJS ⚡️ Build success in 137ms
+CJS ⚡️ Build success in 62ms
 DTS Build start
-DTS ⚡️ Build success in 1414ms
-DTS dist/index.d.ts  18.13 KB
-DTS dist/index.d.cts 18.13 KB
+DTS ⚡️ Build success in 1296ms
+DTS dist/index.d.ts  17.78 KB
+DTS dist/index.d.cts 17.78 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mydoormot/app-types
 
+## 1.7.17
+
+### Patch Changes
+
+- Modified types
+
+## 1.7.16
+
+### Patch Changes
+
+- Modified invoice stypes
+
 ## 1.7.15
 
 ### Patch Changes

package/dist/index.d.cts

@@ -107,59 +107,26 @@ interface Coupon {
     fullName?: string;
 }
 
-declare enum EnterpriseType {
-    Restaurant = "restaurant",
-    Dispatch = "dispatch",
-    Property = "property",
-    Store = "store"
-}
-type Enterprise = {
-    id: string;
-    user: string | User;
-    name: string;
-    city: string;
-    verified: boolean;
-    mobileNumber?: string;
-    enterpriseType: EnterpriseType | `${EnterpriseType}`;
-    deleted: boolean;
-    updatedAt: Date;
-    createdAt: Date;
-    isActive: boolean;
-    version: number;
-    officeNumber?: string;
-    address?: {
-        coordinates?: number[];
-        address?: string;
-    };
-    image?: string;
-    coverImage?: string;
-    activationDate?: string;
-    category: EnterpriseCategoryDoc[] | string[];
-    subCategory: EnterpriseSubCategoryDoc[] | string[];
-    socialLinks: {
-        name: string;
-        url: string;
-        active: boolean;
-    }[];
-};
-interface EnterpriseCategoryDoc {
-    id: string;
-    name: string;
-    slug: string;
-    subCategories: EnterpriseSubCategoryDoc[];
+interface CustomerTransactionStats {
+    totalSaleCount: number;
+    totalSaleAmount: number;
+    totalExpenseCount: number;
+    totalExpenseAmount: number;
+    lastTransactionDate: string | null;
     updatedAt: string;
-    createdAt: string;
-    image?: string;
 }
-interface EnterpriseSubCategoryDoc {
+interface Customer {
     id: string;
-    name: string;
-    category: string;
-    slug: string;
-    image?: string;
-    serviceItems: string[];
-    updatedAt: string;
+    businessId: string;
+    phoneNumber: string;
+    fullName: string;
+    cityId: string;
+    address: string;
+    landmark?: string;
     createdAt: string;
+    updatedAt: string;
+    customerBusinessId?: string;
+    transactionStats?: CustomerTransactionStats;
 }
 
 declare enum InvoiceStatus {
@@ -183,38 +150,34 @@ declare enum PaymentOptions {
 }
 interface Invoice {
     id: string;
-    user: string;
-    invoiceType: EnterpriseType | `${EnterpriseType}`;
-    amount: number;
-    paymentType: PaymentOptions | `${PaymentOptions}`;
+    businessId: string;
+    userId: string;
+    invoiceNumber: string;
+    startDate: string;
+    endDate: string;
+    totalAmount: number;
+    paidAmount: number;
+    unpaidAmount: number;
     status: InvoiceStatus | `${InvoiceStatus}`;
-    version: number;
-    referenceId?: string;
-    errandId?: string;
-    authorizationUrl?: string;
-    accessCode?: string;
-    generationType?: InvoiceGenerationType | `${InvoiceGenerationType}`;
-    startDate?: string;
-    endDate?: string;
-    dueDate?: string;
-    invoiceNumber?: string;
-    isErrandsPaid?: boolean;
+    customerId: string;
     items: InvoiceItem[];
-    businessId?: string;
     createdAt: string;
     updatedAt: string;
+    customerDetails?: Customer;
+    paidErrandsCount?: number;
+    unpaidErrandsCount?: number;
 }
 interface InvoiceItem {
     id: string;
     invoiceId: string;
     itemType: InvoiceItemType | `${InvoiceItemType}`;
     itemId: string;
-    item: Errand;
     amount: number;
     description: string;
     date: string;
     createdAt: string;
     updatedAt: string;
+    itemDetails?: Errand;
 }
 
 type Rider = {
@@ -360,13 +323,7 @@ interface Errand {
     parcelSize: `${ParcelSize}`;
     deliveryStatus: ErrandStatus | `${ErrandStatus}`;
     paymentStatus: `${InvoiceStatus}`;
-    invoice: {
-        invoiceStatus: InvoiceStatus | `${InvoiceStatus}`;
-        refId: string;
-        authorizationUrl: string;
-        accessCode: string;
-        invoiceId?: string | Invoice;
-    };
+    invoiceId?: string;
     aliasId: string;
     updatedAt: Date;
     createdAt: Date;
@@ -538,6 +495,61 @@ type Notification = {
     updatedAt: string;
 };
 
+declare enum EnterpriseType {
+    Restaurant = "restaurant",
+    Dispatch = "dispatch",
+    Property = "property",
+    Store = "store"
+}
+type Enterprise = {
+    id: string;
+    user: string | User;
+    name: string;
+    city: string;
+    verified: boolean;
+    mobileNumber?: string;
+    enterpriseType: EnterpriseType | `${EnterpriseType}`;
+    deleted: boolean;
+    updatedAt: Date;
+    createdAt: Date;
+    isActive: boolean;
+    version: number;
+    officeNumber?: string;
+    address?: {
+        coordinates?: number[];
+        address?: string;
+    };
+    image?: string;
+    coverImage?: string;
+    activationDate?: string;
+    category: EnterpriseCategoryDoc[] | string[];
+    subCategory: EnterpriseSubCategoryDoc[] | string[];
+    socialLinks: {
+        name: string;
+        url: string;
+        active: boolean;
+    }[];
+};
+interface EnterpriseCategoryDoc {
+    id: string;
+    name: string;
+    slug: string;
+    subCategories: EnterpriseSubCategoryDoc[];
+    updatedAt: string;
+    createdAt: string;
+    image?: string;
+}
+interface EnterpriseSubCategoryDoc {
+    id: string;
+    name: string;
+    category: string;
+    slug: string;
+    image?: string;
+    serviceItems: string[];
+    updatedAt: string;
+    createdAt: string;
+}
+
 interface Business {
     id: string;
     userId: string;
@@ -613,28 +625,6 @@ interface BusinessMember {
     updatedAt: string | NullOrUndefined;
 }
 
-interface CustomerTransactionStats {
-    totalSaleCount: number;
-    totalSaleAmount: number;
-    totalExpenseCount: number;
-    totalExpenseAmount: number;
-    lastTransactionDate: string | null;
-    updatedAt: string;
-}
-interface Customer {
-    id: string;
-    businessId: string;
-    phoneNumber: string;
-    fullName: string;
-    cityId: string;
-    address: string;
-    landmark?: string;
-    createdAt: string;
-    updatedAt: string;
-    customerBusinessId?: string;
-    transactionStats?: CustomerTransactionStats;
-}
-
 type TransactionType = 'sale' | 'expense';
 interface TransactionItem {
     name: string;

package/dist/index.d.ts

@@ -107,59 +107,26 @@ interface Coupon {
     fullName?: string;
 }
 
-declare enum EnterpriseType {
-    Restaurant = "restaurant",
-    Dispatch = "dispatch",
-    Property = "property",
-    Store = "store"
-}
-type Enterprise = {
-    id: string;
-    user: string | User;
-    name: string;
-    city: string;
-    verified: boolean;
-    mobileNumber?: string;
-    enterpriseType: EnterpriseType | `${EnterpriseType}`;
-    deleted: boolean;
-    updatedAt: Date;
-    createdAt: Date;
-    isActive: boolean;
-    version: number;
-    officeNumber?: string;
-    address?: {
-        coordinates?: number[];
-        address?: string;
-    };
-    image?: string;
-    coverImage?: string;
-    activationDate?: string;
-    category: EnterpriseCategoryDoc[] | string[];
-    subCategory: EnterpriseSubCategoryDoc[] | string[];
-    socialLinks: {
-        name: string;
-        url: string;
-        active: boolean;
-    }[];
-};
-interface EnterpriseCategoryDoc {
-    id: string;
-    name: string;
-    slug: string;
-    subCategories: EnterpriseSubCategoryDoc[];
+interface CustomerTransactionStats {
+    totalSaleCount: number;
+    totalSaleAmount: number;
+    totalExpenseCount: number;
+    totalExpenseAmount: number;
+    lastTransactionDate: string | null;
     updatedAt: string;
-    createdAt: string;
-    image?: string;
 }
-interface EnterpriseSubCategoryDoc {
+interface Customer {
     id: string;
-    name: string;
-    category: string;
-    slug: string;
-    image?: string;
-    serviceItems: string[];
-    updatedAt: string;
+    businessId: string;
+    phoneNumber: string;
+    fullName: string;
+    cityId: string;
+    address: string;
+    landmark?: string;
     createdAt: string;
+    updatedAt: string;
+    customerBusinessId?: string;
+    transactionStats?: CustomerTransactionStats;
 }
 
 declare enum InvoiceStatus {
@@ -183,38 +150,34 @@ declare enum PaymentOptions {
 }
 interface Invoice {
     id: string;
-    user: string;
-    invoiceType: EnterpriseType | `${EnterpriseType}`;
-    amount: number;
-    paymentType: PaymentOptions | `${PaymentOptions}`;
+    businessId: string;
+    userId: string;
+    invoiceNumber: string;
+    startDate: string;
+    endDate: string;
+    totalAmount: number;
+    paidAmount: number;
+    unpaidAmount: number;
     status: InvoiceStatus | `${InvoiceStatus}`;
-    version: number;
-    referenceId?: string;
-    errandId?: string;
-    authorizationUrl?: string;
-    accessCode?: string;
-    generationType?: InvoiceGenerationType | `${InvoiceGenerationType}`;
-    startDate?: string;
-    endDate?: string;
-    dueDate?: string;
-    invoiceNumber?: string;
-    isErrandsPaid?: boolean;
+    customerId: string;
     items: InvoiceItem[];
-    businessId?: string;
     createdAt: string;
     updatedAt: string;
+    customerDetails?: Customer;
+    paidErrandsCount?: number;
+    unpaidErrandsCount?: number;
 }
 interface InvoiceItem {
     id: string;
     invoiceId: string;
     itemType: InvoiceItemType | `${InvoiceItemType}`;
     itemId: string;
-    item: Errand;
     amount: number;
     description: string;
     date: string;
     createdAt: string;
     updatedAt: string;
+    itemDetails?: Errand;
 }
 
 type Rider = {
@@ -360,13 +323,7 @@ interface Errand {
     parcelSize: `${ParcelSize}`;
     deliveryStatus: ErrandStatus | `${ErrandStatus}`;
     paymentStatus: `${InvoiceStatus}`;
-    invoice: {
-        invoiceStatus: InvoiceStatus | `${InvoiceStatus}`;
-        refId: string;
-        authorizationUrl: string;
-        accessCode: string;
-        invoiceId?: string | Invoice;
-    };
+    invoiceId?: string;
     aliasId: string;
     updatedAt: Date;
     createdAt: Date;
@@ -538,6 +495,61 @@ type Notification = {
     updatedAt: string;
 };
 
+declare enum EnterpriseType {
+    Restaurant = "restaurant",
+    Dispatch = "dispatch",
+    Property = "property",
+    Store = "store"
+}
+type Enterprise = {
+    id: string;
+    user: string | User;
+    name: string;
+    city: string;
+    verified: boolean;
+    mobileNumber?: string;
+    enterpriseType: EnterpriseType | `${EnterpriseType}`;
+    deleted: boolean;
+    updatedAt: Date;
+    createdAt: Date;
+    isActive: boolean;
+    version: number;
+    officeNumber?: string;
+    address?: {
+        coordinates?: number[];
+        address?: string;
+    };
+    image?: string;
+    coverImage?: string;
+    activationDate?: string;
+    category: EnterpriseCategoryDoc[] | string[];
+    subCategory: EnterpriseSubCategoryDoc[] | string[];
+    socialLinks: {
+        name: string;
+        url: string;
+        active: boolean;
+    }[];
+};
+interface EnterpriseCategoryDoc {
+    id: string;
+    name: string;
+    slug: string;
+    subCategories: EnterpriseSubCategoryDoc[];
+    updatedAt: string;
+    createdAt: string;
+    image?: string;
+}
+interface EnterpriseSubCategoryDoc {
+    id: string;
+    name: string;
+    category: string;
+    slug: string;
+    image?: string;
+    serviceItems: string[];
+    updatedAt: string;
+    createdAt: string;
+}
+
 interface Business {
     id: string;
     userId: string;
@@ -613,28 +625,6 @@ interface BusinessMember {
     updatedAt: string | NullOrUndefined;
 }
 
-interface CustomerTransactionStats {
-    totalSaleCount: number;
-    totalSaleAmount: number;
-    totalExpenseCount: number;
-    totalExpenseAmount: number;
-    lastTransactionDate: string | null;
-    updatedAt: string;
-}
-interface Customer {
-    id: string;
-    businessId: string;
-    phoneNumber: string;
-    fullName: string;
-    cityId: string;
-    address: string;
-    landmark?: string;
-    createdAt: string;
-    updatedAt: string;
-    customerBusinessId?: string;
-    transactionStats?: CustomerTransactionStats;
-}
-
 type TransactionType = 'sale' | 'expense';
 interface TransactionItem {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mydoormot/app-types",
-  "version": "1.7.15",
+  "version": "1.7.17",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

package/src/errand.ts

@@ -129,13 +129,15 @@ export interface Errand {
   parcelSize: `${ParcelSize}`;
   deliveryStatus: ErrandStatus | `${ErrandStatus}`;
   paymentStatus: `${InvoiceStatus}`;
-  invoice: {
-    invoiceStatus: InvoiceStatus | `${InvoiceStatus}`;
-    refId: string;
-    authorizationUrl: string;
-    accessCode: string;
-    invoiceId?: string | Invoice;
-  };
+  invoiceId?: string;
+
+  // invoice: {
+  //   invoiceStatus: InvoiceStatus | `${InvoiceStatus}`;
+  //   refId: string;
+  //   authorizationUrl: string;
+  //   accessCode: string;
+  //   invoiceId?: string | Invoice;
+  // };
   aliasId: string;
   updatedAt: Date;
   createdAt: Date;

package/src/invoice.ts

@@ -1,4 +1,4 @@
-import { EnterpriseType } from './enterprise';
+import { Customer } from './customer';
 import { Errand } from './errand';
 
 export enum InvoiceStatus {
@@ -27,26 +27,23 @@ export enum PaymentOptions {
 
 export interface Invoice {
   id: string;
-  user: string;
-  invoiceType: EnterpriseType | `${EnterpriseType}`;
-  amount: number;
-  paymentType: PaymentOptions | `${PaymentOptions}`;
+  businessId: string;
+  userId: string;
+  invoiceNumber: string;
+  startDate: string;
+  endDate: string;
+  totalAmount: number;
+  paidAmount: number;
+  unpaidAmount: number;
   status: InvoiceStatus | `${InvoiceStatus}`;
-  version: number;
-  referenceId?: string;
-  errandId?: string;
-  authorizationUrl?: string;
-  accessCode?: string;
-  generationType?: InvoiceGenerationType | `${InvoiceGenerationType}`;
-  startDate?: string;
-  endDate?: string;
-  dueDate?: string;
-  invoiceNumber?: string;
-  isErrandsPaid?: boolean;
+  customerId: string;
   items: InvoiceItem[];
-  businessId?: string;
   createdAt: string;
   updatedAt: string;
+
+  customerDetails?: Customer;
+  paidErrandsCount?: number;
+  unpaidErrandsCount?: number;
 }
 
 export interface InvoiceItem {
@@ -54,10 +51,12 @@ export interface InvoiceItem {
   invoiceId: string;
   itemType: InvoiceItemType | `${InvoiceItemType}`;
   itemId: string;
-  item: Errand;
+  // item: Errand;
   amount: number;
   description: string;
   date: string;
   createdAt: string;
   updatedAt: string;
+
+  itemDetails?: Errand;
 }