@stamhoofd/structures 2.120.6 → 2.121.0

package/dist/billing/STPackage.d.ts

@@ -1,5 +1,6 @@
 import { AutoEncoder } from '@simonbackx/simple-encoding';
 import type { Address } from '../addresses/Address.js';
+import { STPackageBundle } from './STPackageBundle.js';
 export declare enum STPackageType {
     LegacyMembers = "LegacyMembers",
     Members = "Members",
@@ -10,6 +11,10 @@ export declare enum STPackageType {
 }
 export declare class STPackageTypeHelper {
     static getName(type: STPackageType): string;
+    /**
+     * Used for renewal. Should this package renew as what bundle?
+     */
+    static getBundle(type: STPackageType): STPackageBundle;
 }
 export declare enum STPricingType {
     Fixed = "Fixed",
@@ -28,11 +33,18 @@ export declare class STPackageMeta extends AutoEncoder {
     get isTrial(): boolean;
     get isWebshops(): boolean;
     /**
-     * ID of the package that was renewed (if it was renewed)
+     * When service fees or per member pricing is set, a mandate is required
+     */
+    get requiresMandate(): boolean;
+    /**
+     * @deprecated
+     * Not really trustworthy as it has not always been set correctly in the past
+     * and won't be set any longer
      */
     didRenewId?: string;
     type: STPackageType;
     pricingType: STPricingType;
+    keepPricesOnRenewal: boolean;
     /**
      * One time price for the package, per year, or per member depending on pricingType
      */
@@ -85,6 +97,7 @@ export declare class STPackageMeta extends AutoEncoder {
      */
     startDate: Date;
     canDeactivate: boolean;
+    get humanPricing(): string;
 }
 /**
  * A package contains a price agreement for a given period that might be renewable
@@ -101,7 +114,15 @@ export declare class STPackage extends AutoEncoder {
     validAt: Date | null;
     validUntil: Date | null;
     removeAt: Date | null;
-    shouldHintRenew(): boolean;
+    /**
+     * Helper to handle edge cases where validUntil is null but removeAt is set
+     */
+    get endDate(): Date | null;
+    get isActive(): boolean;
+    /**
+     * Package as if it has been renewed
+     */
+    createRenewed(): STPackage;
     get status(): STPackageStatus;
 }
 export declare class STPackageStatusServiceFee extends AutoEncoder {

package/dist/billing/STPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"STPackage.d.ts","sourceRoot":"","sources":["../../src/billing/STPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAkF,MAAM,6BAA6B,CAAC;AAKxJ,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGvD,oBAAY,aAAa;IAErB,aAAa,kBAAkB;IAG/B,OAAO,YAAY;IAGnB,QAAQ,aAAa;IAGrB,aAAa,kBAAkB;IAE/B,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;CAClC;AAED,qBAAa,mBAAmB;IAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM;CAgB9C;AAED,oBAAY,aAAa;IACrB,KAAK,UAAU;IAEf;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,SAAS,cAAc;CAC1B;AAED,qBAAa,aAAc,SAAQ,WAAW;IAC1C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,OAAO,YAEV;IAED,IAAI,UAAU,YAEb;IAED;;OAEG;IAEH,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,IAAI,EAAE,aAAa,CAAC;IAGpB,WAAW,gBAAuB;IAElC;;OAEG;IAGH,SAAS,SAAK;IAEd;;OAEG;IAEH,oBAAoB,SAAK;IAEzB;;OAEG;IAGH,eAAe,SAAK;IAEpB;;OAEG;IAGH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAExC;;OAEG;IAGH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAQ;IAExC;;;;;OAKG;IAEH,UAAU,SAAK;IAEf;;;;OAIG;IAGH,SAAS,SAAK;IAEd;;OAEG;IAEH,aAAa,SAAK;IAElB;;OAEG;IAEH,SAAS,UAAQ;IAEjB;;OAEG;IAEH,UAAU,UAAS;IAMnB,kBAAkB,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGvC,kBAAkB,SAAK;IAEvB;;OAEG;IAEH,SAAS,EAAE,IAAI,CAAC;IAGhB,aAAa,UAAS;CACzB;AAED;;GAEG;AACH,qBAAa,SAAU,SAAQ,WAAW;IAEtC,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,aAAa,CAAC;IAGpB,SAAS,OAAc;IAGvB,SAAS,OAAc;IAEvB;;;OAGG;IAEH,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG5B,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAI/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAE7B,eAAe;IAoBf,IAAI,MAAM,oBAOT;CACJ;AAED,qBAAa,yBAA0B,SAAQ,WAAW;IAGtD,KAAK,SAAK;IAGV,UAAU,SAAK;IAIf,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAI9B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG9B,SAAS,EAAE,IAAI,CAAC;IAGhB,OAAO,EAAE,IAAI,GAAG,IAAI,CAAQ;CAC/B;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAE5C,SAAS,EAAE,IAAI,CAAC;IAGhB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAI/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG7B,kBAAkB,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEvC;;OAEG;IAEH,WAAW,EAAE,yBAAyB,EAAE,CAAM;IAE9C,IAAI,iBAAiB,IAAI,yBAAyB,CAmCjD;IAED,IAAI,QAAQ,YAwBX;IAED;;OAEG;IACH,IAAI,SAAS,YA+BZ;IAED,IAAI,cAAc,IAAI,IAAI,GAAG,IAAI,CAqBhC;IAED,KAAK,CAAC,MAAM,EAAE,eAAe;CAmChC;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,UAoChF"}
+{"version":3,"file":"STPackage.d.ts","sourceRoot":"","sources":["../../src/billing/STPackage.ts"],"names":[],"mappings":"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"}

package/dist/billing/STPackage.js

@@ -4,6 +4,8 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { v4 as uuidv4 } from 'uuid';
 import { Country } from '@stamhoofd/types/Country';
 import { upgradePriceFrom2To4DecimalPlaces } from '../upgradePriceFrom2To4DecimalPlaces.js';
+import { STPackageBundle, STPackageBundleHelper } from './STPackageBundle.js';
+import { Formatter } from '@stamhoofd/utility';
 export var STPackageType;
 (function (STPackageType) {
     // Members without activities (not available in frontend anymore)
@@ -34,6 +36,23 @@ export class STPackageTypeHelper {
             case STPackageType.TrialWebshops: return $t(`%1Hm`);
         }
     }
+    /**
+     * Used for renewal. Should this package renew as what bundle?
+     */
+    static getBundle(type) {
+        switch (type) {
+            case STPackageType.LegacyMembers:
+            case STPackageType.Members:
+                return STPackageBundle.Members;
+            case STPackageType.Webshops:
+            case STPackageType.SingleWebshop:
+                return STPackageBundle.Webshops;
+            case STPackageType.TrialMembers:
+                return STPackageBundle.TrialMembers;
+            case STPackageType.TrialWebshops:
+                return STPackageBundle.TrialWebshops;
+        }
+    }
 }
 export var STPricingType;
 (function (STPricingType) {
@@ -59,11 +78,20 @@ export class STPackageMeta extends AutoEncoder {
         return this.type === STPackageType.Webshops || this.type === STPackageType.SingleWebshop || this.type === STPackageType.TrialWebshops;
     }
     /**
-     * ID of the package that was renewed (if it was renewed)
+     * When service fees or per member pricing is set, a mandate is required
+     */
+    get requiresMandate() {
+        return this.serviceFeeFixed !== 0 || this.serviceFeePercentage !== 0 || !!this.serviceFeeMinimum || (!!this.unitPrice && this.pricingType === STPricingType.PerMember);
+    }
+    /**
+     * @deprecated
+     * Not really trustworthy as it has not always been set correctly in the past
+     * and won't be set any longer
      */
     didRenewId;
     type;
     pricingType = STPricingType.Fixed;
+    keepPricesOnRenewal;
     /**
      * One time price for the package, per year, or per member depending on pricingType
      */
@@ -119,6 +147,56 @@ export class STPackageMeta extends AutoEncoder {
      */
     startDate;
     canDeactivate = false;
+    get humanPricing() {
+        const strs = [];
+        if (this.unitPrice) {
+            if (this.pricingType === STPricingType.PerMember) {
+                strs.push($t(`%1T2`, { price: Formatter.price(this.unitPrice) }));
+            }
+            else if (this.pricingType === STPricingType.PerYear) {
+                strs.push($t(`%1RJ`, { price: Formatter.price(this.unitPrice) }));
+            }
+            else if (this.pricingType === STPricingType.Fixed) {
+                strs.push($t(`%1RX`, { amount: Formatter.integer(this.minimumAmount), price: Formatter.price(this.unitPrice) }));
+            }
+            if (this.minimumAmount) {
+                if (this.pricingType !== STPricingType.Fixed) {
+                    strs.push($t(`%1Ta`, { amount: Formatter.integer(this.minimumAmount) }));
+                }
+            }
+        }
+        let suffix = $t('%1U3');
+        if (this.type === STPackageType.Members) {
+            suffix = $t('%1Ts');
+        }
+        let minimumSuffix = '';
+        let maximumSuffix = '';
+        if (this.serviceFeeMinimum) {
+            minimumSuffix = $t('%1RM', { price: Formatter.price(this.serviceFeeMinimum) });
+            if (this.type === STPackageType.Members) {
+                minimumSuffix = $t('%1RM', { price: Formatter.price(this.serviceFeeMinimum) });
+            }
+        }
+        if (this.serviceFeeMaximum) {
+            maximumSuffix = $t('%1Tl', { price: Formatter.price(this.serviceFeeMaximum) });
+            if (this.type === STPackageType.Members) {
+                maximumSuffix = $t('%1Tl', { price: Formatter.price(this.serviceFeeMaximum) });
+            }
+        }
+        if (this.serviceFeePercentage && this.serviceFeeFixed) {
+            strs.push(Formatter.percentage(this.serviceFeePercentage) + ` + ` + Formatter.price(this.serviceFeeFixed) + ' ' + suffix + (minimumSuffix ? (', ' + minimumSuffix) : '') + (maximumSuffix ? (', ' + maximumSuffix) : ''));
+        }
+        else if (this.serviceFeeFixed) {
+            strs.push((Formatter.price(this.serviceFeeFixed) + ' ' + suffix + (minimumSuffix ? (', ' + minimumSuffix) : '') + (maximumSuffix ? (', ' + maximumSuffix) : '')));
+        }
+        else if (this.serviceFeePercentage) {
+            strs.push(Formatter.percentage(this.serviceFeePercentage) + (minimumSuffix ? (' ' + minimumSuffix) : '') + (maximumSuffix ? ((minimumSuffix ? ', ' : ' ') + maximumSuffix) : ''));
+        }
+        if (strs.length === 0) {
+            strs.push($t(`%1Mn`));
+        }
+        return strs.join('\n');
+    }
 }
 __decorate([
     field({ decoder: StringDecoder, optional: true })
@@ -129,6 +207,9 @@ __decorate([
 __decorate([
     field({ decoder: new EnumDecoder(STPricingType) })
 ], STPackageMeta.prototype, "pricingType", void 0);
+__decorate([
+    field({ decoder: BooleanDecoder, version: 398, defaultValue: () => false })
+], STPackageMeta.prototype, "keepPricesOnRenewal", void 0);
 __decorate([
     field({ decoder: IntegerDecoder }),
     field({ ...upgradePriceFrom2To4DecimalPlaces })
@@ -192,21 +273,55 @@ export class STPackage extends AutoEncoder {
     validUntil = null;
     /// Disable / delete this package after this date (also no renew allowed). Can't keep using the currently saved pricing
     removeAt = null;
-    shouldHintRenew() {
-        if (!this.meta.allowRenew || this.validUntil === null) {
-            return false;
+    /**
+     * Helper to handle edge cases where validUntil is null but removeAt is set
+     */
+    get endDate() {
+        if (!this.removeAt) {
+            return this.validUntil;
         }
-        if (this.meta.startDate > new Date()) {
-            // Not yet activated
-            return false;
+        if (!this.validUntil) {
+            return this.removeAt;
         }
-        // Allow renew 2 months in advance
-        const allowAfter = new Date(this.validUntil);
-        allowAfter.setDate(allowAfter.getDate() - 31 * 2);
-        if (allowAfter < new Date()) {
-            return true;
+        return new Date(Math.min(this.validUntil.getTime(), this.removeAt.getTime()));
+    }
+    get isActive() {
+        return !!this.validAt && (!this.endDate || this.endDate > new Date());
+    }
+    /**
+     * Package as if it has been renewed
+     */
+    createRenewed() {
+        if (!this.meta.allowRenew) {
+            throw new SimpleError({
+                code: 'not_allowed',
+                message: 'Not allowed',
+                human: $t(`%x7`),
+            });
         }
-        return false;
+        if (!this.meta.keepPricesOnRenewal) {
+            return STPackageBundleHelper.getCurrentPackage(STPackageTypeHelper.getBundle(this.meta.type), new Date(Math.max(new Date().getTime(), this.validUntil?.getTime() ?? 0)));
+        }
+        const pack = this.clone();
+        pack.id = uuidv4();
+        // Not yet valid / active (ignored until valid)
+        pack.validAt = null;
+        pack.meta.startDate = new Date(Math.max(new Date().getTime(), this.validUntil?.getTime() ?? 0));
+        pack.meta.paidAmount = 0;
+        pack.meta.paidPrice = 0;
+        pack.meta.firstFailedPayment = null;
+        pack.meta.didRenewId = this.id;
+        // Duration for renewals is always a year ATM
+        pack.validUntil = new Date(pack.meta.startDate);
+        pack.validUntil.setFullYear(pack.validUntil.getFullYear() + 1);
+        // Remove (= not renewable) if not renewed after 3 months
+        pack.removeAt = new Date(pack.validUntil);
+        pack.removeAt.setMonth(pack.removeAt.getMonth() + 3);
+        if (this.meta.type === STPackageType.SingleWebshop) {
+            // Deprecated package
+            pack.meta.type = STPackageType.Webshops;
+        }
+        return pack;
     }
     get status() {
         return STPackageStatus.create({

package/dist/billing/STPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"STPackage.js","sourceRoot":"","sources":["../../src/billing/STPackage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"STPackage.js","sourceRoot":"","sources":["../../src/billing/STPackage.ts"],"names":[],"mappings":"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"}

package/dist/billing/STPackageBundle.d.ts

@@ -5,7 +5,6 @@ import { STPackage } from './STPackage.js';
 export declare enum STPackageBundle {
     Webshops = "Webshops",
     Members = "Members",
-    SingleWebshop = "SingleWebshop",
     TrialMembers = "TrialMembers",
     TrialWebshops = "TrialWebshops"
 }
@@ -13,16 +12,16 @@ export declare class STPackageBundleHelper {
     static getTitle(bundle: STPackageBundle): string;
     static getDescription(bundle: STPackageBundle): string;
     static isPublic(bundle: STPackageBundle): boolean;
-    static requiresMandate(bundle: STPackageBundle): boolean;
-    /**
-     * If you buy a package that is not combineable with an existing one, should it throw an error?
-     */
-    static isStackable(bundle: STPackageBundle, pack: STPackage): boolean;
     static isAlreadyBought(bundle: STPackageBundle, pack: STPackage): boolean;
     static isInTrial(bundle: STPackageBundle, pack: STPackage): boolean;
     static isCombineable(bundle: STPackageBundle, pack: STPackage): boolean;
     /**
-     * Create a new package for this type and return the pricing
+     * If you buy a package that is not combineable with an existing one.
+     * Should it start the package after the existing one expires (true) or should it ignore it (false)
+     */
+    static isStackable(bundle: STPackageBundle, pack: STPackage): boolean;
+    /**
+     * Create a new package for this type that starts on 'date' and return the pricing
      */
     static getCurrentPackage(bundle: STPackageBundle, date: Date): STPackage;
 }

package/dist/billing/STPackageBundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"STPackageBundle.d.ts","sourceRoot":"","sources":["../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA+C,MAAM,gBAAgB,CAAC;AAExF;;GAEG;AACH,oBAAY,eAAe;IAEvB,QAAQ,aAAa;IAGrB,OAAO,YAAY;IAGnB,aAAa,kBAAkB;IAE/B,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;CAClC;AAED,qBAAa,qBAAqB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM;IAQhD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM;IAQtD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;IAQjD,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;IAQxD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAcrE,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IA+BzE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IA2BnE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAyCvE;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS;CA4F3E"}
+{"version":3,"file":"STPackageBundle.d.ts","sourceRoot":"","sources":["../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA+C,MAAM,gBAAgB,CAAC;AAExF;;GAEG;AACH,oBAAY,eAAe;IAEvB,QAAQ,aAAa;IAGrB,OAAO,YAAY;IAKnB,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;CAClC;AAED,qBAAa,qBAAqB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM;IAQhD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM;IAQtD,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO;IAQjD,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAwBzE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAoBnE,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAkCvE;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO;IAcrE;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS;CAiF3E"}

package/dist/billing/STPackageBundle.js

@@ -1,3 +1,4 @@
+import { Formatter } from '../../../utility/dist/Formatter.js';
 import { STPackage, STPackageMeta, STPackageType, STPricingType } from './STPackage.js';
 /**
  * Package bundle are packages that you can buy
@@ -9,7 +10,7 @@ export var STPackageBundle;
     // Full members package
     STPackageBundle["Members"] = "Members";
     // One webshop package (max 1 webshop)
-    STPackageBundle["SingleWebshop"] = "SingleWebshop";
+    // SingleWebshop = 'SingleWebshop',
     STPackageBundle["TrialMembers"] = "TrialMembers";
     STPackageBundle["TrialWebshops"] = "TrialWebshops";
 })(STPackageBundle || (STPackageBundle = {}));
@@ -35,29 +36,6 @@ export class STPackageBundleHelper {
         }
         return false;
     }
-    static requiresMandate(bundle) {
-        switch (bundle) {
-            case STPackageBundle.Members: return true;
-            case STPackageBundle.Webshops: return true;
-        }
-        return false;
-    }
-    /**
-     * If you buy a package that is not combineable with an existing one, should it throw an error?
-     */
-    static isStackable(bundle, pack) {
-        switch (bundle) {
-            case STPackageBundle.TrialMembers: {
-                // Not allowed to start a trial even if pack is expired
-                return false;
-            }
-            case STPackageBundle.TrialWebshops: {
-                // Not allowed to start a trial again if pack is expired
-                return false;
-            }
-        }
-        return true;
-    }
     static isAlreadyBought(bundle, pack) {
         switch (bundle) {
             case STPackageBundle.Members: {
@@ -78,13 +56,6 @@ export class STPackageBundleHelper {
                 }
                 return false;
             }
-            case STPackageBundle.SingleWebshop: {
-                if (pack.meta.type === STPackageType.SingleWebshop || pack.meta.type === STPackageType.Webshops) {
-                    // Already bought
-                    return true;
-                }
-                return false;
-            }
         }
         return false;
     }
@@ -104,13 +75,6 @@ export class STPackageBundleHelper {
                 }
                 return false;
             }
-            case STPackageBundle.SingleWebshop: {
-                if (pack.meta.type === STPackageType.TrialWebshops) {
-                    // Already bought
-                    return true;
-                }
-                return false;
-            }
         }
         return false;
     }
@@ -130,13 +94,6 @@ export class STPackageBundleHelper {
                 }
                 return true;
             }
-            case STPackageBundle.SingleWebshop: {
-                if (pack.meta.type === STPackageType.SingleWebshop || pack.meta.type === STPackageType.Webshops) {
-                    // Already bought
-                    return false;
-                }
-                return true;
-            }
             case STPackageBundle.TrialMembers: {
                 if (pack.meta.type === STPackageType.Members || pack.meta.type === STPackageType.TrialMembers) {
                     // Already bought
@@ -155,27 +112,42 @@ export class STPackageBundleHelper {
         return false;
     }
     /**
-     * Create a new package for this type and return the pricing
+     * If you buy a package that is not combineable with an existing one.
+     * Should it start the package after the existing one expires (true) or should it ignore it (false)
+     */
+    static isStackable(bundle, pack) {
+        switch (bundle) {
+            case STPackageBundle.TrialMembers: {
+                // Not allowed to start a trial even if pack is expired
+                return false;
+            }
+            case STPackageBundle.TrialWebshops: {
+                // Not allowed to start a trial again if pack is expired
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Create a new package for this type that starts on 'date' and return the pricing
      */
     static getCurrentPackage(bundle, date) {
+        const start = Formatter.luxon(date).startOf('day');
         switch (bundle) {
             case STPackageBundle.Members: {
-                // 1 year valid
-                const validUntil = new Date(date);
-                validUntil.setFullYear(validUntil.getFullYear() + 1);
-                // Remove (= not renewable) if not renewed after 1 month
-                const removeAt = new Date(validUntil);
-                removeAt.setMonth(removeAt.getMonth() + 1);
+                const validUntil = start.plus({ years: 1 }).endOf('day');
+                const removeAt = validUntil.plus({ months: 1 }).endOf('day');
                 return STPackage.create({
-                    validUntil,
-                    removeAt,
+                    validUntil: validUntil.toJSDate(),
+                    removeAt: removeAt.toJSDate(),
                     meta: STPackageMeta.create({
                         type: STPackageType.Members,
                         unitPrice: 1_0000, // 1 euro
                         minimumAmount: 0,
                         allowRenew: true,
                         pricingType: STPricingType.PerMember,
-                        startDate: new Date(date),
+                        startDate: start.toJSDate(),
+                        canDeactivate: STAMHOOFD.environment === 'development' // Cannot deactivate in production because they already paid for it.
                     }),
                 });
             }
@@ -192,47 +164,41 @@ export class STPackageBundleHelper {
                         serviceFeeFixed: 0,
                         serviceFeePercentage: 2_00,
                         serviceFeeMaximum: 2000, // 20 cent
-                        startDate: new Date(date),
+                        startDate: start.toJSDate(),
                         canDeactivate: true,
                     }),
                 });
             }
             case STPackageBundle.TrialMembers: {
-                // Disable functions after two weeks, manual reenable required
-                const validUntil = new Date(date);
-                validUntil.setDate(validUntil.getDate() + 14);
-                // Remove if not valid anymore
-                const removeAt = new Date(validUntil);
+                const validUntil = start.plus({ days: 14 }).endOf('day');
+                const removeAt = validUntil;
                 return STPackage.create({
-                    validUntil,
-                    removeAt,
+                    validUntil: validUntil.toJSDate(),
+                    removeAt: removeAt.toJSDate(),
                     meta: STPackageMeta.create({
                         type: STPackageType.TrialMembers,
                         unitPrice: 0,
                         minimumAmount: 1,
                         allowRenew: false,
                         pricingType: STPricingType.Fixed,
-                        startDate: new Date(date),
+                        startDate: start.toJSDate(),
                         canDeactivate: true,
                     }),
                 });
             }
             case STPackageBundle.TrialWebshops: {
-                // Disable functions after two weeks, manual reenable required
-                const validUntil = new Date(date);
-                validUntil.setDate(validUntil.getDate() + 14);
-                // Remove if not valid anymore
-                const removeAt = new Date(validUntil);
+                const validUntil = start.plus({ days: 14 }).endOf('day');
+                const removeAt = validUntil;
                 return STPackage.create({
-                    validUntil,
-                    removeAt,
+                    validUntil: validUntil.toJSDate(),
+                    removeAt: removeAt.toJSDate(),
                     meta: STPackageMeta.create({
                         type: STPackageType.TrialWebshops,
                         unitPrice: 0,
                         minimumAmount: 1,
                         allowRenew: false,
                         pricingType: STPricingType.Fixed,
-                        startDate: new Date(date),
+                        startDate: start.toJSDate(),
                         canDeactivate: true,
                     }),
                 });

package/dist/billing/STPackageBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"STPackageBundle.js","sourceRoot":"","sources":["../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"STPackageBundle.js","sourceRoot":"","sources":["../../src/billing/STPackageBundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAExF;;GAEG;AACH,MAAM,CAAN,IAAY,eAYX;AAZD,WAAY,eAAe;IACvB,oCAAoC;IACpC,wCAAqB,CAAA;IAErB,uBAAuB;IACvB,sCAAmB,CAAA;IAEnB,sCAAsC;IACtC,mCAAmC;IAEnC,gDAA6B,CAAA;IAC7B,kDAA+B,CAAA;AACnC,CAAC,EAZW,eAAe,KAAf,eAAe,QAY1B;AAED,MAAM,OAAO,qBAAqB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAuB;QACnC,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;YAC/C,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,MAAuB;QACzC,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;YAChD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,MAAuB;QACnC,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;YAC1C,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,IAAI,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,MAAuB,EAAE,IAAe;QAC3D,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC3C,iBAAiB;oBACjB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC5C,iBAAiB;oBACjB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;oBACjD,iBAAiB;oBACjB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,MAAuB,EAAE,IAAe;QACrD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;oBAChD,iBAAiB;oBACjB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;oBACjD,iBAAiB;oBACjB,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAuB,EAAE,IAAe;QACzD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;oBAC3C,iBAAiB;oBACjB,OAAO,KAAK,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAC5C,iBAAiB;oBACjB,OAAO,KAAK,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;oBAC5F,iBAAiB;oBACjB,OAAO,KAAK,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;oBAChJ,iBAAiB;oBACjB,OAAO,KAAK,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,MAAuB,EAAE,IAAe;QACvD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,uDAAuD;gBACvD,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,wDAAwD;gBACxD,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,iBAAiB,CAAC,MAAuB,EAAE,IAAU;QACxD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnD,QAAQ,MAAM,EAAE,CAAC;YACb,KAAK,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3B,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAE3D,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;oBACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBAC7B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,OAAO;wBAC3B,SAAS,EAAE,MAAM,EAAE,SAAS;wBAC5B,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,IAAI;wBAChB,WAAW,EAAE,aAAa,CAAC,SAAS;wBACpC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;wBAC3B,aAAa,EAAE,SAAS,CAAC,WAAW,KAAK,aAAa,CAAC,oEAAoE;qBAC9H,CAAC;iBACL,CAAC,CAAC;YACP,CAAC;YAED,KAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC5B,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,QAAQ;wBAC5B,SAAS,EAAE,CAAC;wBACZ,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,KAAK;wBACjB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,eAAe,EAAE,CAAC;wBAClB,oBAAoB,EAAE,IAAI;wBAC1B,iBAAiB,EAAE,IAAI,EAAE,UAAU;wBACnC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;wBAC3B,aAAa,EAAE,IAAI;qBACtB,CAAC;iBACL,CAAC,CAAC;YACP,CAAC;YACD,KAAK,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;gBAChC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,UAAU,CAAC;gBAE5B,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;oBACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBAC7B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,YAAY;wBAChC,SAAS,EAAE,CAAC;wBACZ,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,KAAK;wBACjB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;wBAC3B,aAAa,EAAE,IAAI;qBACtB,CAAC;iBACL,CAAC,CAAC;YACP,CAAC;YAED,KAAK,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC;gBACjC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,UAAU,CAAC;gBAE5B,OAAO,SAAS,CAAC,MAAM,CAAC;oBACpB,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;oBACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBAC7B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC;wBACvB,IAAI,EAAE,aAAa,CAAC,aAAa;wBACjC,SAAS,EAAE,CAAC;wBACZ,aAAa,EAAE,CAAC;wBAChB,UAAU,EAAE,KAAK;wBACjB,WAAW,EAAE,aAAa,CAAC,KAAK;wBAChC,SAAS,EAAE,KAAK,CAAC,QAAQ,EAAE;wBAC3B,aAAa,EAAE,IAAI;qBACtB,CAAC;iBACL,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;CACJ"}

package/dist/checkout/CheckoutResponse.d.ts

@@ -1,6 +1,6 @@
 import { AutoEncoder } from '@simonbackx/simple-encoding';
-import { Payment } from '../members/Payment.js';
 import { Invoice } from '../billing/Invoice.js';
+import { PaymentGeneral } from '../members/PaymentGeneral.js';
 /**
  * If needed, you can extend this class to add extra fields in custom checkout flows.
  */
@@ -9,7 +9,7 @@ export declare class CheckoutResponse extends AutoEncoder {
      * Used for polling the payment status or showing transfer instructions.
      * Also used for showing a summary on the success page.
      */
-    payment: Payment | null;
+    payment: PaymentGeneral | null;
     /**
      * If an invoice is available and created, it will be set here already.
      * When asked for a pro forma invoice, this will be set.

package/dist/checkout/CheckoutResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckoutResponse.d.ts","sourceRoot":"","sources":["../../src/checkout/CheckoutResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAEhF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;IAC7C;;;OAGG;IAEH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE/B;;;OAGG;IAEH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEjC;;;OAGG;IAEH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAQ;CACvC"}
+{"version":3,"file":"CheckoutResponse.d.ts","sourceRoot":"","sources":["../../src/checkout/CheckoutResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwB,MAAM,6BAA6B,CAAC;AAEhF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;IAC7C;;;OAGG;IAEH,OAAO,EAAE,cAAc,GAAG,IAAI,CAAQ;IAEtC;;;OAGG;IAEH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAQ;IAE/B;;OAEG;IAEH,UAAU,EAAE,MAAM,GAAG,IAAI,CAAQ;IAEjC;;;OAGG;IAEH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAQ;CACvC"}