@pax2pay/model-banking 0.1.203 → 0.1.205
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/Settlement/Total.ts +23 -0
- package/Settlement/index.ts +2 -0
- package/dist/Settlement/Total.d.ts +3 -0
- package/dist/Settlement/Total.js +17 -0
- package/dist/Settlement/Total.js.map +1 -1
- package/dist/Settlement/index.d.ts +1 -0
- package/dist/Settlement/index.js +1 -0
- package/dist/Settlement/index.js.map +1 -1
- package/package.json +1 -1
package/Settlement/Total.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { isoly } from "isoly"
|
|
1
2
|
import { isly } from "isly"
|
|
2
3
|
import { Amounts } from "../Amounts"
|
|
4
|
+
import { Transaction } from "../Transaction"
|
|
3
5
|
import { Fee } from "./Fee"
|
|
4
6
|
|
|
5
7
|
export type Total = {
|
|
@@ -14,6 +16,27 @@ export namespace Total {
|
|
|
14
16
|
export function add(addendee: Total, addend: Total): Total {
|
|
15
17
|
return { amount: Amounts.add(addendee.amount, addend.amount), fee: Fee.add(addendee.fee, addend.fee) }
|
|
16
18
|
}
|
|
19
|
+
export function compare(expected: Total, outcome: Total): boolean {
|
|
20
|
+
return (
|
|
21
|
+
([...new Set([...Object.keys(expected.amount), ...Object.keys(outcome.amount)])] as isoly.Currency[]).every(
|
|
22
|
+
currency => expected.amount[currency] == outcome.amount[currency]
|
|
23
|
+
) &&
|
|
24
|
+
([...new Set([...Object.keys(expected.fee.other), ...Object.keys(outcome.fee.other)])] as isoly.Currency[]).every(
|
|
25
|
+
currency => expected.fee.other[currency] == outcome.fee.other[currency]
|
|
26
|
+
)
|
|
27
|
+
)
|
|
28
|
+
}
|
|
29
|
+
export function from(collect: Transaction.Collect, collected: Total = initiate()): Total {
|
|
30
|
+
let result: Total = collected
|
|
31
|
+
for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
|
|
32
|
+
for (const [entry, amount] of Object.entries(counterbalance))
|
|
33
|
+
if (entry.startsWith("fee"))
|
|
34
|
+
result = add(result, initiate({ fee: { other: { [currency]: amount } } }))
|
|
35
|
+
else if (entry.startsWith("settle"))
|
|
36
|
+
result = add(result, initiate({ amount: { [currency]: amount } }))
|
|
37
|
+
}
|
|
38
|
+
return result
|
|
39
|
+
}
|
|
17
40
|
export const type = isly.object<Total>({ amount: Amounts.type, fee: Fee.type })
|
|
18
41
|
export const is = type.is
|
|
19
42
|
export const flaw = type.flaw
|
package/Settlement/index.ts
CHANGED
|
@@ -19,6 +19,7 @@ export interface Settlement {
|
|
|
19
19
|
processor: Card.Stack
|
|
20
20
|
status: Status
|
|
21
21
|
expected?: Settlement.Total
|
|
22
|
+
collected?: Settlement.Total
|
|
22
23
|
outcome: Settlement.Total
|
|
23
24
|
settled?: Settlement.Settled
|
|
24
25
|
entries: Settlement.Entry.Summary
|
|
@@ -118,6 +119,7 @@ export namespace Settlement {
|
|
|
118
119
|
batch: Batch.type,
|
|
119
120
|
status: Status.type,
|
|
120
121
|
expected: Settlement.Total.type.optional(),
|
|
122
|
+
collected: Settlement.Total.type.optional(),
|
|
121
123
|
outcome: Settlement.Total.type,
|
|
122
124
|
settled: Settled.type.optional(),
|
|
123
125
|
entries: Settlement.Entry.Summary.type,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isly } from "isly";
|
|
2
2
|
import { Amounts } from "../Amounts";
|
|
3
|
+
import { Transaction } from "../Transaction";
|
|
3
4
|
import { Fee } from "./Fee";
|
|
4
5
|
export type Total = {
|
|
5
6
|
amount: Amounts;
|
|
@@ -8,6 +9,8 @@ export type Total = {
|
|
|
8
9
|
export declare namespace Total {
|
|
9
10
|
function initiate(partial?: Partial<Total>): Total;
|
|
10
11
|
function add(addendee: Total, addend: Total): Total;
|
|
12
|
+
function compare(expected: Total, outcome: Total): boolean;
|
|
13
|
+
function from(collect: Transaction.Collect, collected?: Total): Total;
|
|
11
14
|
const type: isly.object.ExtendableType<Total>;
|
|
12
15
|
const is: isly.Type.IsFunction<Total>;
|
|
13
16
|
const flaw: isly.Type.FlawFunction;
|
package/dist/Settlement/Total.js
CHANGED
|
@@ -11,6 +11,23 @@ export var Total;
|
|
|
11
11
|
return { amount: Amounts.add(addendee.amount, addend.amount), fee: Fee.add(addendee.fee, addend.fee) };
|
|
12
12
|
}
|
|
13
13
|
Total.add = add;
|
|
14
|
+
function compare(expected, outcome) {
|
|
15
|
+
return ([...new Set([...Object.keys(expected.amount), ...Object.keys(outcome.amount)])].every(currency => expected.amount[currency] == outcome.amount[currency]) &&
|
|
16
|
+
[...new Set([...Object.keys(expected.fee.other), ...Object.keys(outcome.fee.other)])].every(currency => expected.fee.other[currency] == outcome.fee.other[currency]));
|
|
17
|
+
}
|
|
18
|
+
Total.compare = compare;
|
|
19
|
+
function from(collect, collected = initiate()) {
|
|
20
|
+
let result = collected;
|
|
21
|
+
for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
|
|
22
|
+
for (const [entry, amount] of Object.entries(counterbalance))
|
|
23
|
+
if (entry.startsWith("fee"))
|
|
24
|
+
result = add(result, initiate({ fee: { other: { [currency]: amount } } }));
|
|
25
|
+
else if (entry.startsWith("settle"))
|
|
26
|
+
result = add(result, initiate({ amount: { [currency]: amount } }));
|
|
27
|
+
}
|
|
28
|
+
return result;
|
|
29
|
+
}
|
|
30
|
+
Total.from = from;
|
|
14
31
|
Total.type = isly.object({ amount: Amounts.type, fee: Fee.type });
|
|
15
32
|
Total.is = Total.type.is;
|
|
16
33
|
Total.flaw = Total.type.flaw;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Total.js","sourceRoot":"../","sources":["Settlement/Total.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Total.js","sourceRoot":"../","sources":["Settlement/Total.ts"],"names":[],"mappings":"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"}
|
package/dist/Settlement/index.js
CHANGED
|
@@ -83,6 +83,7 @@ export var Settlement;
|
|
|
83
83
|
batch: Settlement.Batch.type,
|
|
84
84
|
status: Status.type,
|
|
85
85
|
expected: Settlement.Total.type.optional(),
|
|
86
|
+
collected: Settlement.Total.type.optional(),
|
|
86
87
|
outcome: Settlement.Total.type,
|
|
87
88
|
settled: Settlement.Settled.type.optional(),
|
|
88
89
|
entries: Settlement.Entry.Summary.type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,SAAS,IAAI,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAC9D,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,GAAG,IAAI,aAAa,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,KAAK,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/index.ts"],"names":[],"mappings":"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"}
|