@stamhoofd/models 2.54.1 → 2.55.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/models/Email.d.ts +3 -3
- package/dist/src/models/Email.d.ts.map +1 -1
- package/dist/src/models/Email.js +3 -3
- package/dist/src/models/Email.js.map +1 -1
- package/dist/src/models/PayconiqPayment.d.ts.map +1 -1
- package/dist/src/models/PayconiqPayment.js +18 -1
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/package.json +2 -2
- package/src/models/Email.ts +6 -6
- package/src/models/PayconiqPayment.ts +22 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Model } from '@simonbackx/simple-database';
|
|
2
|
-
import { EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, LimitedFilteredRequest, PaginatedResponse } from '@stamhoofd/structures';
|
|
2
|
+
import { EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter } from '@stamhoofd/structures';
|
|
3
3
|
import { Organization } from './Organization';
|
|
4
4
|
export declare class Email extends Model {
|
|
5
5
|
static table: string;
|
|
@@ -25,8 +25,8 @@ export declare class Email extends Model {
|
|
|
25
25
|
createdAt: Date;
|
|
26
26
|
updatedAt: Date;
|
|
27
27
|
static recipientLoaders: Map<EmailRecipientFilterType, {
|
|
28
|
-
fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
|
|
29
|
-
count(request: LimitedFilteredRequest): Promise<number>;
|
|
28
|
+
fetch(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
|
|
29
|
+
count(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<number>;
|
|
30
30
|
}>;
|
|
31
31
|
throwIfNotReadyToSend(): void;
|
|
32
32
|
validateAttachments(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAA0C,eAAe,EAAE,YAAY,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,cAAc,IAAI,oBAAoB,EAAE,WAAW,EAAE,KAAK,IAAI,WAAW,EAAuB,sBAAsB,EAAE,iBAAiB,EAAgC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Email.d.ts","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAA0C,eAAe,EAAE,YAAY,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,cAAc,IAAI,oBAAoB,EAAE,WAAW,EAAE,KAAK,IAAI,WAAW,EAAuB,sBAAsB,EAAE,iBAAiB,EAAgC,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAY/W,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,KAAM,SAAQ,KAAK;IAC5B,MAAM,CAAC,KAAK,SAAY;IAOxB,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG7B,eAAe,EAAE,oBAAoB,CAAmC;IAGxE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB,8CAA8C;IAE9C,IAAI,EAAE,GAAG,CAAM;IAGf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGlC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,MAAM,cAAqB;IAG3B,gBAAgB,wBAAoC;IAEpD;;OAEG;IAEH,WAAW,EAAE,eAAe,EAAE,CAAM;IAMpC,MAAM,EAAE,IAAI,GAAG,IAAI,CAAQ;IAY3B,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;IAEhB,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,wBAAwB,EAAE;QACnD,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACtJ,KAAK,CAAC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,eAAe,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAC9F,CAAC,CAAa;IAEf,qBAAqB;IAoCrB,mBAAmB;IAsCnB,cAAc;IAYd,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,GAAG,MAAM;IAmB3D,IAAI;IA8LV,WAAW;IAuDL,eAAe;IAsFf,qBAAqB;IAoE3B,YAAY;IAIN,mBAAmB;CA6B5B"}
|
package/dist/src/models/Email.js
CHANGED
|
@@ -315,7 +315,7 @@ class Email extends simple_database_1.Model {
|
|
|
315
315
|
limit: 1,
|
|
316
316
|
search: subfilter.search,
|
|
317
317
|
});
|
|
318
|
-
const c = await loader.count(request);
|
|
318
|
+
const c = await loader.count(request, subfilter.subfilter);
|
|
319
319
|
count += c;
|
|
320
320
|
}
|
|
321
321
|
// Check if we have a more reliable recipientCount in the meantime
|
|
@@ -372,7 +372,7 @@ class Email extends simple_database_1.Model {
|
|
|
372
372
|
});
|
|
373
373
|
while (request) {
|
|
374
374
|
console.log('Loading email page', subfilter.type, request);
|
|
375
|
-
const response = await loader.fetch(request);
|
|
375
|
+
const response = await loader.fetch(request, subfilter.subfilter);
|
|
376
376
|
count += response.results.length;
|
|
377
377
|
for (const item of response.results) {
|
|
378
378
|
const recipient = new EmailRecipient_1.EmailRecipient();
|
|
@@ -431,7 +431,7 @@ class Email extends simple_database_1.Model {
|
|
|
431
431
|
});
|
|
432
432
|
while (request) {
|
|
433
433
|
console.log('Loading email page', subfilter.type, request);
|
|
434
|
-
const response = await loader.fetch(request);
|
|
434
|
+
const response = await loader.fetch(request, subfilter.subfilter);
|
|
435
435
|
// Note: it is possible that a result in the database doesn't return a recipient (in memory filtering)
|
|
436
436
|
// so we do need pagination
|
|
437
437
|
for (const item of response.results) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Email.js","sourceRoot":"","sources":["../../../src/models/Email.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE3C,qBAAa,eAAgB,SAAQ,KAAK;IACtC,MAAM,CAAC,KAAK,SAAuB;IAOnC,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,MAAM,CAAC;IAEb,SAAS,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE3C,qBAAa,eAAgB,SAAQ,KAAK;IACtC,MAAM,CAAC,KAAK,SAAuB;IAOnC,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,MAAM,CAAC;IAEb,SAAS,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAqD7D,MAAM,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;WAoB7C,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;WAsBrG,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IAoCtI;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO;CA0GzB"}
|
|
@@ -7,6 +7,7 @@ const simple_errors_1 = require("@simonbackx/simple-errors");
|
|
|
7
7
|
const structures_1 = require("@stamhoofd/structures");
|
|
8
8
|
const https_1 = tslib_1.__importDefault(require("https"));
|
|
9
9
|
const uuid_1 = require("uuid");
|
|
10
|
+
const _1 = require("./");
|
|
10
11
|
class PayconiqPayment extends simple_database_1.Model {
|
|
11
12
|
static table = 'payconiq_payments';
|
|
12
13
|
id;
|
|
@@ -20,7 +21,23 @@ class PayconiqPayment extends simple_database_1.Model {
|
|
|
20
21
|
message: 'Payconiq API key missing to check the status of the payment',
|
|
21
22
|
});
|
|
22
23
|
}
|
|
23
|
-
const
|
|
24
|
+
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
25
|
+
if (testMode) {
|
|
26
|
+
const payment = await _1.Payment.getByID(this.paymentId);
|
|
27
|
+
if (!payment) {
|
|
28
|
+
throw new simple_errors_1.SimpleError({
|
|
29
|
+
code: '',
|
|
30
|
+
message: 'Payment not found',
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
const age = (new Date().getTime() - new Date(payment.createdAt).getTime()) / 1000;
|
|
34
|
+
// 10 seconds pending
|
|
35
|
+
if (age < 10) {
|
|
36
|
+
return structures_1.PaymentStatus.Pending;
|
|
37
|
+
}
|
|
38
|
+
return structures_1.PaymentStatus.Succeeded;
|
|
39
|
+
}
|
|
40
|
+
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
24
41
|
if (response.status) {
|
|
25
42
|
switch (response.status) {
|
|
26
43
|
case 'AUTHORIZED': return structures_1.PaymentStatus.Pending;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayconiqPayment.js","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,6DAAwD;AACxD,sDAAgF;AAEhF,0DAA0B;AAC1B,+BAAoC;
|
|
1
|
+
{"version":3,"file":"PayconiqPayment.js","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":";;;;AAAA,iEAA4D;AAC5D,6DAAwD;AACxD,sDAAgF;AAEhF,0DAA0B;AAC1B,+BAAoC;AAEpC,yBAA2C;AAE3C,MAAa,eAAgB,SAAQ,uBAAK;IACtC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;IAOnC,EAAE,CAAU;IAGZ,SAAS,CAAS;IAGlB,UAAU,CAAS;IAEnB,KAAK,CAAC,SAAS,CAAC,YAA0B;QACtC,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,6DAA6D;aACzE,CAAC,CAAC;QACP,CAAC;QAED,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,CAAC,CAAC;QAEtG,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,UAAO,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,IAAI,2BAAW,CAAC;oBAClB,IAAI,EAAE,EAAE;oBACR,OAAO,EAAE,mBAAmB;iBAC/B,CAAC,CAAC;YACP,CAAC;YAED,MAAM,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;YAElF,qBAAqB;YACrB,IAAI,GAAG,GAAG,EAAE,EAAE,CAAC;gBACX,OAAO,0BAAa,CAAC,OAAO,CAAC;YACjC,CAAC;YAED,OAAO,0BAAa,CAAC,SAAS,CAAC;QACnC,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/G,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACtB,KAAK,YAAY,CAAC,CAAC,OAAO,0BAAa,CAAC,OAAO,CAAC;gBAChD,KAAK,SAAS,CAAC,CAAC,OAAO,0BAAa,CAAC,OAAO,CAAC;gBAE7C,KAAK,YAAY,CAAC,CAAC,OAAO,0BAAa,CAAC,OAAO,CAAC,CAAC,yBAAyB;gBAE1E,KAAK,sBAAsB,CAAC,CAAC,OAAO,0BAAa,CAAC,MAAM,CAAC;gBACzD,KAAK,SAAS,CAAC,CAAC,OAAO,0BAAa,CAAC,MAAM,CAAC;gBAC5C,KAAK,QAAQ,CAAC,CAAC,OAAO,0BAAa,CAAC,MAAM,CAAC;gBAC3C,KAAK,WAAW,CAAC,CAAC,OAAO,0BAAa,CAAC,MAAM,CAAC;gBAE9C,KAAK,WAAW,CAAC,CAAC,OAAO,0BAAa,CAAC,SAAS,CAAC;YACrD,CAAC;YACD,OAAO,0BAAa,CAAC,OAAO,CAAC,CAAC,qBAAqB;QACvD,CAAC;QACD,MAAM,IAAI,2BAAW,CAAC;YAClB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,4BAA4B;SACxC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,YAA0B;QACnC,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,6DAA6D;aACzE,CAAC,CAAC;QACP,CAAC;QAED,oBAAoB;QACpB,IAAI,CAAC;YACD,MAAM,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,eAAe,IAAI,SAAS,CAAC,WAAW,KAAK,YAAY,CAAC,CAAC;YAC3K,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAChF,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAA0B,EAAE,eAAgC;QAChF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO;QACX,CAAC;QAED,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE;gBACxD,SAAS,EAAE,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,gCAAgC;gBAC7E,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE;gBACnD,WAAW,EAAE,qBAAqB;aAErC,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,eAAe,IAAI,SAAS,CAAC,WAAW,KAAK,YAAY,CAAC,CAAC;YAC/F,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACP,OAAO;QACX,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAgB,EAAE,YAA0B,EAAE,WAAmB,EAAE,SAAkB,EAAE,WAAoB;QAClI,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,2BAAW,CAAC;gBAClB,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,kDAAkD;aAC9D,CAAC,CAAC;QACP,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,cAAc,EAAE;YACxD,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,gCAAgC;YACxE,MAAM,EAAE,OAAO,CAAC,KAAK;YACrB,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,WAAW,IAAI,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE,GAAG,IAAI,GAAG,oBAAO,GAAG,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,gBAAgB;YACtJ,SAAS;YACT,WAAW;SACd,EAAE,MAAM,EAAE,YAAY,CAAC,WAAW,CAAC,eAAe,IAAI,SAAS,CAAC,WAAW,KAAK,YAAY,CAAC,CAAC;QAE/F,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,eAAe,CAAC,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;QACvC,eAAe,CAAC,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC;QAEhD,yCAAyC;QACzC,IAAI,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAc,CAAC;QAEnD,IAAI,YAAY,CAAC,WAAW,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,WAAW,KAAK,YAAY,CAAC,EAAE,CAAC;YACvF,qBAAqB;YACrB,4CAA4C;YAC5C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,2BAA2B,CAAC,CAAC;QAC9E,CAAC;QAED,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;QAE7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,OAAO,CAAC,MAAc,EAAE,IAAY,EAAE,IAAI,GAAG,EAAE,EAAE,OAAsB,IAAI,EAAE,QAAiB;QACzG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,sBAAsB,CAAC;YACzE,MAAM,IAAI,GAAG,UAAU,GAAG,QAAQ,CAAC;YAEnC,wBAAwB;YACxB,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC;YAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEtB,MAAM,OAAO,GAAG;gBACZ,cAAc,EAAE,iCAAiC;gBACjD,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;aAChD,CAAC;YAEF,IAAI,IAAI,EAAE,CAAC;gBACP,OAAO,CAAC,eAAe,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;YAChD,CAAC;YAED,MAAM,GAAG,GAAG,eAAK,CAAC,OAAO,CACrB;gBACI,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,KAAK;aACjB,EACD,CAAC,QAAyB,EAAE,EAAE;gBAC1B,OAAO,CAAC,GAAG,CAAC,eAAe,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC,CAAC;gBACzD,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAE5D,MAAM,MAAM,GAAU,EAAE,CAAC;gBAEzB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC1B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;gBAEH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACpB,IAAI,CAAC;wBACD,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;4BACvB,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;4BAChD,OAAO;wBACX,CAAC;wBACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC9C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBAElB,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;4BAC7B,OAAO,CAAC,SAAS,CAAC,CAAC;4BACnB,OAAO;wBACX,CAAC;wBAED,IAAI,IAAS,CAAC;wBACd,IAAI,CAAC;4BACD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC5B,CAAC;wBACD,OAAO,KAAK,EAAE,CAAC;4BACX,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;4BAErB,eAAe;4BACf,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;gCAC1D,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oCACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oCACnC,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;oCACnD,OAAO;gCACX,CAAC;gCACD,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;gCAChD,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gCACxB,OAAO;4BACX,CAAC;iCACI,CAAC;gCACF,qCAAqC;gCACrC,MAAM,CAAC,KAAK,CAAC,CAAC;gCACd,OAAO;4BACX,CAAC;wBACL,CAAC;wBAED,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;4BAC1D,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BACpB,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;4BACtE,OAAO;wBACX,CAAC;wBAED,OAAO,CAAC,IAAI,CAAC,CAAC;oBAClB,CAAC;oBACD,OAAO,KAAK,EAAE,CAAC;wBACX,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,CAAC,KAAK,CAAC,CAAC;oBAClB,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC,CACJ,CAAC;YAEF,+CAA+C;YAC/C,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACnB,GAAG,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpB,GAAG,CAAC,GAAG,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;;AA/PL,0CAgQC;AAxPG;IALC,IAAA,wBAAM,EAAC;QACJ,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK;YAC3C,OAAO,KAAK,IAAI,IAAA,SAAM,GAAE,CAAC;QAC7B,CAAC;KACJ,CAAC;2CACU;AAGZ;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kDACT;AAGlB;IADC,IAAA,wBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;mDACR"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/models",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.55.0",
|
|
4
4
|
"main": "./dist/src/index.js",
|
|
5
5
|
"types": "./dist/src/index.d.ts",
|
|
6
6
|
"license": "UNLICENCED",
|
|
@@ -29,5 +29,5 @@
|
|
|
29
29
|
"publishConfig": {
|
|
30
30
|
"access": "public"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "0f1de4c457eb1d067a6df5621d8bb06e821f09e3"
|
|
33
33
|
}
|
package/src/models/Email.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { column, Model } from '@simonbackx/simple-database';
|
|
2
|
-
import { EditorSmartButton, EditorSmartVariable, EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, getExampleRecipient, LimitedFilteredRequest, PaginatedResponse, Recipient, SortItemDirection } from '@stamhoofd/structures';
|
|
2
|
+
import { EditorSmartButton, EditorSmartVariable, EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, getExampleRecipient, LimitedFilteredRequest, PaginatedResponse, Recipient, SortItemDirection, StamhoofdFilter } from '@stamhoofd/structures';
|
|
3
3
|
import { v4 as uuidv4 } from 'uuid';
|
|
4
4
|
|
|
5
5
|
import { AnyDecoder, ArrayDecoder } from '@simonbackx/simple-encoding';
|
|
@@ -95,8 +95,8 @@ export class Email extends Model {
|
|
|
95
95
|
updatedAt: Date;
|
|
96
96
|
|
|
97
97
|
static recipientLoaders: Map<EmailRecipientFilterType, {
|
|
98
|
-
fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
|
|
99
|
-
count(request: LimitedFilteredRequest): Promise<number>;
|
|
98
|
+
fetch(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<PaginatedResponse<EmailRecipientStruct[], LimitedFilteredRequest>>;
|
|
99
|
+
count(request: LimitedFilteredRequest, subfilter: StamhoofdFilter | null): Promise<number>;
|
|
100
100
|
}> = new Map();
|
|
101
101
|
|
|
102
102
|
throwIfNotReadyToSend() {
|
|
@@ -425,7 +425,7 @@ export class Email extends Model {
|
|
|
425
425
|
search: subfilter.search,
|
|
426
426
|
});
|
|
427
427
|
|
|
428
|
-
const c = await loader.count(request);
|
|
428
|
+
const c = await loader.count(request, subfilter.subfilter);
|
|
429
429
|
|
|
430
430
|
count += c;
|
|
431
431
|
}
|
|
@@ -499,7 +499,7 @@ export class Email extends Model {
|
|
|
499
499
|
|
|
500
500
|
while (request) {
|
|
501
501
|
console.log('Loading email page', subfilter.type, request);
|
|
502
|
-
const response = await loader.fetch(request);
|
|
502
|
+
const response = await loader.fetch(request, subfilter.subfilter);
|
|
503
503
|
|
|
504
504
|
count += response.results.length;
|
|
505
505
|
|
|
@@ -574,7 +574,7 @@ export class Email extends Model {
|
|
|
574
574
|
|
|
575
575
|
while (request) {
|
|
576
576
|
console.log('Loading email page', subfilter.type, request);
|
|
577
|
-
const response = await loader.fetch(request);
|
|
577
|
+
const response = await loader.fetch(request, subfilter.subfilter);
|
|
578
578
|
|
|
579
579
|
// Note: it is possible that a result in the database doesn't return a recipient (in memory filtering)
|
|
580
580
|
// so we do need pagination
|
|
@@ -32,7 +32,28 @@ export class PayconiqPayment extends Model {
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
const
|
|
35
|
+
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
36
|
+
|
|
37
|
+
if (testMode) {
|
|
38
|
+
const payment = await Payment.getByID(this.paymentId);
|
|
39
|
+
if (!payment) {
|
|
40
|
+
throw new SimpleError({
|
|
41
|
+
code: '',
|
|
42
|
+
message: 'Payment not found',
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const age = (new Date().getTime() - new Date(payment.createdAt).getTime()) / 1000;
|
|
47
|
+
|
|
48
|
+
// 10 seconds pending
|
|
49
|
+
if (age < 10) {
|
|
50
|
+
return PaymentStatus.Pending;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return PaymentStatus.Succeeded;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
36
57
|
if (response.status) {
|
|
37
58
|
switch (response.status) {
|
|
38
59
|
case 'AUTHORIZED': return PaymentStatus.Pending;
|