@stamhoofd/models 2.102.0 → 2.103.1
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/CachedBalance.d.ts.map +1 -1
- package/dist/src/models/CachedBalance.js +4 -2
- package/dist/src/models/CachedBalance.js.map +1 -1
- package/dist/src/models/PayconiqPayment.d.ts +6 -2
- package/dist/src/models/PayconiqPayment.d.ts.map +1 -1
- package/dist/src/models/PayconiqPayment.js +76 -37
- package/dist/src/models/PayconiqPayment.js.map +1 -1
- package/package.json +2 -2
- package/src/models/CachedBalance.ts +4 -2
- package/src/models/PayconiqPayment.ts +87 -43
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedBalance.d.ts","sourceRoot":"","sources":["../../../src/models/CachedBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAA8C,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAuD,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C;;GAEG;AACH,qBAAa,aAAc,SAAQ,cAAc;IAC7C,MAAM,CAAC,KAAK,SAAiC;IAO7C,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IAEH,UAAU,EAAE,qBAAqB,CAAC;IAGlC,UAAU,SAAK;IAGf,UAAU,SAAK;IAEf;;OAEG;IAEH,aAAa,SAAK;IAElB;;OAEG;IAEH,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG9B,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGtC,sBAAsB,SAAK;IAG3B,kBAAkB,SAAK;IAYvB,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;WAEH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;WAmBrI,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,qBAAqB;WAsB/F,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,qBAAqB;mBAmBxF,iBAAiB;IAiBtC,MAAM,CAAC,gBAAgB;mBAIF,eAAe;
|
|
1
|
+
{"version":3,"file":"CachedBalance.d.ts","sourceRoot":"","sources":["../../../src/models/CachedBalance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAA8C,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAuD,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnH,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C;;GAEG;AACH,qBAAa,aAAc,SAAQ,cAAc;IAC7C,MAAM,CAAC,KAAK,SAAiC;IAO7C,EAAE,EAAG,MAAM,CAAC;IAGZ,cAAc,EAAE,MAAM,CAAC;IAGvB,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IAEH,UAAU,EAAE,qBAAqB,CAAC;IAGlC,UAAU,SAAK;IAGf,UAAU,SAAK;IAEf;;OAEG;IAEH,aAAa,SAAK;IAElB;;OAEG;IAEH,SAAS,EAAE,IAAI,GAAG,IAAI,CAAQ;IAG9B,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAQ;IAGtC,sBAAsB,SAAK;IAG3B,kBAAkB,SAAK;IAYvB,SAAS,EAAE,IAAI,CAAC;IAUhB,SAAS,EAAE,IAAI,CAAC;WAEH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;WAmBrI,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,qBAAqB;WAsB/F,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,qBAAqB;mBAmBxF,iBAAiB;IAiBtC,MAAM,CAAC,gBAAgB;mBAIF,eAAe;mBAmLf,aAAa;WA6DrB,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE;WAQxE,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;WAQ5D,sBAAsB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE;WAQxE,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;WA6CxD,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE;WAOzE,iBAAiB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;WAO7D,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,kBAAkB,UAAQ;WAgBrF,uBAAuB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE;CAMzF"}
|
|
@@ -188,7 +188,9 @@ class CachedBalance extends sql_1.QueryableModel {
|
|
|
188
188
|
}
|
|
189
189
|
const result = results.find(r => r[0] === objectId);
|
|
190
190
|
if (result) {
|
|
191
|
-
|
|
191
|
+
if (amountOpen !== 0) {
|
|
192
|
+
result[1].nextDueAt = dueAt;
|
|
193
|
+
}
|
|
192
194
|
if (result[1].amountOpen < 0) {
|
|
193
195
|
if (amountOpen > 0) {
|
|
194
196
|
// Let the future due amount fill in the gap until maximum 0
|
|
@@ -199,7 +201,7 @@ class CachedBalance extends sql_1.QueryableModel {
|
|
|
199
201
|
result[1].amountPaid += amountPaid;
|
|
200
202
|
}
|
|
201
203
|
else {
|
|
202
|
-
results.push([objectId, { amountPaid, amountOpen: 0, amountPending, nextDueAt: dueAt }]);
|
|
204
|
+
results.push([objectId, { amountPaid, amountOpen: 0, amountPending, nextDueAt: amountOpen !== 0 ? dueAt : null }]);
|
|
203
205
|
}
|
|
204
206
|
}
|
|
205
207
|
// Add missing object ids (with 0 amount, otherwise we don't reset the amounts back to zero when all the balance items are hidden)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CachedBalance.js","sourceRoot":"","sources":["../../../src/models/CachedBalance.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CachedBalance.js","sourceRoot":"","sources":["../../../src/models/CachedBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,14 @@ export declare class PayconiqPayment extends QueryableModel {
|
|
|
6
6
|
id: string;
|
|
7
7
|
paymentId: string;
|
|
8
8
|
payconiqId: string;
|
|
9
|
-
|
|
9
|
+
getResponseStatus(response: any): PaymentStatus;
|
|
10
|
+
getStatus(organization: Organization, payment: Payment): Promise<PaymentStatus>;
|
|
10
11
|
cancel(organization: Organization): Promise<boolean>;
|
|
11
12
|
static createTest(organization: Organization, payconiqAccount: PayconiqAccount): Promise<undefined | object>;
|
|
12
|
-
static createPayment(payment: Payment, organization: Organization, description: string, returnUrl?: string, callbackUrl?: string): Promise<
|
|
13
|
+
static createPayment(payment: Payment, organization: Organization, description: string, returnUrl?: string, callbackUrl?: string): Promise<{
|
|
14
|
+
paymentUrl: string;
|
|
15
|
+
paymentQRCode: string;
|
|
16
|
+
}>;
|
|
13
17
|
/**
|
|
14
18
|
* Do a post request on the API.
|
|
15
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"PayconiqPayment.d.ts","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAW,MAAM,uBAAuB,CAAC;AAKhF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG3C,qBAAa,eAAgB,SAAQ,cAAc;IAC/C,MAAM,CAAC,KAAK,SAAuB;IAOnC,EAAE,EAAG,MAAM,CAAC;IAGZ,SAAS,EAAE,MAAM,CAAC;IAGlB,UAAU,EAAE,MAAM,CAAC;IAEnB,iBAAiB,CAAC,QAAQ,EAAE,GAAG;IAwBzB,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAuD/E,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,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IAqD/L;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO;CAgHzB"}
|
|
@@ -8,37 +8,13 @@ const sql_1 = require("@stamhoofd/sql");
|
|
|
8
8
|
const structures_1 = require("@stamhoofd/structures");
|
|
9
9
|
const https_1 = tslib_1.__importDefault(require("https"));
|
|
10
10
|
const uuid_1 = require("uuid");
|
|
11
|
-
const
|
|
11
|
+
const utility_1 = require("@stamhoofd/utility");
|
|
12
12
|
class PayconiqPayment extends sql_1.QueryableModel {
|
|
13
13
|
static table = 'payconiq_payments';
|
|
14
14
|
id;
|
|
15
15
|
paymentId;
|
|
16
16
|
payconiqId;
|
|
17
|
-
|
|
18
|
-
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
19
|
-
if (!apiKey) {
|
|
20
|
-
throw new simple_errors_1.SimpleError({
|
|
21
|
-
code: '',
|
|
22
|
-
message: 'Payconiq API key missing to check the status of the payment',
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
26
|
-
if (testMode) {
|
|
27
|
-
const payment = await _1.Payment.getByID(this.paymentId);
|
|
28
|
-
if (!payment) {
|
|
29
|
-
throw new simple_errors_1.SimpleError({
|
|
30
|
-
code: '',
|
|
31
|
-
message: 'Payment not found',
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
const age = (new Date().getTime() - new Date(payment.createdAt).getTime()) / 1000;
|
|
35
|
-
// 10 seconds pending
|
|
36
|
-
if (age < 10) {
|
|
37
|
-
return structures_1.PaymentStatus.Pending;
|
|
38
|
-
}
|
|
39
|
-
return structures_1.PaymentStatus.Succeeded;
|
|
40
|
-
}
|
|
41
|
-
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
17
|
+
getResponseStatus(response) {
|
|
42
18
|
if (response.status) {
|
|
43
19
|
switch (response.status) {
|
|
44
20
|
case 'AUTHORIZED': return structures_1.PaymentStatus.Pending;
|
|
@@ -57,6 +33,53 @@ class PayconiqPayment extends sql_1.QueryableModel {
|
|
|
57
33
|
message: 'Status missing in response',
|
|
58
34
|
});
|
|
59
35
|
}
|
|
36
|
+
async getStatus(organization, payment) {
|
|
37
|
+
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
38
|
+
if (!apiKey) {
|
|
39
|
+
throw new simple_errors_1.SimpleError({
|
|
40
|
+
code: '',
|
|
41
|
+
message: 'Payconiq API key missing to check the status of the payment',
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
45
|
+
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
46
|
+
if (typeof response !== 'object' || response === null) {
|
|
47
|
+
throw new simple_errors_1.SimpleError({
|
|
48
|
+
code: '',
|
|
49
|
+
message: 'Invalid Payconiq response',
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
const status = this.getResponseStatus(response);
|
|
53
|
+
// Check debtor
|
|
54
|
+
if ('debtor' in response && typeof response.debtor === 'object' && response.debtor !== null) {
|
|
55
|
+
try {
|
|
56
|
+
const name = response.debtor.name;
|
|
57
|
+
const iban = response.debtor.iban;
|
|
58
|
+
if (typeof iban === 'string') {
|
|
59
|
+
payment.iban = utility_1.Formatter.iban(iban);
|
|
60
|
+
}
|
|
61
|
+
if (typeof name === 'string') {
|
|
62
|
+
payment.ibanName = name.substring(0, 128);
|
|
63
|
+
}
|
|
64
|
+
await payment.save();
|
|
65
|
+
}
|
|
66
|
+
catch (e) {
|
|
67
|
+
console.error('Failed to save iban in Payconiq payment');
|
|
68
|
+
console.error(e);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
// Check and save amount
|
|
72
|
+
if (typeof response.amount === 'number' && status === structures_1.PaymentStatus.Succeeded) {
|
|
73
|
+
const amount = response.amount;
|
|
74
|
+
if (amount < payment.price) {
|
|
75
|
+
// We do NOT allow lower prices
|
|
76
|
+
console.error('Manual price change detected by Payconiq user. Failing the payment');
|
|
77
|
+
console.error('Expected: ' + payment.price + '; Received: ' + amount);
|
|
78
|
+
return structures_1.PaymentStatus.Failed;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return status;
|
|
82
|
+
}
|
|
60
83
|
async cancel(organization) {
|
|
61
84
|
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
62
85
|
if (!apiKey) {
|
|
@@ -71,7 +94,7 @@ class PayconiqPayment extends sql_1.QueryableModel {
|
|
|
71
94
|
return true;
|
|
72
95
|
}
|
|
73
96
|
catch (e) {
|
|
74
|
-
console.error('Failed to cancel Payconiq payment', this.id, this.payconiqId, e);
|
|
97
|
+
console.error('Failed to cancel Payconiq payment', this.id, this.payconiqId, this.payconiqId, e);
|
|
75
98
|
return false;
|
|
76
99
|
}
|
|
77
100
|
}
|
|
@@ -103,25 +126,41 @@ class PayconiqPayment extends sql_1.QueryableModel {
|
|
|
103
126
|
});
|
|
104
127
|
}
|
|
105
128
|
const response = await this.request('POST', '/v3/payments', {
|
|
106
|
-
reference: payment.id.
|
|
129
|
+
reference: payment.id.replaceAll('-', ''), // 36 chars, max length is 35.... The actual id is also in the description
|
|
107
130
|
amount: payment.price,
|
|
108
131
|
currency: 'EUR',
|
|
109
132
|
callbackUrl: callbackUrl ?? 'https://' + organization.getApiHost() + '/v' + structures_1.Version + '/payments/' + encodeURIComponent(payment.id) + '?exchange=true',
|
|
110
133
|
returnUrl,
|
|
111
|
-
description,
|
|
134
|
+
description: utility_1.Formatter.sepaPaymentSlug(description).substring(0, 140), // Lmimit to 140 chars
|
|
112
135
|
}, apiKey, organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
|
|
113
136
|
const payconiqPayment = new PayconiqPayment();
|
|
114
137
|
payconiqPayment.paymentId = payment.id;
|
|
115
138
|
payconiqPayment.payconiqId = response.paymentId;
|
|
116
|
-
// Read link
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
139
|
+
// Read link
|
|
140
|
+
const paymentUrl = response._links.checkout.href;
|
|
141
|
+
let paymentQRCode = response._links.qrcode.href;
|
|
142
|
+
if (typeof paymentUrl !== 'string' || typeof paymentQRCode !== 'string') {
|
|
143
|
+
console.error('Unsupported Payconiq response', response);
|
|
144
|
+
throw new simple_errors_1.SimpleError({
|
|
145
|
+
code: '',
|
|
146
|
+
message: $t('4a3b54dc-e945-4a15-8b31-b9b4bb483b2a'),
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
try {
|
|
150
|
+
// Grow QR-code in size
|
|
151
|
+
const u = new URL(paymentQRCode);
|
|
152
|
+
u.searchParams.set('s', 'L');
|
|
153
|
+
paymentQRCode = u.toString();
|
|
154
|
+
}
|
|
155
|
+
catch (e) {
|
|
156
|
+
console.error('Found unreadable payment QR Code');
|
|
157
|
+
console.error(e);
|
|
122
158
|
}
|
|
123
159
|
await payconiqPayment.save();
|
|
124
|
-
return
|
|
160
|
+
return {
|
|
161
|
+
paymentUrl,
|
|
162
|
+
paymentQRCode,
|
|
163
|
+
};
|
|
125
164
|
}
|
|
126
165
|
/**
|
|
127
166
|
* Do a post request on the API.
|
|
@@ -130,7 +169,7 @@ class PayconiqPayment extends sql_1.QueryableModel {
|
|
|
130
169
|
return new Promise((resolve, reject) => {
|
|
131
170
|
const jsonData = JSON.stringify(data);
|
|
132
171
|
// Payconiq switches to Wero on 2025-10-19
|
|
133
|
-
const isWero = Date.now() > new Date('2025-10-19T02:00:00+02:00').getTime();
|
|
172
|
+
const isWero = testMode || Date.now() > new Date('2025-10-19T02:00:00+02:00').getTime();
|
|
134
173
|
let hostname = !testMode ? 'api.payconiq.com' : 'api.ext.payconiq.com';
|
|
135
174
|
if (isWero) {
|
|
136
175
|
hostname = !testMode ? 'merchant.api.bancontact.net' : 'merchant.api.preprod.bancontact.net';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayconiqPayment.js","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":";;;;AAAA,iEAAqD;AACrD,6DAAwD;AACxD,wCAAgD;AAChD,sDAAgF;AAEhF,0DAA0B;AAC1B,+BAAoC;
|
|
1
|
+
{"version":3,"file":"PayconiqPayment.js","sourceRoot":"","sources":["../../../src/models/PayconiqPayment.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/models",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.103.1",
|
|
4
4
|
"main": "./dist/src/index.js",
|
|
5
5
|
"types": "./dist/src/index.d.ts",
|
|
6
6
|
"license": "UNLICENCED",
|
|
@@ -30,5 +30,5 @@
|
|
|
30
30
|
"publishConfig": {
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "680918109eb2a26a78c71b41a7165c6d088398ee"
|
|
34
34
|
}
|
|
@@ -314,7 +314,9 @@ export class CachedBalance extends QueryableModel {
|
|
|
314
314
|
|
|
315
315
|
const result = results.find(r => r[0] === objectId);
|
|
316
316
|
if (result) {
|
|
317
|
-
|
|
317
|
+
if (amountOpen !== 0) {
|
|
318
|
+
result[1].nextDueAt = dueAt;
|
|
319
|
+
}
|
|
318
320
|
|
|
319
321
|
if (result[1].amountOpen < 0) {
|
|
320
322
|
if (amountOpen > 0) {
|
|
@@ -327,7 +329,7 @@ export class CachedBalance extends QueryableModel {
|
|
|
327
329
|
result[1].amountPaid += amountPaid;
|
|
328
330
|
}
|
|
329
331
|
else {
|
|
330
|
-
results.push([objectId, { amountPaid, amountOpen: 0, amountPending, nextDueAt: dueAt }]);
|
|
332
|
+
results.push([objectId, { amountPaid, amountOpen: 0, amountPending, nextDueAt: amountOpen !== 0 ? dueAt : null }]);
|
|
331
333
|
}
|
|
332
334
|
}
|
|
333
335
|
|
|
@@ -7,6 +7,7 @@ import https from 'https';
|
|
|
7
7
|
import { v4 as uuidv4 } from 'uuid';
|
|
8
8
|
|
|
9
9
|
import { Organization, Payment } from './';
|
|
10
|
+
import { Formatter } from '@stamhoofd/utility';
|
|
10
11
|
|
|
11
12
|
export class PayconiqPayment extends QueryableModel {
|
|
12
13
|
static table = 'payconiq_payments';
|
|
@@ -24,37 +25,7 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
24
25
|
@column({ type: 'string' })
|
|
25
26
|
payconiqId: string;
|
|
26
27
|
|
|
27
|
-
|
|
28
|
-
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
29
|
-
if (!apiKey) {
|
|
30
|
-
throw new SimpleError({
|
|
31
|
-
code: '',
|
|
32
|
-
message: 'Payconiq API key missing to check the status of the payment',
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
37
|
-
|
|
38
|
-
if (testMode) {
|
|
39
|
-
const payment = await Payment.getByID(this.paymentId);
|
|
40
|
-
if (!payment) {
|
|
41
|
-
throw new SimpleError({
|
|
42
|
-
code: '',
|
|
43
|
-
message: 'Payment not found',
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
const age = (new Date().getTime() - new Date(payment.createdAt).getTime()) / 1000;
|
|
48
|
-
|
|
49
|
-
// 10 seconds pending
|
|
50
|
-
if (age < 10) {
|
|
51
|
-
return PaymentStatus.Pending;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
return PaymentStatus.Succeeded;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
28
|
+
getResponseStatus(response: any) {
|
|
58
29
|
if (response.status) {
|
|
59
30
|
switch (response.status) {
|
|
60
31
|
case 'AUTHORIZED': return PaymentStatus.Pending;
|
|
@@ -71,12 +42,68 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
71
42
|
}
|
|
72
43
|
return PaymentStatus.Pending; // default to pending
|
|
73
44
|
}
|
|
45
|
+
|
|
74
46
|
throw new SimpleError({
|
|
75
47
|
code: '',
|
|
76
48
|
message: 'Status missing in response',
|
|
77
49
|
});
|
|
78
50
|
}
|
|
79
51
|
|
|
52
|
+
async getStatus(organization: Organization, payment: Payment): Promise<PaymentStatus> {
|
|
53
|
+
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
54
|
+
if (!apiKey) {
|
|
55
|
+
throw new SimpleError({
|
|
56
|
+
code: '',
|
|
57
|
+
message: 'Payconiq API key missing to check the status of the payment',
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const testMode = organization.privateMeta.useTestPayments ?? (STAMHOOFD.environment !== 'production');
|
|
62
|
+
const response = await PayconiqPayment.request('GET', '/v3/payments/' + this.payconiqId, {}, apiKey, testMode);
|
|
63
|
+
|
|
64
|
+
if (typeof response !== 'object' || response === null) {
|
|
65
|
+
throw new SimpleError({
|
|
66
|
+
code: '',
|
|
67
|
+
message: 'Invalid Payconiq response',
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
const status = this.getResponseStatus(response);
|
|
71
|
+
|
|
72
|
+
// Check debtor
|
|
73
|
+
if ('debtor' in response && typeof response.debtor === 'object' && response.debtor !== null) {
|
|
74
|
+
try {
|
|
75
|
+
const name = response.debtor.name;
|
|
76
|
+
const iban = response.debtor.iban;
|
|
77
|
+
|
|
78
|
+
if (typeof iban === 'string') {
|
|
79
|
+
payment.iban = Formatter.iban(iban);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
if (typeof name === 'string') {
|
|
83
|
+
payment.ibanName = name.substring(0, 128);
|
|
84
|
+
}
|
|
85
|
+
await payment.save();
|
|
86
|
+
}
|
|
87
|
+
catch (e) {
|
|
88
|
+
console.error('Failed to save iban in Payconiq payment');
|
|
89
|
+
console.error(e);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
// Check and save amount
|
|
94
|
+
if (typeof response.amount === 'number' && status === PaymentStatus.Succeeded) {
|
|
95
|
+
const amount = response.amount;
|
|
96
|
+
if (amount < payment.price) {
|
|
97
|
+
// We do NOT allow lower prices
|
|
98
|
+
console.error('Manual price change detected by Payconiq user. Failing the payment');
|
|
99
|
+
console.error('Expected: ' + payment.price + '; Received: ' + amount);
|
|
100
|
+
return PaymentStatus.Failed;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
return status;
|
|
105
|
+
}
|
|
106
|
+
|
|
80
107
|
async cancel(organization: Organization): Promise<boolean> {
|
|
81
108
|
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
82
109
|
if (!apiKey) {
|
|
@@ -92,7 +119,7 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
92
119
|
return true;
|
|
93
120
|
}
|
|
94
121
|
catch (e) {
|
|
95
|
-
console.error('Failed to cancel Payconiq payment', this.id, this.payconiqId, e);
|
|
122
|
+
console.error('Failed to cancel Payconiq payment', this.id, this.payconiqId, this.payconiqId, e);
|
|
96
123
|
return false;
|
|
97
124
|
}
|
|
98
125
|
}
|
|
@@ -119,7 +146,7 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
119
146
|
}
|
|
120
147
|
}
|
|
121
148
|
|
|
122
|
-
static async createPayment(payment: Payment, organization: Organization, description: string, returnUrl?: string, callbackUrl?: string) {
|
|
149
|
+
static async createPayment(payment: Payment, organization: Organization, description: string, returnUrl?: string, callbackUrl?: string): Promise<{ paymentUrl: string; paymentQRCode: string }> {
|
|
123
150
|
const apiKey = organization.privateMeta.payconiqApiKey;
|
|
124
151
|
if (!apiKey) {
|
|
125
152
|
throw new SimpleError({
|
|
@@ -129,30 +156,47 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
129
156
|
}
|
|
130
157
|
|
|
131
158
|
const response = await this.request('POST', '/v3/payments', {
|
|
132
|
-
reference: payment.id.
|
|
159
|
+
reference: payment.id.replaceAll('-', ''), // 36 chars, max length is 35.... The actual id is also in the description
|
|
133
160
|
amount: payment.price,
|
|
134
161
|
currency: 'EUR',
|
|
135
162
|
callbackUrl: callbackUrl ?? 'https://' + organization.getApiHost() + '/v' + Version + '/payments/' + encodeURIComponent(payment.id) + '?exchange=true',
|
|
136
163
|
returnUrl,
|
|
137
|
-
description,
|
|
164
|
+
description: Formatter.sepaPaymentSlug(description).substring(0, 140), // Lmimit to 140 chars
|
|
138
165
|
}, apiKey, organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
|
|
139
166
|
|
|
140
167
|
const payconiqPayment = new PayconiqPayment();
|
|
141
168
|
payconiqPayment.paymentId = payment.id;
|
|
142
169
|
payconiqPayment.payconiqId = response.paymentId;
|
|
143
170
|
|
|
144
|
-
// Read link
|
|
145
|
-
|
|
171
|
+
// Read link
|
|
172
|
+
const paymentUrl = response._links.checkout.href as string;
|
|
173
|
+
let paymentQRCode = response._links.qrcode.href as string;
|
|
146
174
|
|
|
147
|
-
if (
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
175
|
+
if (typeof paymentUrl !== 'string' || typeof paymentQRCode !== 'string') {
|
|
176
|
+
console.error('Unsupported Payconiq response', response);
|
|
177
|
+
throw new SimpleError({
|
|
178
|
+
code: '',
|
|
179
|
+
message: $t('4a3b54dc-e945-4a15-8b31-b9b4bb483b2a'),
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
try {
|
|
184
|
+
// Grow QR-code in size
|
|
185
|
+
const u = new URL(paymentQRCode);
|
|
186
|
+
u.searchParams.set('s', 'L');
|
|
187
|
+
paymentQRCode = u.toString();
|
|
188
|
+
}
|
|
189
|
+
catch (e) {
|
|
190
|
+
console.error('Found unreadable payment QR Code');
|
|
191
|
+
console.error(e);
|
|
151
192
|
}
|
|
152
193
|
|
|
153
194
|
await payconiqPayment.save();
|
|
154
195
|
|
|
155
|
-
return
|
|
196
|
+
return {
|
|
197
|
+
paymentUrl,
|
|
198
|
+
paymentQRCode,
|
|
199
|
+
};
|
|
156
200
|
}
|
|
157
201
|
|
|
158
202
|
/**
|
|
@@ -163,7 +207,7 @@ export class PayconiqPayment extends QueryableModel {
|
|
|
163
207
|
const jsonData = JSON.stringify(data);
|
|
164
208
|
|
|
165
209
|
// Payconiq switches to Wero on 2025-10-19
|
|
166
|
-
const isWero = Date.now() > new Date('2025-10-19T02:00:00+02:00').getTime();
|
|
210
|
+
const isWero = testMode || Date.now() > new Date('2025-10-19T02:00:00+02:00').getTime();
|
|
167
211
|
let hostname = !testMode ? 'api.payconiq.com' : 'api.ext.payconiq.com';
|
|
168
212
|
if (isWero) {
|
|
169
213
|
hostname = !testMode ? 'merchant.api.bancontact.net' : 'merchant.api.preprod.bancontact.net';
|