@social-mail/social-mail-web-server 1.8.325 → 1.8.326
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/server/model/events/StoreJournalEvents.d.ts.map +1 -1
- package/dist/server/model/events/StoreJournalEvents.js +8 -5
- package/dist/server/model/events/StoreJournalEvents.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/accounts/JournalService.js +1 -1
- package/dist/server/services/accounts/JournalService.js.map +1 -1
- package/dist/server/services/accounts/sales/SalesInvoiceService.d.ts.map +1 -1
- package/dist/server/services/accounts/sales/SalesInvoiceService.js +36 -29
- package/dist/server/services/accounts/sales/SalesInvoiceService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/src/server/model/events/StoreJournalEvents.ts +10 -5
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/accounts/JournalService.ts +1 -1
- package/src/server/services/accounts/sales/SalesInvoiceService.ts +41 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournalEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,mBAAmB,CAAC,YAAY,CAAC;IAG7E,EAAE,EAAE,iBAAiB,CAAC;IAEtB,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAcxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC;IAIxC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC,YAAY,CAAC;IAWrE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAInE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAWnE,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAa3C,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAqBnE,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAsCpD,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAIlE,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAI5D,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC;IAkCrE,aAAa,CAAC,KAAK,EAAE,iBAAiB;CAmB/C"}
|
|
@@ -15,6 +15,7 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
|
15
15
|
import SalesInvoiceService from "../../services/accounts/sales/SalesInvoiceService.js";
|
|
16
16
|
import JournalService from "../../services/accounts/JournalService.js";
|
|
17
17
|
import { Symbols } from "../../../common/Symbols.js";
|
|
18
|
+
import { Decimal } from "decimal.js";
|
|
18
19
|
export default class StoreJournalEvents extends AuthenticatedEvents {
|
|
19
20
|
filter(query) {
|
|
20
21
|
if (!this.verify) {
|
|
@@ -92,8 +93,9 @@ export default class StoreJournalEvents extends AuthenticatedEvents {
|
|
|
92
93
|
if (!entity.entries?.length) {
|
|
93
94
|
throw new EntityAccessError("Cannot save empty voucher");
|
|
94
95
|
}
|
|
95
|
-
let credits = 0;
|
|
96
|
-
let debits = 0;
|
|
96
|
+
let credits = Decimal(0);
|
|
97
|
+
let debits = Decimal(0);
|
|
98
|
+
const log = [];
|
|
97
99
|
for (const iterator of entity.entries) {
|
|
98
100
|
iterator.credit ??= 0;
|
|
99
101
|
iterator.debit ??= 0;
|
|
@@ -102,10 +104,11 @@ export default class StoreJournalEvents extends AuthenticatedEvents {
|
|
|
102
104
|
(iterator.debit > 0 && iterator.credit === 0))) {
|
|
103
105
|
throw new EntityAccessError(`Journal entry can only have positive credit or debit, not both.`);
|
|
104
106
|
}
|
|
105
|
-
credits
|
|
106
|
-
debits
|
|
107
|
+
credits = credits.add(Decimal(iterator.credit));
|
|
108
|
+
debits = debits.add(Decimal(iterator.debit));
|
|
107
109
|
}
|
|
108
|
-
if (
|
|
110
|
+
if (!credits.equals(debits)) {
|
|
111
|
+
console.log(entity.entries);
|
|
109
112
|
throw new EntityAccessError(`Journal is not balanced, sum of all credits ${credits} and debits ${debits} must be equal.`);
|
|
110
113
|
}
|
|
111
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,mBAAmB,MAAM,sDAAsD,CAAC;AACvF,OAAO,cAAc,MAAM,2CAA2C,CAAC;AAGvE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"StoreJournalEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/StoreJournalEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export default async function seedUI(config) {
|
|
|
14
14
|
await config.saveVersion(UIPackageConfig, {
|
|
15
15
|
package: "@social-mail/social-mail-client",
|
|
16
16
|
view: "dist/web/AppIndex",
|
|
17
|
-
version: "1.9.
|
|
17
|
+
version: "1.9.25"
|
|
18
18
|
});
|
|
19
19
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
20
20
|
package: "@social-mail/web-components",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JournalService.js","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,eAAe,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAgB,MAAM,qCAAqC,CAAC;AAIlE,IAAM,cAAc,GAApB,MAAM,cAAc;IAQ/B,KAAK,CAAC,WAAW,CAAC,KAAgC,EAAE,MAAoB;QAEpE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAElC,+BAA+B;QAC/B,qBAAqB;QACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;gBACrD,OAAO;gBACP,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,WAAW;aACpB,CAAC,CAAC;YACH,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;QACvC,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC;YAChB,MAAM;YACN,OAAO,EAAG,YAAY,CAAC,kBAAkB;YACzC,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YAEtC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAEjD,IAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,IAAI,CAAC,QAAQ,CAAC;oBAChB,OAAO,EAAE,YAAY,CAAC,KAAK;oBAC3B,QAAQ;oBACR,UAAU,EAAE,QAAQ,CAAC,UAAU;oBAC/B,MAAM;oBACN,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC
|
|
1
|
+
{"version":3,"file":"JournalService.js","sourceRoot":"","sources":["../../../../src/server/services/accounts/JournalService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesInvoiceService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAC,eAAe,EAAE,WAAW,EAAY,MAAM,gCAAgC,CAAC;AACvF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,aAAa,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesInvoiceService.d.ts","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAC,eAAe,EAAE,WAAW,EAAY,MAAM,gCAAgC,CAAC;AACvF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAM3D,MAAM,CAAC,OAAO,OAAO,mBAAoB,YAAW,UAAU,EAAE,eAAe,CAAC,mBAAmB,CAAC;IAEhG,KAAK,EAAE,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAGxC,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,EAAE,aAAa,CAAC;IAEvB,CAAC,MAAM,CAAC,OAAO,CAAC;IAIV,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY;IA6HvE,QAAQ,CAAC,OAAO,KAAA,EAAE,QAAQ,KAAA;IAYpB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAO5B,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ;CAYvE"}
|
|
@@ -13,6 +13,7 @@ import SocialMailContext from "../../../model/SocialMailContext.js";
|
|
|
13
13
|
import { cacheFor } from "../../../../common/cacheFor.js";
|
|
14
14
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
15
15
|
import CouponService from "../../coupons/CouponService.js";
|
|
16
|
+
import { Decimal } from "decimal.js";
|
|
16
17
|
let SalesInvoiceService = class SalesInvoiceService {
|
|
17
18
|
[Symbol.dispose]() {
|
|
18
19
|
this.cache?.[Symbol.dispose]();
|
|
@@ -30,17 +31,17 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
30
31
|
}
|
|
31
32
|
itemPrice = itemPrice ?? await this.getPrice(lineItem.itemPriceID);
|
|
32
33
|
lineItem.price = itemPrice.amount;
|
|
33
|
-
const itemAmount =
|
|
34
|
+
const itemAmount = Decimal(lineItem.price).mul(Decimal(lineItem.quantity));
|
|
34
35
|
if (lineItem.discountPercentage) {
|
|
35
|
-
lineItem.discount =
|
|
36
|
+
lineItem.discount = Decimal(lineItem.discountPercentage).mul(Decimal(lineItem.amount)).toString();
|
|
36
37
|
}
|
|
37
38
|
else {
|
|
38
39
|
lineItem.discount = 0;
|
|
39
40
|
}
|
|
40
|
-
const priceAfterDiscount = itemAmount
|
|
41
|
+
const priceAfterDiscount = itemAmount.sub(Decimal(lineItem.discount)).toString();
|
|
41
42
|
lineItem.couponDiscount ??= 0;
|
|
42
|
-
if (priceAfterDiscount
|
|
43
|
-
lineItem.priceAfterDiscount = priceAfterDiscount;
|
|
43
|
+
if (!Decimal(priceAfterDiscount).equals(Decimal(lineItem.priceAfterDiscount))) {
|
|
44
|
+
lineItem.priceAfterDiscount = priceAfterDiscount.toString();
|
|
44
45
|
await this.db.storeJournalLineItems.statements.update({ priceAfterDiscount }, { lineItemID: lineItem.lineItemID });
|
|
45
46
|
}
|
|
46
47
|
}
|
|
@@ -60,19 +61,30 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
60
61
|
}
|
|
61
62
|
itemPrice = itemPrice ?? await this.getPrice(lineItem.itemPriceID);
|
|
62
63
|
lineItem.taxLineItems ??= [];
|
|
63
|
-
const
|
|
64
|
-
let taxes = 0;
|
|
64
|
+
const taxPrices = await this.getTaxes(itemPrice.priceID, itemPrice.currency);
|
|
65
|
+
let taxes = Decimal(0);
|
|
65
66
|
await this.coupons.compute(lineItem);
|
|
66
|
-
lineItem.couponDiscount =
|
|
67
|
+
lineItem.couponDiscount = Decimal(lineItem.couponDiscount).toString();
|
|
67
68
|
lineItem.quantity ??= 0;
|
|
68
|
-
lineItem.quantity =
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
69
|
+
lineItem.quantity = Decimal(lineItem.quantity).toString();
|
|
70
|
+
if (itemPrice.taxIncluded) {
|
|
71
|
+
let taxDiscount = Decimal(0);
|
|
72
|
+
for (const taxPrice of taxPrices) {
|
|
73
|
+
taxDiscount = taxDiscount.add(taxPrice.amount);
|
|
74
|
+
}
|
|
75
|
+
const itemTotal = Decimal(lineItem.priceAfterDiscount).sub(Decimal(lineItem.couponDiscount));
|
|
76
|
+
const totalAmount = itemTotal.dividedBy(taxDiscount.add(1));
|
|
77
|
+
lineItem.amount = totalAmount.mul(lineItem.quantity).toString();
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
lineItem.amount = Decimal(lineItem.priceAfterDiscount).sub(Decimal(lineItem.couponDiscount)).mul(lineItem.quantity).toString();
|
|
81
|
+
}
|
|
82
|
+
for (const taxPrice of taxPrices) {
|
|
83
|
+
let taxLine = lineItem.taxLineItems.find((r) => r.itemID === taxPrice.storeItemID);
|
|
72
84
|
if (!taxLine) {
|
|
73
85
|
taxLine = this.db.storeJournalLineItems.add({
|
|
74
86
|
journal: entity,
|
|
75
|
-
itemID:
|
|
87
|
+
itemID: taxPrice.storeItemID,
|
|
76
88
|
taxFor: lineItem
|
|
77
89
|
});
|
|
78
90
|
lineItem.taxLineItems.push(taxLine);
|
|
@@ -80,32 +92,27 @@ let SalesInvoiceService = class SalesInvoiceService {
|
|
|
80
92
|
}
|
|
81
93
|
taxLine.itemType = "tax";
|
|
82
94
|
taxLine.taxFor = lineItem;
|
|
83
|
-
taxLine.itemPriceID =
|
|
95
|
+
taxLine.itemPriceID = taxPrice.priceID;
|
|
84
96
|
taxLine.quantity = 1;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
taxLine.price = Number(price.amount);
|
|
91
|
-
taxLine.amount = Number(taxLine.price);
|
|
92
|
-
taxLine.total = Number(lineItem.amount) * Number(price.amount);
|
|
93
|
-
taxes += taxLine.total;
|
|
97
|
+
taxLine.price = taxPrice.amount;
|
|
98
|
+
taxLine.amount = taxLine.price;
|
|
99
|
+
taxLine.total = Decimal(lineItem.amount).mul(Decimal(taxPrice.amount)).toString();
|
|
100
|
+
taxes = taxes.add(taxLine.total);
|
|
94
101
|
}
|
|
95
|
-
lineItem.taxes = taxes;
|
|
96
|
-
lineItem.total = lineItem.amount
|
|
102
|
+
lineItem.taxes = taxes.toString();
|
|
103
|
+
lineItem.total = Decimal(lineItem.amount).add(taxes).toString();
|
|
97
104
|
}
|
|
98
105
|
// calculate taxes...
|
|
99
106
|
// calculate total..
|
|
100
|
-
let total = 0;
|
|
107
|
+
let total = Decimal(0);
|
|
101
108
|
for (const lineItem of orderItems) {
|
|
102
109
|
if (lineItem.sourceID || lineItem.source) {
|
|
103
110
|
continue;
|
|
104
111
|
}
|
|
105
|
-
total
|
|
112
|
+
total = total.add(Decimal(lineItem.total));
|
|
106
113
|
}
|
|
107
|
-
entity.total = total;
|
|
108
|
-
entity.balance = total;
|
|
114
|
+
entity.total = total.toString();
|
|
115
|
+
entity.balance = total.toString();
|
|
109
116
|
}
|
|
110
117
|
getTaxes(priceID, currency) {
|
|
111
118
|
return this.db.storeItemPrices
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SalesInvoiceService.js","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAA+B,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,aAAa,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"SalesInvoiceService.js","sourceRoot":"","sources":["../../../../../src/server/services/accounts/sales/SalesInvoiceService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAA+B,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAItB,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAapC,CAAC,MAAM,CAAC,OAAO,CAAC;QACZ,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgC,EAAE,MAAoB;QAEnE,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAC/E,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aAC/F,KAAK,EAAE,CAAC;QAEb,MAAM,UAAU,GAA2B,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC;QAE3G,KAAI,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC/B,gBAAgB;YAChB,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,SAAS,EAAE,CAAC;gBACrC,QAAQ,CAAC,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC;YAC7C,CAAC;YACD,SAAS,GAAG,SAAS,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC;YAElC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;YAE3E,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAS,CAAC;YAC7G,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAS,CAAC;YAExF,QAAQ,CAAC,cAAc,KAAK,CAAC,CAAC;YAE9B,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC;gBAC5E,QAAQ,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,QAAQ,EAAS,CAAC;gBACnE,MAAM,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,UAAU,CAAC,MAAM,CACjD,EAAE,kBAAkB,EAAE,EACtB,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAC,CAAE,CAAC;YAC7C,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACvC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QAED,KAAI,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAE/B,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACvC,SAAS;YACb,CAAC;YAED,gBAAgB;YAChB,IAAI,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,SAAS,EAAE,CAAC;gBACrC,QAAQ,CAAC,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC;YAC7C,CAAC;YACD,SAAS,GAAG,SAAS,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnE,QAAQ,CAAC,YAAY,KAAK,EAAE,CAAC;YAE7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;YAE7E,IAAI,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEvB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAErC,QAAQ,CAAC,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAS,CAAC;YAC7E,QAAQ,CAAC,QAAQ,KAAK,CAAC,CAAC;YACxB,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAS,CAAC;YAGjE,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;gBAExB,IAAI,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAE7B,KAAI,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBAC9B,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACnD,CAAC;gBAED,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC7F,MAAM,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,QAAQ,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAS,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAS,CAAC;YAC1I,CAAC;YAED,KAAI,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAC9B,IAAI,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3C,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACvC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACX,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC;wBACxC,OAAO,EAAE,MAAM;wBACf,MAAM,EAAE,QAAQ,CAAC,WAAW;wBAC5B,MAAM,EAAE,QAAQ;qBACnB,CAAC,CAAC;oBACH,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACpC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnC,CAAC;gBACD,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACzB,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC;gBAC1B,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACvC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBAErB,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAChC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC/B,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAS,CAAC;gBACzF,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;YACD,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAS,CAAC;YACzC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAS,CAAC;QAC3E,CAAC;QAED,qBAAqB;QACrB,oBAAoB;QACpB,IAAI,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAEvB,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;YAChC,IAAI,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACvC,SAAS;YACb,CAAC;YACD,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAS,CAAC;QACvC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAS,CAAC;IAC7C,CAAC;IAGD,QAAQ,CAAC,OAAO,EAAE,QAAQ;QACtB,OAAO,IAAI,CAAC,EAAE,CAAC,eAAe;aACzB,KAAK,CAAC,EAAG,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;eAC/D,CAAC,CAAC,SAAS,CAAC,QAAQ;iBACtB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe;iBACrC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;mBAC/B,EAAE,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,CAChC,CAAC,CAAC;aACV,OAAO,EAAE,CAAC;IACnB,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAC,WAAmB;QAC9B,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe;aAC/B,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC;aACjE,KAAK,EAAE,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CAAC,WAAmB,EAAE,SAAmB;QAChE,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe;aACvC,KAAK,CAAC,EAAE,WAAW,EAAG,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7C,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS;eACvB,CAAC,CAAC,SAAS,CAAC,YAAY,KAAK,CAAC,CAAC,WAAW,CAChD;aACA,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC1C,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;QAC3C,OAAO,MAAM,CAAC;IAClB,CAAC;CAEJ,CAAA;AAxKG;IADC,MAAM;8BACU,eAAe;4DAAC;AAGjC;IADC,MAAM;8BACH,iBAAiB;+CAAC;AAGtB;IADC,MAAM;8BACE,aAAa;oDAAC;AAmIvB;IADC,QAAQ,EAAE;;;;mDAUV;AAGK;IADL,QAAQ,EAAE;;;;mDAKV;AAGK;IADL,QAAQ,EAAE;;6CACiD,QAAQ;;gEAUnE;AA3KgB,mBAAmB;IADvC,iBAAiB;GACG,mBAAmB,CA6KvC;eA7KoB,mBAAmB"}
|