@exclusive-website/types 2.5.6 → 2.5.7

package/dist/filterEnums.d.ts

@@ -256,3 +256,7 @@ export declare enum TransactionStatus {
     CANCELLED = "CANCELLED",
     NONE = "NONE"
 }
+export declare enum ApplyStatus {
+    APPLIED = "APPLIED",
+    UNAPPLIED = "UNAPPLIED"
+}

package/dist/filterEnums.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionStatus = exports.ApprovedState = exports.StateOfListing = exports.PricingCategory = exports.Currency = exports.Availability = exports.HairLength = exports.HairColor = exports.ShaveStatus = exports.OtherPractise = exports.Practise = exports.UserRole = exports.ServicesFor = exports.ContactMethod = exports.NationalityOption = exports.BreastSize = exports.AvailabilityStatus = exports.AgeRange = exports.Language = exports.DayOfWeek = exports.City = exports.Region = exports.Country = exports.ServiceType = exports.ExperienceLevel = exports.SexualOrientation = exports.DayStatus = void 0;
+exports.ApplyStatus = exports.TransactionStatus = exports.ApprovedState = exports.StateOfListing = exports.PricingCategory = exports.Currency = exports.Availability = exports.HairLength = exports.HairColor = exports.ShaveStatus = exports.OtherPractise = exports.Practise = exports.UserRole = exports.ServicesFor = exports.ContactMethod = exports.NationalityOption = exports.BreastSize = exports.AvailabilityStatus = exports.AgeRange = exports.Language = exports.DayOfWeek = exports.City = exports.Region = exports.Country = exports.ServiceType = exports.ExperienceLevel = exports.SexualOrientation = exports.DayStatus = void 0;
 // DAY STATUS
 var DayStatus;
 (function (DayStatus) {
@@ -303,3 +303,8 @@ var TransactionStatus;
     TransactionStatus["CANCELLED"] = "CANCELLED";
     TransactionStatus["NONE"] = "NONE";
 })(TransactionStatus = exports.TransactionStatus || (exports.TransactionStatus = {}));
+var ApplyStatus;
+(function (ApplyStatus) {
+    ApplyStatus["APPLIED"] = "APPLIED";
+    ApplyStatus["UNAPPLIED"] = "UNAPPLIED";
+})(ApplyStatus = exports.ApplyStatus || (exports.ApplyStatus = {}));

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import { Availability, ContactMethod, Currency, DayOfWeek, DayStatus, ExperienceLevel, HairColor, HairLength, Language, NationalityOption, OtherPractise, Practise, PricingCategory, ServicesFor, ServiceType, SexualOrientation, ShaveStatus, StateOfListing, TransactionStatus, UserRole } from "./filterEnums";
+import { ApplyStatus, Availability, ContactMethod, Currency, DayOfWeek, DayStatus, ExperienceLevel, HairColor, HairLength, Language, NationalityOption, OtherPractise, Practise, PricingCategory, ServicesFor, ServiceType, SexualOrientation, ShaveStatus, StateOfListing, TransactionStatus, UserRole } from "./filterEnums";
 export interface ModelWriteDto {
     nickname: string;
     phoneNumber: string;
@@ -279,14 +279,24 @@ export interface ModelAdminDetailReadDto {
     schedule: DaySchedule[];
     created: Date;
     approvedState: StateOfListing;
-    paymentState: TransactionStatus;
-    activeTransaction: TransactionReadDto;
+    transactionStatus: TransactionStatus;
+    activeTransaction: ActiveTransactionReadDto;
+}
+export interface ActiveTransactionReadDto {
+    status: TransactionStatus;
+    applied: ApplyStatus;
+    totalAmount: number;
+    currency: Currency;
+    createdAt: Date;
+    items: TransactionReadItemDto[];
 }
-export interface TransactionReadDto {
+export interface HistoryTransactionReadDto {
     status: TransactionStatus;
+    applied: ApplyStatus;
     totalAmount: number;
     currency: Currency;
     createdAt: Date;
+    paidAt: Date;
     items: TransactionReadItemDto[];
 }
 export interface TransactionSummaryReadDto {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exclusive-website/types",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "description": "A collection of shared types (DTOs and DBEs) for the organization",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/filterEnums.ts

@@ -306,4 +306,9 @@ export enum TransactionStatus {
     UNPAID = "UNPAID",
     CANCELLED = "CANCELLED",
     NONE = "NONE",
+}
+
+export enum ApplyStatus {
+    APPLIED = "APPLIED",
+    UNAPPLIED = "UNAPPLIED",
 }

package/src/types.ts

@@ -1,4 +1,5 @@
 import {
+    ApplyStatus,
     Availability,
     ContactMethod,
     Currency,
@@ -333,15 +334,26 @@ export interface ModelAdminDetailReadDto {
     schedule: DaySchedule[];
     created: Date;
     approvedState: StateOfListing;
-    paymentState: TransactionStatus;
-    activeTransaction: TransactionReadDto;
+    transactionStatus: TransactionStatus;
+    activeTransaction: ActiveTransactionReadDto;
+}
+
+export interface ActiveTransactionReadDto {
+    status: TransactionStatus;
+    applied: ApplyStatus;
+    totalAmount: number;
+    currency: Currency
+    createdAt: Date;
+    items: TransactionReadItemDto[]
 }
 
-export interface TransactionReadDto {
+export interface HistoryTransactionReadDto {
     status: TransactionStatus;
+    applied: ApplyStatus;
     totalAmount: number;
     currency: Currency
     createdAt: Date;
+    paidAt: Date;
     items: TransactionReadItemDto[]
 }