@glissandoo/lib 1.100.0 → 1.102.0

package/functions/index.d.ts

@@ -114,18 +114,36 @@ export declare enum FbFunctionName {
     OfferSelectApplicant = "offer-selectApplicant",
     OfferView = "offer-view",
     OfferViewApplicant = "offer-viewApplicant",
-    PartnershipAddConfirmedAdmin = "partnership-addConfirmedAdmin",
     PartnershipCreate = "partnership-create",
+    PartnershipPublish = "partnership-publish",
     PartnershipEdit = "partnership-edit",
-    PartnershipGroupAdd = "partnershipGroup-add",
-    PartnershipGroupRemove = "partnershipGroup-remove",
     PartnershipOnUpdate = "partnership-onUpdate",
-    PartnershipPublish = "partnership-publish",
     PartnershipRemove = "partnership-remove",
+    PartnershipOnDelete = "partnership-onDelete",
+    PartnershipAddConfirmedAdmin = "partnership-addConfirmedAdmin",
     PartnershipRemoveAdmin = "partnership-removeAdmin",
+    PartnershipGroupAdd = "partnershipGroup-add",
+    PartnershipGroupRemove = "partnershipGroup-remove",
     PartnershipPartnerCreate = "partnershipPartner-create",
     PartnershipPartnerEdit = "partnershipPartner-edit",
+    PartnershipPartnerOnWrite = "partnershipPartner-onWrite",
     PartnershipPartnerRemove = "partnershipPartner-remove",
+    PartnershipPaymentCreateOneTime = "partnershipPayment-createOneTime",
+    PartnershipPaymentGenerateRecurringBySubscriptions = "partnershipPayment-generateRecurringBySubscriptions",
+    PartnershipPaymentEdit = "partnershipPayment-edit",
+    PartnershipPaymentOnUpdate = "partnershipPayment-onUpdate",
+    PartnershipPaymentRemove = "partnershipPayment-remove",
+    PartnershipPlanCreate = "partnershipPlan-create",
+    PartnershipPlanEdit = "partnershipPlan-edit",
+    PartnershipPlanRemove = "partnershipPlan-remove",
+    PartnershipSepaPaymentGroupCreate = "partnershipSepaPaymentGroup-create",
+    PartnershipSepaPaymentGroupEdit = "partnershipSepaPaymentGroup-edit",
+    PartnershipSepaPaymentGroupOnUpdate = "partnershipSepaPaymentGroup-onUpdate",
+    PartnershipSepaPaymentGroupRemove = "partnershipSepaPaymentGroup-remove",
+    PartnershipSubscriptionCreate = "partnershipSubscription-create",
+    PartnershipSubscriptionEdit = "partnershipSubscription-edit",
+    PartnershipSubscriptionOnWrite = "partnershipSubscription-onWrite",
+    PartnershipSubscriptionRemove = "partnershipSubscription-remove",
     ReminderBiweeklyEventsEmail = "reminder-biweeklyEventsEmail",
     ReminderDatetime = "reminder-datetime",
     ReminderResponseDeadlineEnded = "reminder-responseDeadlineEnded",

package/functions/index.js

@@ -118,18 +118,36 @@ var FbFunctionName;
     FbFunctionName["OfferSelectApplicant"] = "offer-selectApplicant";
     FbFunctionName["OfferView"] = "offer-view";
     FbFunctionName["OfferViewApplicant"] = "offer-viewApplicant";
-    FbFunctionName["PartnershipAddConfirmedAdmin"] = "partnership-addConfirmedAdmin";
     FbFunctionName["PartnershipCreate"] = "partnership-create";
+    FbFunctionName["PartnershipPublish"] = "partnership-publish";
     FbFunctionName["PartnershipEdit"] = "partnership-edit";
-    FbFunctionName["PartnershipGroupAdd"] = "partnershipGroup-add";
-    FbFunctionName["PartnershipGroupRemove"] = "partnershipGroup-remove";
     FbFunctionName["PartnershipOnUpdate"] = "partnership-onUpdate";
-    FbFunctionName["PartnershipPublish"] = "partnership-publish";
     FbFunctionName["PartnershipRemove"] = "partnership-remove";
+    FbFunctionName["PartnershipOnDelete"] = "partnership-onDelete";
+    FbFunctionName["PartnershipAddConfirmedAdmin"] = "partnership-addConfirmedAdmin";
     FbFunctionName["PartnershipRemoveAdmin"] = "partnership-removeAdmin";
+    FbFunctionName["PartnershipGroupAdd"] = "partnershipGroup-add";
+    FbFunctionName["PartnershipGroupRemove"] = "partnershipGroup-remove";
     FbFunctionName["PartnershipPartnerCreate"] = "partnershipPartner-create";
     FbFunctionName["PartnershipPartnerEdit"] = "partnershipPartner-edit";
+    FbFunctionName["PartnershipPartnerOnWrite"] = "partnershipPartner-onWrite";
     FbFunctionName["PartnershipPartnerRemove"] = "partnershipPartner-remove";
+    FbFunctionName["PartnershipPaymentCreateOneTime"] = "partnershipPayment-createOneTime";
+    FbFunctionName["PartnershipPaymentGenerateRecurringBySubscriptions"] = "partnershipPayment-generateRecurringBySubscriptions";
+    FbFunctionName["PartnershipPaymentEdit"] = "partnershipPayment-edit";
+    FbFunctionName["PartnershipPaymentOnUpdate"] = "partnershipPayment-onUpdate";
+    FbFunctionName["PartnershipPaymentRemove"] = "partnershipPayment-remove";
+    FbFunctionName["PartnershipPlanCreate"] = "partnershipPlan-create";
+    FbFunctionName["PartnershipPlanEdit"] = "partnershipPlan-edit";
+    FbFunctionName["PartnershipPlanRemove"] = "partnershipPlan-remove";
+    FbFunctionName["PartnershipSepaPaymentGroupCreate"] = "partnershipSepaPaymentGroup-create";
+    FbFunctionName["PartnershipSepaPaymentGroupEdit"] = "partnershipSepaPaymentGroup-edit";
+    FbFunctionName["PartnershipSepaPaymentGroupOnUpdate"] = "partnershipSepaPaymentGroup-onUpdate";
+    FbFunctionName["PartnershipSepaPaymentGroupRemove"] = "partnershipSepaPaymentGroup-remove";
+    FbFunctionName["PartnershipSubscriptionCreate"] = "partnershipSubscription-create";
+    FbFunctionName["PartnershipSubscriptionEdit"] = "partnershipSubscription-edit";
+    FbFunctionName["PartnershipSubscriptionOnWrite"] = "partnershipSubscription-onWrite";
+    FbFunctionName["PartnershipSubscriptionRemove"] = "partnershipSubscription-remove";
     FbFunctionName["ReminderBiweeklyEventsEmail"] = "reminder-biweeklyEventsEmail";
     FbFunctionName["ReminderDatetime"] = "reminder-datetime";
     FbFunctionName["ReminderResponseDeadlineEnded"] = "reminder-responseDeadlineEnded";

package/functions/partnershipPayment.d.ts

@@ -0,0 +1,29 @@
+import { PaymentStatus } from '../models/Partnership/Payment/types';
+import { PaymentMethod } from '../models/Partnership/Plan/types';
+export declare namespace PartnershipPaymentFbFunctionsTypes {
+    interface CreateOneTimeData {
+        title: string;
+        amount: number;
+        partnerId: string;
+        paymentMethod: PaymentMethod;
+    }
+    interface CreateOneTimeParams extends CreateOneTimeData {
+        partnershipId: string;
+        paymentId: string;
+    }
+    type CreateOneTimeResult = void;
+    interface EditParams {
+        partnershipId: string;
+        paymentId: string;
+        title?: string;
+        amount?: number;
+        paymentMethod?: PaymentMethod;
+        status?: PaymentStatus;
+    }
+    type EditResult = void;
+    type RemoveParams = {
+        partnershipId: string;
+        paymentId: string;
+    };
+    type RemoveResult = void;
+}

package/functions/partnershipPayment.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/functions/partnershipSepaPaymentGroup.d.ts

@@ -0,0 +1,20 @@
+export declare namespace PartnershipSepaPaymentGroupFbFunctionsTypes {
+    interface CreateData {
+        paymentsIds: string[];
+    }
+    interface CreateParams extends CreateData {
+        partnershipId: string;
+        sepaPaymentGroupId: string;
+    }
+    type CreateResult = void;
+    interface EditParams extends Partial<CreateData> {
+        partnershipId: string;
+        sepaPaymentGroupId: string;
+    }
+    type EditResult = void;
+    type RemoveParams = {
+        partnershipId: string;
+        sepaPaymentGroupId: string;
+    };
+    type RemoveResult = void;
+}

package/functions/partnershipSepaPaymentGroup.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/functions/partnershipSubscription.d.ts

@@ -12,7 +12,8 @@ export declare namespace PartnershipSubscriptionFbFunctionsTypes {
     interface EditParams {
         partnershipId: string;
         subscriptionId: string;
-        endDate: number | null;
+        nextPaymentDate?: number;
+        endDate?: number | null;
     }
     type EditResult = void;
     type RemoveParams = {

package/functions/regions.js

@@ -125,18 +125,36 @@ const regionByFunctions = {
     [index_1.FbFunctionName.OfferSelectApplicant]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferView]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.OfferViewApplicant]: GCloudRegions.EuropeWest6,
-    [index_1.FbFunctionName.PartnershipAddConfirmedAdmin]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipCreate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPublish]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipEdit]: GCloudRegions.EuropeWest6,
-    [index_1.FbFunctionName.PartnershipGroupAdd]: GCloudRegions.EuropeWest6,
-    [index_1.FbFunctionName.PartnershipGroupRemove]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipOnUpdate]: GCloudRegions.EuropeWest6,
-    [index_1.FbFunctionName.PartnershipPublish]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipOnDelete]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipAddConfirmedAdmin]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipRemoveAdmin]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipGroupAdd]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipGroupRemove]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPartnerCreate]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPartnerEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPartnerOnWrite]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.PartnershipPartnerRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPaymentCreateOneTime]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPaymentGenerateRecurringBySubscriptions]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPaymentEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPaymentOnUpdate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPaymentRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPlanCreate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPlanEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipPlanRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSepaPaymentGroupCreate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSepaPaymentGroupEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSepaPaymentGroupOnUpdate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSepaPaymentGroupRemove]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSubscriptionCreate]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSubscriptionEdit]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSubscriptionOnWrite]: GCloudRegions.EuropeWest6,
+    [index_1.FbFunctionName.PartnershipSubscriptionRemove]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.ReminderBiweeklyEventsEmail]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.ReminderDatetime]: GCloudRegions.EuropeWest6,
     [index_1.FbFunctionName.ReminderResponseDeadlineEnded]: GCloudRegions.EuropeWest6,

package/helpers/collections.d.ts

@@ -21,11 +21,12 @@ export declare enum CollectionNames {
     GroupStageTemplates = "stageTemplates",
     Metrics = "metrics",
     Partnership = "partnership",
-    PartnershipPartner = "partnershipPartner",
     PartnershipGroup = "partnershipGroup",
+    PartnershipPartner = "partnershipPartner",
+    PartnershipPlan = "partnershipPlan",
     PartnershipSubscription = "partnershipSubscription",
     PartnershipPayment = "partnershipPayment",
-    PartnershipPlan = "partnershipPlan",
+    PartnershipSepaPaymentGroup = "partnershipSepaPaymentGroup",
     Federation = "federation",
     FederationPartnerships = "partnerships",
     Offer = "offer",

package/helpers/collections.js

@@ -25,11 +25,12 @@ var CollectionNames;
     CollectionNames["GroupStageTemplates"] = "stageTemplates";
     CollectionNames["Metrics"] = "metrics";
     CollectionNames["Partnership"] = "partnership";
-    CollectionNames["PartnershipPartner"] = "partnershipPartner";
     CollectionNames["PartnershipGroup"] = "partnershipGroup";
+    CollectionNames["PartnershipPartner"] = "partnershipPartner";
+    CollectionNames["PartnershipPlan"] = "partnershipPlan";
     CollectionNames["PartnershipSubscription"] = "partnershipSubscription";
     CollectionNames["PartnershipPayment"] = "partnershipPayment";
-    CollectionNames["PartnershipPlan"] = "partnershipPlan";
+    CollectionNames["PartnershipSepaPaymentGroup"] = "partnershipSepaPaymentGroup";
     CollectionNames["Federation"] = "federation";
     CollectionNames["FederationPartnerships"] = "partnerships";
     CollectionNames["Offer"] = "offer";

package/helpers/errors.d.ts

@@ -26,9 +26,12 @@ export declare enum HttpsErrorMessages {
     InvalidPartnershipPartner = "error.partner.noValid",
     PartnershipPartnerNotSelf = "error.partner.notSelf",
     InvalidPartnershipPlan = "error.partnershipPlan.noValid",
+    PartnershipPlanFirstPaymentDateAfterEndDate = "error.partnershipPlan.firstPaymentDateAfterEndDate",
     PartnershipPlanWithSubscriptions = "error.partnershipPlan.withSubscriptions",
     InvalidPartnershipSubscription = "error.partnershipSubscription.noValid",
+    PartnershipSubscriptionNextPaymentDateAfterEndDate = "error.partnershipSubscription.nextPaymentDateAfterEndDate",
     InvalidPartnershipPayment = "error.partnershipPayment.noValid",
+    PartnershipPaymentInSepaPaymentGroup = "error.partnershipPayment.inSepaPaymentGroup",
     InvalidPartnershipSepaPaymentGroup = "error.partnershipSepaPaymentGroup.noValid",
     InvalidAdminPartnership = "error.partnership.noAdmin",
     InvalidAdminFederation = "error.federation.noAdmin",

package/helpers/errors.js

@@ -27,9 +27,12 @@ var HttpsErrorMessages;
     HttpsErrorMessages["InvalidPartnershipPartner"] = "error.partner.noValid";
     HttpsErrorMessages["PartnershipPartnerNotSelf"] = "error.partner.notSelf";
     HttpsErrorMessages["InvalidPartnershipPlan"] = "error.partnershipPlan.noValid";
+    HttpsErrorMessages["PartnershipPlanFirstPaymentDateAfterEndDate"] = "error.partnershipPlan.firstPaymentDateAfterEndDate";
     HttpsErrorMessages["PartnershipPlanWithSubscriptions"] = "error.partnershipPlan.withSubscriptions";
     HttpsErrorMessages["InvalidPartnershipSubscription"] = "error.partnershipSubscription.noValid";
+    HttpsErrorMessages["PartnershipSubscriptionNextPaymentDateAfterEndDate"] = "error.partnershipSubscription.nextPaymentDateAfterEndDate";
     HttpsErrorMessages["InvalidPartnershipPayment"] = "error.partnershipPayment.noValid";
+    HttpsErrorMessages["PartnershipPaymentInSepaPaymentGroup"] = "error.partnershipPayment.inSepaPaymentGroup";
     HttpsErrorMessages["InvalidPartnershipSepaPaymentGroup"] = "error.partnershipSepaPaymentGroup.noValid";
     HttpsErrorMessages["InvalidAdminPartnership"] = "error.partnership.noAdmin";
     HttpsErrorMessages["InvalidAdminFederation"] = "error.federation.noAdmin";

package/helpers/types.d.ts

@@ -15,6 +15,9 @@ export declare enum CreatedOn {
     App = "app",
     Dashboard = "dashboard"
 }
+export declare enum CreatedBy {
+    System = "system"
+}
 export interface BasicAddressData {
     street?: string;
     city?: string;

package/helpers/types.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayBasicAddress = exports.CreatedOn = exports.AdminItemStatus = void 0;
+exports.displayBasicAddress = exports.CreatedBy = exports.CreatedOn = exports.AdminItemStatus = void 0;
 const isString_1 = __importDefault(require("lodash/isString"));
 var AdminItemStatus;
 (function (AdminItemStatus) {
@@ -17,6 +17,10 @@ var CreatedOn;
     CreatedOn["App"] = "app";
     CreatedOn["Dashboard"] = "dashboard";
 })(CreatedOn = exports.CreatedOn || (exports.CreatedOn = {}));
+var CreatedBy;
+(function (CreatedBy) {
+    CreatedBy["System"] = "system";
+})(CreatedBy = exports.CreatedBy || (exports.CreatedBy = {}));
 function displayBasicAddress(address) {
     if (address === null || address === undefined)
         return null;

package/models/Partnership/Payment/index.d.ts

@@ -1,20 +1,25 @@
 import ModelWithLang from '../../Model/lang';
-import { PaymentData, PaymentType } from './types';
-export default class Payment extends ModelWithLang<PaymentData> {
-    get partnershipId(): string | null;
+import { PaymentMethod } from '../Plan/types';
+import { PartnershipPaymentData } from './types';
+export default class PartnershipPayment extends ModelWithLang<PartnershipPaymentData> {
+    get partnershipId(): string;
     get title(): string;
     get amount(): number;
     get displayAmount(): string;
-    get type(): PaymentType;
+    get subscriptionId(): string | null;
+    get partnerId(): string;
     get isRecurrent(): boolean;
     get isOneTime(): boolean;
-    get subscriptionId(): string | null;
-    get partnerId(): string | null;
-    get paymentMethod(): import("../Plan/types").PaymentMethod | null;
-    get history(): import("./types").PaymentHistoryItem[];
-    get historyOrdered(): import("./types").PaymentHistoryItem[];
+    get paymentMethod(): PaymentMethod;
+    get isMethodSepa(): boolean;
+    get status(): import("./types").PaymentStatus;
+    get statusHistory(): import("./types").PaymentStatusHistoryItem[];
+    get statusHistoryOrdered(): import("./types").PaymentStatusHistoryItem[];
+    get sepaPaymentGroupId(): string | null;
+    get isLinkedToSepaPaymentGroup(): boolean;
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdBy(): string | null;
     get editedAt(): FirebaseFirestore.Timestamp | null;
     get editedBy(): string | null;
+    get isActive(): boolean;
 }

package/models/Partnership/Payment/index.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
-const types_1 = require("./types");
-class Payment extends lang_1.default {
+const types_1 = require("../Plan/types");
+class PartnershipPayment extends lang_1.default {
     get partnershipId() {
-        return (0, utils_1.at)(this.ref.path.split('/'), 1);
+        return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
     get title() {
         return this.data.title;
@@ -19,29 +19,38 @@ class Payment extends lang_1.default {
     get displayAmount() {
         return `${this.amount} €`;
     }
-    get type() {
-        return this.data.type;
-    }
-    get isRecurrent() {
-        return this.type === types_1.PaymentType.Recurring;
-    }
-    get isOneTime() {
-        return this.type === types_1.PaymentType.OneTime;
-    }
     get subscriptionId() {
         return this.data.subscriptionId;
     }
     get partnerId() {
         return this.data.partnerId;
     }
+    get isRecurrent() {
+        return this.subscriptionId !== null;
+    }
+    get isOneTime() {
+        return this.subscriptionId === null;
+    }
     get paymentMethod() {
         return this.data.paymentMethod;
     }
-    get history() {
-        return this.data.history || [];
+    get isMethodSepa() {
+        return this.paymentMethod === types_1.PaymentMethod.SEPA;
+    }
+    get status() {
+        return this.data.status;
+    }
+    get statusHistory() {
+        return this.data.statusHistory;
     }
-    get historyOrdered() {
-        return this.history.sort((a, b) => a.changedAt.toMillis() < b.changedAt.toMillis() ? 1 : -1);
+    get statusHistoryOrdered() {
+        return this.statusHistory.sort((a, b) => a.changedAt.toMillis() < b.changedAt.toMillis() ? 1 : -1);
+    }
+    get sepaPaymentGroupId() {
+        return this.data.sepaPaymentGroupId || null;
+    }
+    get isLinkedToSepaPaymentGroup() {
+        return !!this.sepaPaymentGroupId;
     }
     get createdAt() {
         return this.data.createdAt;
@@ -55,5 +64,8 @@ class Payment extends lang_1.default {
     get editedBy() {
         return this.data.editedBy || null;
     }
+    get isActive() {
+        return this.exists;
+    }
 }
-exports.default = Payment;
+exports.default = PartnershipPayment;

package/models/Partnership/Payment/types.d.ts

@@ -1,27 +1,24 @@
 import { Timestamp } from '@google-cloud/firestore';
 import { PaymentMethod } from '../Plan/types';
-export declare enum PaymentType {
-    Recurring = "RCUR",
-    OneTime = "OOFF"
-}
 export declare enum PaymentStatus {
     Pending = "pending",
     Charged = "charged",
     Canceled = "canceled"
 }
-export interface PaymentHistoryItem {
+export interface PaymentStatusHistoryItem {
     status: PaymentStatus;
     changedAt: Timestamp;
     changedBy: string;
 }
-export interface PaymentData {
+export interface PartnershipPaymentData {
     title: string;
     amount: number;
-    type: PaymentType;
+    paymentMethod: PaymentMethod;
     subscriptionId: string | null;
-    partnerId: string | null;
-    paymentMethod: PaymentMethod | null;
-    history: PaymentHistoryItem[];
+    partnerId: string;
+    status: PaymentStatus;
+    statusHistory: PaymentStatusHistoryItem[];
+    sepaPaymentGroupId: string | null;
     createdAt: Timestamp;
     createdBy: string | null;
     editedAt: Timestamp | null;

package/models/Partnership/Payment/types.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentStatus = exports.PaymentType = void 0;
-var PaymentType;
-(function (PaymentType) {
-    PaymentType["Recurring"] = "RCUR";
-    PaymentType["OneTime"] = "OOFF";
-})(PaymentType = exports.PaymentType || (exports.PaymentType = {}));
+exports.PaymentStatus = void 0;
 var PaymentStatus;
 (function (PaymentStatus) {
     PaymentStatus["Pending"] = "pending";

package/models/Partnership/Plan/index.js

@@ -22,7 +22,7 @@ class PartnershipPlan extends lang_1.default {
             : date;
     }
     setPaymentDate(date) {
-        return this.setPaymentMonth(this.setPaymentDay(date));
+        return (0, date_fns_1.startOfDay)(this.setPaymentMonth(this.setPaymentDay(date)));
     }
     getNextPaymentDate(base) {
         const newDate = (0, date_fns_1.addMonths)(base, this.schedule.periodInMonths);

package/models/Partnership/Plan/types.d.ts

@@ -1,5 +1,7 @@
 import { Timestamp } from '@google-cloud/firestore';
 export declare enum PaymentMethod {
+    Cash = "CASH",
+    Transfer = "TRANSFER",
     SEPA = "SEPA"
 }
 export interface PlanScheduleType {

package/models/Partnership/Plan/types.js

@@ -3,5 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentMethod = void 0;
 var PaymentMethod;
 (function (PaymentMethod) {
+    PaymentMethod["Cash"] = "CASH";
+    PaymentMethod["Transfer"] = "TRANSFER";
     PaymentMethod["SEPA"] = "SEPA";
 })(PaymentMethod = exports.PaymentMethod || (exports.PaymentMethod = {}));

package/models/Partnership/SepaPaymentGroup/index.d.ts

@@ -1,12 +1,13 @@
 import ModelWithLang from '../../Model/lang';
-import { SepaPaymentGroupData } from './types';
-export default class PartnerSepaPaymentGroup extends ModelWithLang<SepaPaymentGroupData> {
+import { PartnershipSepaPaymentGroupData } from './types';
+export default class PartnershipSepaPaymentGroup extends ModelWithLang<PartnershipSepaPaymentGroupData> {
     get partnershipId(): string;
     get creditorInfo(): import("../types").PartnershipSepaCreditorInfo;
-    get filePath(): string | null;
     get paymentsIds(): string[];
+    get filePath(): string | null;
     get createdAt(): import("../../../types/firestore").Timestamp;
     get createdBy(): string;
     get editedAt(): import("../../../types/firestore").Timestamp | null;
     get editedBy(): string | null;
+    get isActive(): boolean;
 }

package/models/Partnership/SepaPaymentGroup/index.js

@@ -5,19 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../helpers/utils");
 const lang_1 = __importDefault(require("../../Model/lang"));
-class PartnerSepaPaymentGroup extends lang_1.default {
+class PartnershipSepaPaymentGroup extends lang_1.default {
     get partnershipId() {
         return (0, utils_1.at)(this.ref.path.split('/'), 1) || '';
     }
     get creditorInfo() {
         return this.data.creditorInfo;
     }
-    get filePath() {
-        return this.data.filePath || null;
-    }
     get paymentsIds() {
         return this.data.paymentsIds || [];
     }
+    get filePath() {
+        return this.data.filePath || null;
+    }
     get createdAt() {
         return this.data.createdAt;
     }
@@ -30,5 +30,8 @@ class PartnerSepaPaymentGroup extends lang_1.default {
     get editedBy() {
         return this.data.editedBy || null;
     }
+    get isActive() {
+        return this.exists;
+    }
 }
-exports.default = PartnerSepaPaymentGroup;
+exports.default = PartnershipSepaPaymentGroup;

package/models/Partnership/SepaPaymentGroup/types.d.ts

@@ -1,11 +1,11 @@
 import { Timestamp } from '../../../types/firestore';
 import { PartnershipSepaCreditorInfo } from '../types';
-export interface SepaPaymentGroupData {
+export interface PartnershipSepaPaymentGroupData {
     creditorInfo: PartnershipSepaCreditorInfo;
+    paymentsIds: string[];
     filePath: string | null;
     createdAt: Timestamp;
     createdBy: string;
-    paymentsIds: string[];
     editedAt: Timestamp | null;
     editedBy: string | null;
 }

package/models/Partnership/Subscription/index.d.ts

@@ -4,7 +4,9 @@ export default class PartnershipSubscription extends Model<PartnershipSubscripti
     get partnershipId(): string;
     get planId(): string;
     get partnerId(): string;
+    get nextPaymentDate(): FirebaseFirestore.Timestamp;
     get endDate(): FirebaseFirestore.Timestamp | null;
+    get isEnded(): boolean;
     get createdAt(): FirebaseFirestore.Timestamp;
     get createdBy(): string;
     get editedAt(): FirebaseFirestore.Timestamp | null;

package/models/Partnership/Subscription/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const date_fns_1 = require("date-fns");
 const utils_1 = require("../../../helpers/utils");
 const Model_1 = __importDefault(require("../../Model"));
 class PartnershipSubscription extends Model_1.default {
@@ -15,9 +16,15 @@ class PartnershipSubscription extends Model_1.default {
     get partnerId() {
         return this.data.partnerId;
     }
+    get nextPaymentDate() {
+        return this.data.nextPaymentDate;
+    }
     get endDate() {
         return this.data.endDate || null;
     }
+    get isEnded() {
+        return this.endDate ? (0, date_fns_1.isPast)(this.endDate.toDate()) : false;
+    }
     get createdAt() {
         return this.data.createdAt;
     }
@@ -40,7 +47,7 @@ class PartnershipSubscription extends Model_1.default {
         return this.deletedAt !== null;
     }
     get isActive() {
-        return this.exists && !this.data.deletedAt;
+        return this.exists && !this.isDeleted;
     }
 }
 exports.default = PartnershipSubscription;

package/models/Partnership/Subscription/types.d.ts

@@ -2,6 +2,7 @@ import { Timestamp } from '@google-cloud/firestore';
 export interface PartnershipSubscriptionData {
     planId: string;
     partnerId: string;
+    nextPaymentDate: Timestamp;
     endDate: Timestamp | null;
     createdAt: Timestamp;
     createdBy: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@glissandoo/lib",
-	"version": "1.100.0",
+	"version": "1.102.0",
 	"description": "Glissandoo library js",
 	"main": "./index.js",
 	"types": "./index.d.ts",