@accounter/server 0.0.9-alpha-20251210092707-6eb504331bad23e8fe87f4bf5f4645123f2bee06 → 0.0.9-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
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/CHANGELOG.md +6 -6
- package/dist/server/src/modules/charges/helpers/common.helper.js +3 -3
- package/dist/server/src/modules/charges/helpers/common.helper.js.map +1 -1
- package/dist/server/src/modules/transactions/helpers/common.helper.js +11 -6
- package/dist/server/src/modules/transactions/helpers/common.helper.js.map +1 -1
- package/package.json +1 -1
- package/src/modules/charges/helpers/common.helper.ts +3 -3
- package/src/modules/transactions/helpers/common.helper.ts +12 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @accounter/server
|
|
2
2
|
|
|
3
|
-
## 0.0.9-alpha-
|
|
3
|
+
## 0.0.9-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
prerequisites for integration tests.
|
|
161
161
|
|
|
162
162
|
- [#2796](https://github.com/Urigo/accounter-fullstack/pull/2796)
|
|
163
|
-
[`
|
|
163
|
+
[`11b37d7`](https://github.com/Urigo/accounter-fullstack/commit/11b37d7543cf857859d7605c1e48c59870aedcc6)
|
|
164
164
|
Thanks [@gilgardosh](https://github.com/gilgardosh)! - - **Centralized Migration Verification
|
|
165
165
|
Logic**: Introduced a new helper module `migration-verification.ts` that centralizes the logic for
|
|
166
166
|
checking and asserting whether the latest database migration has been applied. This module
|
|
@@ -249,10 +249,10 @@
|
|
|
249
249
|
[`ef68321`](https://github.com/Urigo/accounter-fullstack/commit/ef68321608d60a7208e82a2c413f27beb502e3cc),
|
|
250
250
|
[`ef68321`](https://github.com/Urigo/accounter-fullstack/commit/ef68321608d60a7208e82a2c413f27beb502e3cc),
|
|
251
251
|
[`c7d6f21`](https://github.com/Urigo/accounter-fullstack/commit/c7d6f21ed62658159b1323334501daca03c8d3e5)]:
|
|
252
|
-
- @accounter/green-invoice-graphql@0.8.3-alpha-
|
|
253
|
-
- @accounter/pcn874-generator@0.6.4-alpha-
|
|
254
|
-
- @accounter/shaam-uniform-format-generator@0.2.3-alpha-
|
|
255
|
-
- @accounter/shaam6111-generator@0.1.5-alpha-
|
|
252
|
+
- @accounter/green-invoice-graphql@0.8.3-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
|
|
253
|
+
- @accounter/pcn874-generator@0.6.4-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
|
|
254
|
+
- @accounter/shaam-uniform-format-generator@0.2.3-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
|
|
255
|
+
- @accounter/shaam6111-generator@0.1.5-alpha-20251210135616-5f214037d71aca5d68d31a98ab999cc31ebe6622
|
|
256
256
|
|
|
257
257
|
## 0.0.8
|
|
258
258
|
|
|
@@ -16,13 +16,13 @@ export async function calculateTotalAmount(chargeId, injector, defaultLocalCurre
|
|
|
16
16
|
getChargeTransactionsMeta(chargeId, injector),
|
|
17
17
|
getChargeDocumentsMeta(chargeId, injector),
|
|
18
18
|
]);
|
|
19
|
-
if (charge.type === 'PAYROLL' && transactionsAmount
|
|
19
|
+
if (charge.type === 'PAYROLL' && transactionsAmount) {
|
|
20
20
|
return formatFinancialAmount(transactionsAmount, defaultLocalCurrency);
|
|
21
21
|
}
|
|
22
|
-
if (documentsAmount
|
|
22
|
+
if (documentsAmount && documentsCurrency) {
|
|
23
23
|
return formatFinancialAmount(documentsAmount, documentsCurrency);
|
|
24
24
|
}
|
|
25
|
-
if (transactionsAmount
|
|
25
|
+
if (transactionsAmount && transactionsCurrency) {
|
|
26
26
|
return formatFinancialAmount(transactionsAmount, transactionsCurrency);
|
|
27
27
|
}
|
|
28
28
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/charges/helpers/common.helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,qDAAqD,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,gEAAgE,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,0EAA0E,CAAC;AACjH,OAAO,EAAE,aAAa,EAAE,MAAM,kDAAkD,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,sDAAsD,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oEAAoE,CAAC;AAC1G,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,kEAAkE,CAAC;AACxG,OAAO,EAAY,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,QAAkB,EAClB,oBAA8B;IAE9B,MAAM,CACJ,MAAM,EACN,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,EAC5C,EAAE,iBAAiB,EAAE,eAAe,EAAE,EACvC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpB,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAChE,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAC7C,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3C,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,kBAAkB,
|
|
1
|
+
{"version":3,"file":"common.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/charges/helpers/common.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,13 +5,18 @@ export function getTransactionsMeta(transactions) {
|
|
|
5
5
|
let invalidTransactions = false;
|
|
6
6
|
let transactionsMinDebitDate = null;
|
|
7
7
|
let transactionsMinEventDate = null;
|
|
8
|
+
const hasFee = transactions.some(t => t.is_fee);
|
|
9
|
+
const onlyFee = transactions.every(t => t.is_fee);
|
|
10
|
+
const hasSomeFeeTransactions = hasFee && !onlyFee;
|
|
8
11
|
transactions.map(t => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
if ((hasSomeFeeTransactions && !t.is_fee) || !hasSomeFeeTransactions) {
|
|
13
|
+
const amountAsNumber = Number(t.amount);
|
|
14
|
+
const amount = Number.isNaN(amountAsNumber) ? null : amountAsNumber;
|
|
15
|
+
if (amount != null) {
|
|
16
|
+
transactionsAmount ??= 0;
|
|
17
|
+
transactionsAmount += amount;
|
|
18
|
+
currenciesSet.add(t.currency);
|
|
19
|
+
}
|
|
15
20
|
}
|
|
16
21
|
if (t.debit_timestamp) {
|
|
17
22
|
transactionsMinDebitDate ??= t.debit_timestamp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/transactions/helpers/common.helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,UAAU,mBAAmB,CAAC,YAA2C;IAC7E,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAY,CAAC;IAC1C,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAI,wBAAwB,GAAgB,IAAI,CAAC;IACjD,IAAI,wBAAwB,GAAgB,IAAI,CAAC;IAEjD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACnB,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"common.helper.js","sourceRoot":"","sources":["../../../../../../src/modules/transactions/helpers/common.helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,MAAM,UAAU,mBAAmB,CAAC,YAA2C;IAC7E,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,GAAG,EAAY,CAAC;IAC1C,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,IAAI,wBAAwB,GAAgB,IAAI,CAAC;IACjD,IAAI,wBAAwB,GAAgB,IAAI,CAAC;IAEjD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;IAElD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACnB,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACrE,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC;YACpE,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,kBAAkB,KAAK,CAAC,CAAC;gBACzB,kBAAkB,IAAI,MAAM,CAAC;gBAC7B,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAoB,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACtB,wBAAwB,KAAK,CAAC,CAAC,eAAe,CAAC;YAC/C,IAAI,wBAAwB,GAAG,CAAC,CAAC,eAAe,EAAE,CAAC;gBACjD,wBAAwB,GAAG,CAAC,CAAC,eAAe,CAAC;YAC/C,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YACxB,wBAAwB,KAAK,CAAC,CAAC,UAAU,CAAC;YAC1C,IAAI,wBAAwB,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;gBAC5C,wBAAwB,GAAG,CAAC,CAAC,UAAU,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,wBAAwB,KAAK,CAAC,CAAC,UAAU,CAAC;QAC1C,IAAI,wBAAwB,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;YAC5C,wBAAwB,GAAG,CAAC,CAAC,UAAU,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5B,mBAAmB,GAAG,IAAI,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,sBAAsB,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,oBAAoB,GACxB,sBAAsB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzE,OAAO;QACL,iBAAiB,EAAE,YAAY,CAAC,MAAM;QACtC,kBAAkB;QAClB,sBAAsB;QACtB,oBAAoB;QACpB,mBAAmB;QACnB,wBAAwB;QACxB,wBAAwB;KACzB,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -28,13 +28,13 @@ export async function calculateTotalAmount(
|
|
|
28
28
|
getChargeDocumentsMeta(chargeId, injector),
|
|
29
29
|
]);
|
|
30
30
|
|
|
31
|
-
if (charge.type === 'PAYROLL' && transactionsAmount
|
|
31
|
+
if (charge.type === 'PAYROLL' && transactionsAmount) {
|
|
32
32
|
return formatFinancialAmount(transactionsAmount, defaultLocalCurrency);
|
|
33
33
|
}
|
|
34
|
-
if (documentsAmount
|
|
34
|
+
if (documentsAmount && documentsCurrency) {
|
|
35
35
|
return formatFinancialAmount(documentsAmount, documentsCurrency);
|
|
36
36
|
}
|
|
37
|
-
if (transactionsAmount
|
|
37
|
+
if (transactionsAmount && transactionsCurrency) {
|
|
38
38
|
return formatFinancialAmount(transactionsAmount, transactionsCurrency);
|
|
39
39
|
}
|
|
40
40
|
return null;
|
|
@@ -9,13 +9,19 @@ export function getTransactionsMeta(transactions: IGetTransactionsByIdsResult[])
|
|
|
9
9
|
let transactionsMinDebitDate: Date | null = null;
|
|
10
10
|
let transactionsMinEventDate: Date | null = null;
|
|
11
11
|
|
|
12
|
+
const hasFee = transactions.some(t => t.is_fee);
|
|
13
|
+
const onlyFee = transactions.every(t => t.is_fee);
|
|
14
|
+
const hasSomeFeeTransactions = hasFee && !onlyFee;
|
|
15
|
+
|
|
12
16
|
transactions.map(t => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
if ((hasSomeFeeTransactions && !t.is_fee) || !hasSomeFeeTransactions) {
|
|
18
|
+
const amountAsNumber = Number(t.amount);
|
|
19
|
+
const amount = Number.isNaN(amountAsNumber) ? null : amountAsNumber;
|
|
20
|
+
if (amount != null) {
|
|
21
|
+
transactionsAmount ??= 0;
|
|
22
|
+
transactionsAmount += amount;
|
|
23
|
+
currenciesSet.add(t.currency as Currency);
|
|
24
|
+
}
|
|
19
25
|
}
|
|
20
26
|
if (t.debit_timestamp) {
|
|
21
27
|
transactionsMinDebitDate ??= t.debit_timestamp;
|