@hartl-services/medusa-base 2.9.0 → 2.10.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/.medusa/server/src/documents/templates/financial-document.js +23 -4
- package/.medusa/server/src/modules/documents/domain/cancellation-snapshot.js +4 -1
- package/.medusa/server/src/modules/documents/domain/tax-breakdown.js +103 -29
- package/.medusa/server/src/shared/lib/index.js +2 -1
- package/.medusa/server/src/shared/lib/shipping-tax.js +12 -0
- package/.medusa/server/src/workflows/documents/issue-invoice-after-shipment.js +44 -33
- package/README.md +18 -4
- package/dist/documents/templates/financial-document.js +22 -3
- package/dist/documents/types/documents.d.ts +13 -0
- package/dist/shared/lib/index.d.ts +1 -0
- package/dist/shared/lib/index.js +1 -0
- package/dist/shared/lib/shipping-tax.d.ts +8 -0
- package/dist/shared/lib/shipping-tax.js +11 -0
- package/package.json +2 -2
|
@@ -63,7 +63,7 @@ const renderLines = (input, timeZone) => input.lines
|
|
|
63
63
|
</td>
|
|
64
64
|
<td class="number quantity">${(0, lib_1.escapeHtml)(line.quantity)}</td>
|
|
65
65
|
<td class="number">${(0, html_utils_1.renderMoney)(line.unit_price)}</td>
|
|
66
|
-
<td class="number">${(0, html_utils_1.renderMoney)(line.
|
|
66
|
+
<td class="number">${(0, html_utils_1.renderMoney)(line.subtotal)}</td>
|
|
67
67
|
</tr>`)
|
|
68
68
|
.join("");
|
|
69
69
|
const isExemptIntraCommunitySupply = (input) => input.order.tax_compliance?.exemption_wording ===
|
|
@@ -93,11 +93,30 @@ const formatTaxRate = (rate) => new Intl.NumberFormat(format_1.DEFAULT_FORMAT_LO
|
|
|
93
93
|
}).format(rate / 100);
|
|
94
94
|
/** One totals row below the Menge/Einzelpreis columns; the amount sits under "Summe". */
|
|
95
95
|
const renderTotalRow = (label, value, className) => `<tr${className ? ` class="${className}"` : ""}><td class="spacer"></td><td class="label" colspan="2">${(0, lib_1.escapeHtml)(label)}</td><td class="number">${value}</td></tr>`;
|
|
96
|
+
/** No discount, no row. */
|
|
97
|
+
const renderDiscountRow = (input) => Number(input.totals.discount_total.amount) === 0
|
|
98
|
+
? ""
|
|
99
|
+
: renderTotalRow("Rabatt", renderDiscountTotal(input));
|
|
100
|
+
/**
|
|
101
|
+
* One row per tax rate. With several rates each row also names its net
|
|
102
|
+
* amount, since an invoice states the amount taxed at every rate.
|
|
103
|
+
*/
|
|
96
104
|
const renderTaxRows = (input) => {
|
|
97
105
|
const { tax_breakdown: breakdown, tax_total: taxTotal } = input.totals;
|
|
106
|
+
const withNetAmount = breakdown.length > 1;
|
|
98
107
|
const rows = breakdown.length > 0
|
|
99
108
|
? breakdown.map((entry) => ({
|
|
100
|
-
label:
|
|
109
|
+
label: [
|
|
110
|
+
`${entry.name} ${formatTaxRate(entry.rate)}`,
|
|
111
|
+
withNetAmount && entry.taxable_amount
|
|
112
|
+
? `auf ${(0, format_1.formatMoney)({
|
|
113
|
+
amount: entry.taxable_amount.amount,
|
|
114
|
+
currencyCode: entry.taxable_amount.currency_code,
|
|
115
|
+
})}`
|
|
116
|
+
: null,
|
|
117
|
+
]
|
|
118
|
+
.filter((part) => Boolean(part))
|
|
119
|
+
.join(" "),
|
|
101
120
|
money: entry.tax_total,
|
|
102
121
|
}))
|
|
103
122
|
: [{ label: "Umsatzsteuer", money: taxTotal }];
|
|
@@ -141,7 +160,7 @@ const renderFinancialDocument = (input, layout, timeZone) => {
|
|
|
141
160
|
<tbody class="totals">
|
|
142
161
|
${renderTotalRow("Zwischensumme", (0, html_utils_1.renderMoney)(totals.subtotal))}
|
|
143
162
|
${renderTotalRow("Versand", (0, html_utils_1.renderMoney)(totals.shipping_total))}
|
|
144
|
-
${
|
|
163
|
+
${renderDiscountRow(input)}
|
|
145
164
|
${renderTaxRows(input)}
|
|
146
165
|
${renderTotalRow("Gesamt", (0, html_utils_1.renderMoney)(totals.total), "grand-total")}
|
|
147
166
|
</tbody>
|
|
@@ -158,4 +177,4 @@ const renderFinancialDocument = (input, layout, timeZone) => {
|
|
|
158
177
|
});
|
|
159
178
|
};
|
|
160
179
|
exports.renderFinancialDocument = renderFinancialDocument;
|
|
161
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
180
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"financial-document.js","sourceRoot":"","sources":["../../../../../src/documents/templates/financial-document.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,9 @@ const createCancellationSnapshot = (input) => {
|
|
|
57
57
|
const taxBreakdown = (0, tax_breakdown_1.roundTaxBreakdown)(sourceInvoice.totals.tax_breakdown.map((entry) => ({
|
|
58
58
|
...entry,
|
|
59
59
|
tax_total: scale(entry.tax_total),
|
|
60
|
+
...(entry.taxable_amount
|
|
61
|
+
? { taxable_amount: scale(entry.taxable_amount) }
|
|
62
|
+
: {}),
|
|
60
63
|
})), taxTotal);
|
|
61
64
|
const total = {
|
|
62
65
|
amount: refundAmount.negated().toFixed((0, lib_1.getCurrencyDecimalPlaces)(currencyCode)),
|
|
@@ -95,4 +98,4 @@ const createCancellationSnapshot = (input) => {
|
|
|
95
98
|
};
|
|
96
99
|
};
|
|
97
100
|
exports.createCancellationSnapshot = createCancellationSnapshot;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FuY2VsbGF0aW9uLXNuYXBzaG90LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL21vZHVsZXMvZG9jdW1lbnRzL2RvbWFpbi9jYW5jZWxsYXRpb24tc25hcHNob3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscURBQWtEO0FBTWxELHFFQUFvRTtBQUNwRSw2Q0FBOEQ7QUFDOUQsbURBQW1EO0FBRW5ELE1BQU0sZ0JBQWdCLEdBQUcsQ0FBQyxLQUFhLEVBQUUsS0FBYSxFQUFFLEVBQUU7SUFDeEQsTUFBTSxNQUFNLEdBQUcsY0FBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUNwQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsY0FBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNoRCxNQUFNLElBQUksS0FBSyxDQUFDLEdBQUcsS0FBSyxzQ0FBc0MsQ0FBQyxDQUFBO0lBQ2pFLENBQUM7SUFFRCxPQUFPLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQTtBQUVELE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxLQUs3QixFQUFpQixFQUFFO0lBQ2xCLElBQUksS0FBSyxDQUFDLEtBQUssQ0FBQyxhQUFhLEtBQUssS0FBSyxDQUFDLGFBQWEsRUFBRSxDQUFDO1FBQ3RELE1BQU0sSUFBSSxLQUFLLENBQUMsMERBQTBELENBQUMsQ0FBQTtJQUM3RSxDQUFDO0lBRUQsTUFBTSxhQUFhLEdBQUcsSUFBQSw4QkFBd0IsRUFBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDbkUsTUFBTSxNQUFNLEdBQUcsY0FBTSxDQUFDLElBQUksQ0FDeEIsY0FBTSxDQUFDLEdBQUcsQ0FBQyxjQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsS0FBSyxDQUFDLFlBQVksQ0FBQyxFQUNsRSxL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
|
|
@@ -3,33 +3,99 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.roundTaxBreakdown = exports.groupTaxLines = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const lib_1 = require("../../../shared/lib");
|
|
6
|
+
const groupKey = (line) => JSON.stringify([line.name, line.code, line.rate]);
|
|
7
|
+
/**
|
|
8
|
+
* Splits an apportioned shipping tax line (Tax Compliance's "Anteilige
|
|
9
|
+
* Versandsteuer") back onto the item tax groups by their items' net amount
|
|
10
|
+
* after discounts, the key Tax Compliance weights the rate by: each group
|
|
11
|
+
* gets its share of the shipping net amount and the tax of that share at
|
|
12
|
+
* its own rate. Returns false when the items have no net amount to split by.
|
|
13
|
+
*/
|
|
14
|
+
const splitApportionedShipping = (line, itemGroups) => {
|
|
15
|
+
const totalWeight = utils_1.MathBN.sum(0, ...itemGroups.map((group) => group.itemTaxable));
|
|
16
|
+
const totalWeightedRate = utils_1.MathBN.sum(0, ...itemGroups.map((group) => utils_1.MathBN.mult(group.itemTaxable, group.rate)));
|
|
17
|
+
if (!utils_1.MathBN.gt(totalWeight, 0) ||
|
|
18
|
+
(!utils_1.MathBN.gt(totalWeightedRate, 0) && !utils_1.MathBN.eq(line.amount, 0))) {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
for (const group of itemGroups) {
|
|
22
|
+
group.taxable = utils_1.MathBN.add(group.taxable, utils_1.MathBN.div(utils_1.MathBN.mult(line.taxable_amount, group.itemTaxable), totalWeight));
|
|
23
|
+
if (utils_1.MathBN.gt(totalWeightedRate, 0)) {
|
|
24
|
+
group.tax = utils_1.MathBN.add(group.tax, utils_1.MathBN.div(utils_1.MathBN.mult(line.amount, utils_1.MathBN.mult(group.itemTaxable, group.rate)), totalWeightedRate));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return true;
|
|
28
|
+
};
|
|
6
29
|
/**
|
|
7
30
|
* Sums item and shipping tax lines per configured tax rate. Lines with the
|
|
8
31
|
* same name and percentage form one entry; first occurrence defines order.
|
|
32
|
+
* Shipping follows the items' rates: an apportioned shipping line is split
|
|
33
|
+
* onto the item rates, and shipping taxed at the rate of a cart with one
|
|
34
|
+
* item tax group joins that group. Any other shipping tax keeps its own row.
|
|
9
35
|
*/
|
|
10
|
-
const groupTaxLines = (
|
|
36
|
+
const groupTaxLines = (itemLines, shippingLines, currencyCode) => {
|
|
11
37
|
const groups = new Map();
|
|
12
|
-
|
|
13
|
-
const key =
|
|
14
|
-
const
|
|
15
|
-
|
|
38
|
+
const groupFor = (line) => {
|
|
39
|
+
const key = groupKey(line);
|
|
40
|
+
const existing = groups.get(key);
|
|
41
|
+
if (existing) {
|
|
42
|
+
return existing;
|
|
43
|
+
}
|
|
44
|
+
const group = {
|
|
16
45
|
name: line.name,
|
|
17
46
|
code: line.code,
|
|
18
47
|
rate: line.rate,
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
48
|
+
tax: utils_1.MathBN.convert(0),
|
|
49
|
+
taxable: utils_1.MathBN.convert(0),
|
|
50
|
+
itemTaxable: utils_1.MathBN.convert(0),
|
|
51
|
+
};
|
|
52
|
+
groups.set(key, group);
|
|
53
|
+
return group;
|
|
54
|
+
};
|
|
55
|
+
for (const line of itemLines) {
|
|
56
|
+
const group = groupFor(line);
|
|
57
|
+
group.tax = utils_1.MathBN.add(group.tax, line.amount);
|
|
58
|
+
group.taxable = utils_1.MathBN.add(group.taxable, line.taxable_amount);
|
|
59
|
+
group.itemTaxable = utils_1.MathBN.add(group.itemTaxable, line.taxable_amount);
|
|
24
60
|
}
|
|
25
|
-
|
|
61
|
+
const itemGroups = [...groups.values()];
|
|
62
|
+
for (const line of shippingLines) {
|
|
63
|
+
if (line.code === lib_1.APPORTIONED_SHIPPING_TAX_CODE &&
|
|
64
|
+
splitApportionedShipping(line, itemGroups)) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
const group = itemGroups.length === 1 && itemGroups[0].rate === line.rate
|
|
68
|
+
? itemGroups[0]
|
|
69
|
+
: groupFor(line);
|
|
70
|
+
group.tax = utils_1.MathBN.add(group.tax, line.amount);
|
|
71
|
+
group.taxable = utils_1.MathBN.add(group.taxable, line.taxable_amount);
|
|
72
|
+
}
|
|
73
|
+
return [...groups.values()].map((group) => ({
|
|
74
|
+
name: group.name,
|
|
75
|
+
code: group.code,
|
|
76
|
+
rate: group.rate,
|
|
77
|
+
tax_total: { amount: group.tax.toFixed(), currency_code: currencyCode },
|
|
78
|
+
taxable_amount: {
|
|
79
|
+
amount: group.taxable.toFixed(),
|
|
80
|
+
currency_code: currencyCode,
|
|
81
|
+
},
|
|
82
|
+
}));
|
|
26
83
|
};
|
|
27
84
|
exports.groupTaxLines = groupTaxLines;
|
|
85
|
+
/** Rounds every amount and adds the residue to `target` to the largest one. */
|
|
86
|
+
const roundToTarget = (amounts, target, decimalPlaces) => {
|
|
87
|
+
const rounded = amounts.map((amount) => amount.decimalPlaces(decimalPlaces));
|
|
88
|
+
const residue = utils_1.MathBN.sub(target, utils_1.MathBN.sum(...rounded));
|
|
89
|
+
const largestIndex = rounded.reduce((largest, amount, index) => utils_1.MathBN.gt(amount.abs(), rounded[largest].abs()) ? index : largest, 0);
|
|
90
|
+
rounded[largestIndex] = utils_1.MathBN.add(rounded[largestIndex], residue);
|
|
91
|
+
return { rounded, residue };
|
|
92
|
+
};
|
|
28
93
|
/**
|
|
29
94
|
* Rounds every entry to the currency's minor unit and assigns the rounding
|
|
30
95
|
* residue to the largest entry, so the printed rows add up exactly to the
|
|
31
96
|
* printed tax total. A residue larger than the accumulated rounding error
|
|
32
|
-
* means the entries do not describe the total and is rejected.
|
|
97
|
+
* means the entries do not describe the total and is rejected. Net amounts
|
|
98
|
+
* are rounded the same way to their own rounded sum.
|
|
33
99
|
*/
|
|
34
100
|
const roundTaxBreakdown = (entries, taxTotal) => {
|
|
35
101
|
if (entries.length === 0) {
|
|
@@ -37,27 +103,35 @@ const roundTaxBreakdown = (entries, taxTotal) => {
|
|
|
37
103
|
}
|
|
38
104
|
const currencyCode = taxTotal.currency_code;
|
|
39
105
|
const decimalPlaces = (0, lib_1.getCurrencyDecimalPlaces)(currencyCode);
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
106
|
+
const money = (amount) => ({
|
|
107
|
+
amount: amount.toFixed(decimalPlaces),
|
|
108
|
+
currency_code: currencyCode,
|
|
109
|
+
});
|
|
110
|
+
for (const entry of entries) {
|
|
111
|
+
if (entry.tax_total.currency_code !== currencyCode ||
|
|
112
|
+
(entry.taxable_amount &&
|
|
113
|
+
entry.taxable_amount.currency_code !== currencyCode)) {
|
|
43
114
|
throw new Error("The tax breakdown contains mixed currencies.");
|
|
44
115
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
const residue = utils_1.MathBN.sub(target, utils_1.MathBN.sum(...rounded));
|
|
116
|
+
}
|
|
117
|
+
const tax = roundToTarget(entries.map((entry) => utils_1.MathBN.convert(entry.tax_total.amount)), utils_1.MathBN.convert(taxTotal.amount).decimalPlaces(decimalPlaces), decimalPlaces);
|
|
48
118
|
const minorUnit = utils_1.MathBN.convert(10).pow(-decimalPlaces);
|
|
49
|
-
if (utils_1.MathBN.gt(residue.abs(), utils_1.MathBN.mult(minorUnit, entries.length))) {
|
|
119
|
+
if (utils_1.MathBN.gt(tax.residue.abs(), utils_1.MathBN.mult(minorUnit, entries.length))) {
|
|
50
120
|
throw new Error("The tax breakdown does not match the tax total.");
|
|
51
121
|
}
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
...
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
122
|
+
const taxableAmounts = entries.map((entry) => entry.taxable_amount ? utils_1.MathBN.convert(entry.taxable_amount.amount) : null);
|
|
123
|
+
const knownTaxableAmounts = taxableAmounts.filter((amount) => amount !== null);
|
|
124
|
+
const taxable = knownTaxableAmounts.length === entries.length
|
|
125
|
+
? roundToTarget(knownTaxableAmounts, utils_1.MathBN.sum(...knownTaxableAmounts).decimalPlaces(decimalPlaces), decimalPlaces).rounded
|
|
126
|
+
: null;
|
|
127
|
+
return entries.map((entry, index) => {
|
|
128
|
+
const { taxable_amount: _taxableAmount, ...rest } = entry;
|
|
129
|
+
return {
|
|
130
|
+
...rest,
|
|
131
|
+
tax_total: money(tax.rounded[index]),
|
|
132
|
+
...(taxable ? { taxable_amount: money(taxable[index]) } : {}),
|
|
133
|
+
};
|
|
134
|
+
});
|
|
61
135
|
};
|
|
62
136
|
exports.roundTaxBreakdown = roundTaxBreakdown;
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
137
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tax-breakdown.js","sourceRoot":"","sources":["../../../../../../src/modules/documents/domain/tax-breakdown.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,8 @@ __exportStar(require("./hash"), exports);
|
|
|
24
24
|
__exportStar(require("./logging"), exports);
|
|
25
25
|
__exportStar(require("./money"), exports);
|
|
26
26
|
__exportStar(require("./refreshing-snapshot"), exports);
|
|
27
|
+
__exportStar(require("./shipping-tax"), exports);
|
|
27
28
|
__exportStar(require("./text"), exports);
|
|
28
29
|
__exportStar(require("./transaction"), exports);
|
|
29
30
|
__exportStar(require("./wire-response"), exports);
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvc2hhcmVkL2xpYi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdUVBQXVFO0FBQ3ZFLHFDQUFxQztBQUNyQywyQ0FBd0I7QUFDeEIsZ0RBQTZCO0FBQzdCLDBDQUF1QjtBQUN2QiwyQ0FBd0I7QUFDeEIseUNBQXNCO0FBQ3RCLDRDQUF5QjtBQUN6QiwwQ0FBdUI7QUFDdkIsd0RBQXFDO0FBQ3JDLGlEQUE4QjtBQUM5Qix5Q0FBc0I7QUFDdEIsZ0RBQTZCO0FBQzdCLGtEQUErQiJ9
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.APPORTIONED_SHIPPING_TAX_CODE = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Code of a shipping tax line whose rate is the item rates weighted by the
|
|
6
|
+
* items' net amount after discounts (shipping follows the main supplies,
|
|
7
|
+
* split by their Entgelt). Tax Compliance writes it; Documents splits such a
|
|
8
|
+
* line back onto the item tax rates by the same key, because an invoice
|
|
9
|
+
* states the tax per actual rate.
|
|
10
|
+
*/
|
|
11
|
+
exports.APPORTIONED_SHIPPING_TAX_CODE = "shipping_blended";
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctdGF4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL3NoYXJlZC9saWIvc2hpcHBpbmctdGF4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7Ozs7R0FNRztBQUNVLFFBQUEsNkJBQTZCLEdBQUcsa0JBQWtCLENBQUEifQ==
|
|
@@ -77,29 +77,32 @@ const asTaxRate = (value, field) => {
|
|
|
77
77
|
return rate;
|
|
78
78
|
};
|
|
79
79
|
/** Reads the calculated tax lines of order items and shipping methods. */
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
/** Net amount of an item or shipping method after discounts. */
|
|
81
|
+
const netAfterDiscounts = (owner) => utils_1.MathBN.sub(asAmount(owner.total), asAmount(owner.tax_total)).toFixed();
|
|
82
|
+
const toTaxLineAmountsOf = (owner, field) => {
|
|
83
|
+
const taxLines = owner.tax_lines;
|
|
84
|
+
if (!Array.isArray(taxLines) || taxLines.length === 0) {
|
|
82
85
|
return [];
|
|
83
86
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
rate: asTaxRate(taxLine.rate, `order.${field}[].tax_lines[].rate`),
|
|
98
|
-
amount: asAmount(taxLine.total),
|
|
99
|
-
};
|
|
100
|
-
});
|
|
87
|
+
const taxableAmount = netAfterDiscounts(owner);
|
|
88
|
+
return taxLines.map((value) => {
|
|
89
|
+
const taxLine = asRecord(value, `order.${field}[].tax_lines[]`);
|
|
90
|
+
const code = asOptionalString(taxLine.code);
|
|
91
|
+
return {
|
|
92
|
+
name: asOptionalString(taxLine.description)?.trim() ||
|
|
93
|
+
code?.trim() ||
|
|
94
|
+
"Umsatzsteuer",
|
|
95
|
+
code,
|
|
96
|
+
rate: asTaxRate(taxLine.rate, `order.${field}[].tax_lines[].rate`),
|
|
97
|
+
amount: asAmount(taxLine.total),
|
|
98
|
+
taxable_amount: taxableAmount,
|
|
99
|
+
};
|
|
101
100
|
});
|
|
102
101
|
};
|
|
102
|
+
const toItemTaxLineAmounts = (items) => items.flatMap((value) => toTaxLineAmountsOf(asRecord(value, "order.items[]"), "items"));
|
|
103
|
+
const toShippingTaxLineAmounts = (shippingMethods) => Array.isArray(shippingMethods)
|
|
104
|
+
? shippingMethods.flatMap((value) => toTaxLineAmountsOf(asRecord(value, "order.shipping_methods[]"), "shipping_methods"))
|
|
105
|
+
: [];
|
|
103
106
|
const toAddress = (value) => {
|
|
104
107
|
const address = (0, lib_1.asRecordOrNull)(value);
|
|
105
108
|
if (!address) {
|
|
@@ -182,23 +185,27 @@ const toInvoiceSource = (rawOrder, batchAllocations, taxCompliance) => {
|
|
|
182
185
|
const lineId = asRequiredString(item.id, "order.items[].id");
|
|
183
186
|
const variant = (0, lib_1.asRecordOrNull)(item.variant);
|
|
184
187
|
const batchAllocations = allocationsByLine[lineId] ?? [];
|
|
188
|
+
const quantity = asQuantity(item.quantity, "order.items[].quantity");
|
|
189
|
+
const subtotal = toMoney(item.subtotal, currencyCode);
|
|
185
190
|
return {
|
|
186
191
|
id: lineId,
|
|
187
192
|
title: asRequiredString(item.title, "order.items[].title"),
|
|
188
193
|
sku: asOptionalString(variant?.sku) ?? asOptionalString(item.variant_sku),
|
|
189
|
-
quantity
|
|
190
|
-
|
|
191
|
-
|
|
194
|
+
quantity,
|
|
195
|
+
// Net like the subtotal it multiplies to; Medusa's unit_price is gross
|
|
196
|
+
// for tax-inclusive prices.
|
|
197
|
+
unit_price: {
|
|
198
|
+
amount: utils_1.MathBN.div(subtotal.amount, quantity).toFixed(),
|
|
199
|
+
currency_code: currencyCode,
|
|
200
|
+
},
|
|
201
|
+
subtotal,
|
|
192
202
|
tax_total: toMoney(item.tax_total, currencyCode),
|
|
193
203
|
total: toMoney(item.total, currencyCode),
|
|
194
204
|
batch_allocations: batchAllocations.map((allocation) => ({ ...allocation })),
|
|
195
205
|
};
|
|
196
206
|
});
|
|
197
207
|
const taxTotal = toMoney(rawOrder.tax_total, currencyCode);
|
|
198
|
-
const taxBreakdown = (0, tax_breakdown_1.roundTaxBreakdown)((0, tax_breakdown_1.groupTaxLines)(
|
|
199
|
-
...toTaxLineAmounts(rawItems, "items"),
|
|
200
|
-
...toTaxLineAmounts(rawOrder.shipping_methods, "shipping_methods"),
|
|
201
|
-
], currencyCode), taxTotal);
|
|
208
|
+
const taxBreakdown = (0, tax_breakdown_1.roundTaxBreakdown)((0, tax_breakdown_1.groupTaxLines)(toItemTaxLineAmounts(rawItems), toShippingTaxLineAmounts(rawOrder.shipping_methods), currencyCode), taxTotal);
|
|
202
209
|
return {
|
|
203
210
|
order: {
|
|
204
211
|
id: asRequiredString(rawOrder.id, "order.id"),
|
|
@@ -210,11 +217,14 @@ const toInvoiceSource = (rawOrder, batchAllocations, taxCompliance) => {
|
|
|
210
217
|
},
|
|
211
218
|
lines,
|
|
212
219
|
totals: {
|
|
213
|
-
|
|
220
|
+
// Net amounts before discounts, so Zwischensumme + Versand - Rabatt +
|
|
221
|
+
// USt adds up to the total. Medusa's order `subtotal` already includes
|
|
222
|
+
// shipping, and its `shipping_total`/`discount_total` are gross.
|
|
223
|
+
subtotal: toMoney(rawOrder.item_subtotal, currencyCode),
|
|
214
224
|
tax_total: taxTotal,
|
|
215
225
|
tax_breakdown: taxBreakdown,
|
|
216
|
-
shipping_total: toMoney(rawOrder.
|
|
217
|
-
discount_total: toMoney(rawOrder.
|
|
226
|
+
shipping_total: toMoney(rawOrder.shipping_subtotal, currencyCode),
|
|
227
|
+
discount_total: toMoney(rawOrder.discount_subtotal, currencyCode),
|
|
218
228
|
total: toMoney(rawOrder.total, currencyCode),
|
|
219
229
|
},
|
|
220
230
|
};
|
|
@@ -260,11 +270,12 @@ const resolveInvoiceCandidateStep = (0, workflows_sdk_1.createStep)("documents-r
|
|
|
260
270
|
"items.*",
|
|
261
271
|
"items.variant.sku",
|
|
262
272
|
"items.tax_lines.*",
|
|
273
|
+
"shipping_methods.*",
|
|
263
274
|
"shipping_methods.tax_lines.*",
|
|
264
|
-
"
|
|
275
|
+
"item_subtotal",
|
|
265
276
|
"tax_total",
|
|
266
|
-
"
|
|
267
|
-
"
|
|
277
|
+
"shipping_subtotal",
|
|
278
|
+
"discount_subtotal",
|
|
268
279
|
"total",
|
|
269
280
|
],
|
|
270
281
|
},
|
|
@@ -516,4 +527,4 @@ exports.issueInvoiceAfterShipmentWorkflow = (0, workflows_sdk_1.createWorkflow)(
|
|
|
516
527
|
});
|
|
517
528
|
return new workflows_sdk_1.WorkflowResponse(issuedDocumentId);
|
|
518
529
|
});
|
|
519
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"issue-invoice-after-shipment.js","sourceRoot":"","sources":["../../../../../src/workflows/documents/issue-invoice-after-shipment.ts"],"names":[],"mappings":"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"}
|
|
530
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"issue-invoice-after-shipment.js","sourceRoot":"","sources":["../../../../../src/workflows/documents/issue-invoice-after-shipment.ts"],"names":[],"mappings":";;;AACA,qDAKkC;AAClC,qEAM0C;AAC1C,4DAAoE;AASpE,kFAIsD;AACtD,gFAIqD;AACrD,4FAAmG;AACnG,4FAA8F;AAC9F,6EAAgF;AAChF,0CAIyB;AACzB,qDAOyB;AACzB,qEAAmE;AA4DnE,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAE,KAAa,EAA2B,EAAE;IAC1E,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,aAAa,KAAK,oBAAoB,CACvC,CAAA;IACH,CAAC;IAED,OAAO,KAAgC,CAAA;AACzC,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAE,KAAa,EAAU,EAAE;IACjE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC/C,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,aAAa,KAAK,6BAA6B,CAChD,CAAA;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,2DAA2D;AAC3D,MAAM,gBAAgB,GAAG,CAAC,KAAc,EAAiB,EAAE,CACzD,IAAA,sBAAsB,EAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;AAErD,MAAM,cAAc,GAAG,CAAC,KAAc,EAAE,KAAa,EAAQ,EAAE;IAC7D,MAAM,IAAI,GAAG,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAA;IAC1E,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,aAAa,KAAK,uBAAuB,CAC1C,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,KAAc,EAAE,KAAa,EAAU,EAAE;IAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAA;IACpC,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAA;IACjC,IACE,CAAC,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,WAAW,KAAK,QAAQ,CAAC;QACpE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EACpC,CAAC;QACD,OAAO,MAAM,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC;IAED,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,aAAa,KAAK,6BAA6B,CAChD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAU,EAAE;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAA;IACpC,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAA;IACjC,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1D,OAAO,WAAW,CAAA;IACpB,CAAC;IACD,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACpE,OAAO,MAAM,CAAC,WAAW,CAAC,CAAA;IAC5B,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAC,KAAc,EAAE,YAAoB,EAAiB,EAAE,CAAC,CAAC;IACxE,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC;IACvB,aAAa,EAAE,YAAY;CAC5B,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,CAAC,KAAc,EAAE,KAAa,EAAU,EAAE;IAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,aAAa,KAAK,6BAA6B,CAChD,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,0EAA0E;AAC1E,gEAAgE;AAChE,MAAM,iBAAiB,GAAG,CAAC,KAA8B,EAAU,EAAE,CACnE,cAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;AAExE,MAAM,kBAAkB,GAAG,CACzB,KAA8B,EAC9B,KAAmC,EAClB,EAAE;IACnB,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAA;IAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAC9C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,SAAS,KAAK,gBAAgB,CAAC,CAAA;QAC/D,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO;YACL,IAAI,EACF,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE;gBAC7C,IAAI,EAAE,IAAI,EAAE;gBACZ,cAAc;YAChB,IAAI;YACJ,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,KAAK,qBAAqB,CAAC;YAClE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/B,cAAc,EAAE,aAAa;SAC9B,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,KAAgB,EAAmB,EAAE,CACjE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACtB,kBAAkB,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,CAC9D,CAAA;AAEH,MAAM,wBAAwB,GAAG,CAAC,eAAwB,EAAmB,EAAE,CAC7E,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;IAC5B,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAChC,kBAAkB,CAChB,QAAQ,CAAC,KAAK,EAAE,0BAA0B,CAAC,EAC3C,kBAAkB,CACnB,CACF;IACH,CAAC,CAAC,EAAE,CAAA;AAER,MAAM,SAAS,GAAG,CAAC,KAAc,EAA0B,EAAE;IAC3D,MAAM,OAAO,GAAG,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAA;IACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO;QACL,UAAU,EAAE,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC;QAChD,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9C,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1C,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9C,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9C,WAAW,EAAE,gBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC;KACrD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,KAAc,EACoB,EAAE,CACpC,CAAC,CAAC,KAAK;IACP,OAAO,KAAK,KAAK,QAAQ;IACzB,OAAQ,KAAqD;SAC1D,6BAA6B,KAAK,UAAU,CAAA;AAEjD,MAAM,kBAAkB,GAAG,CACzB,SAA0B,EAC1B,GAAW,EACF,EAAE;IACX,IAAI,CAAC;QACH,OAAO,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,KAAK,EACnC,SAA0B,EAC1B,OAAe,EACqB,EAAE;IACtC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAA;IAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,qIAAqI,CACtI,CAAA;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAA;IACtE,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAChC,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,+BAA+B,OAAO,+DAA+D,CACtG,CAAA;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,KAAK,EACrC,SAA0B,EAC1B,OAAe,EAC2B,EAAE;IAC5C,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,yHAAyH,CAC1H,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAC/B,gBAAgB,CACqB,CAAA;IACvC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;IAChE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,+BAA+B,CAAC,YAAY,CAAC,CAAA;IAC5E,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACnC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,gBAAgB,CACrC,QAAQ,CAAC,YAAY,EACrB,6BAA6B,CAC9B;QACD,mBAAmB,EAAE,gBAAgB,CACnC,QAAQ,CAAC,mBAAmB,EAC5B,oCAAoC,CACrC;QACD,iBAAiB,EAAE,8CAA8C;KAClE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,KAAK,EACrC,SAA0B,EAC1B,aAAqB,EACJ,EAAE;IACnB,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAC7B,iCAAyB,CAAC,IAAI,CACL,CAAA;IAC3B,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CAC9C,eAAO,CAAC,KAAK,EACb,UAAU,EACV,eAAO,CAAC,WAAW,EACnB,gBAAgB,CACjB,CAAA;IACD,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAC7C,EAAE,cAAc,EAAE,aAAa,EAAE,EACjC,EAAE,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,CACzB,CAAA;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;QAClD,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,gDAAgD,aAAa,GAAG,CACjE,CAAA;IACH,CAAC;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;AAC5B,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,QAAiC,EACjC,gBAA2C,EAC3C,aAA8C,EAC/B,EAAE;IACjB,MAAM,YAAY,GAAG,gBAAgB,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAA;IACpF,MAAM,iBAAiB,GAAG,IAAA,8CAA6B,EAAC,gBAAgB,CAAC,CAAA;IACzE,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAA;IAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,2DAA2D,CAC5D,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAA2B,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAA;QAC/C,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAA;QAC5D,MAAM,OAAO,GAAG,IAAA,oBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC5C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QACxD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QAErD,OAAO;YACL,EAAE,EAAE,MAAM;YACV,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,qBAAqB,CAAC;YAC1D,GAAG,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC;YACzE,QAAQ;YACR,uEAAuE;YACvE,4BAA4B;YAC5B,UAAU,EAAE;gBACV,MAAM,EAAE,cAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,OAAO,EAAE;gBACvD,aAAa,EAAE,YAAY;aAC5B;YACD,QAAQ;YACR,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC;YAChD,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC;YACxC,iBAAiB,EAAE,gBAAgB,CAAC,GAAG,CACrC,CAAC,UAAU,EAA8B,EAAE,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAChE;SACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IAC1D,MAAM,YAAY,GAAG,IAAA,iCAAiB,EACpC,IAAA,6BAAa,EACX,oBAAoB,CAAC,QAAQ,CAAC,EAC9B,wBAAwB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACnD,YAAY,CACb,EACD,QAAQ,CACT,CAAA;IAED,OAAO;QACL,KAAK,EAAE;YACL,EAAE,EAAE,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC;YAC7C,UAAU,EAAE,IAAA,oBAAc,EAAC,QAAQ,CAAC,UAAU,CAAC;YAC/C,KAAK,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;YACtD,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC;YACpD,cAAc,EAAE,aAAa;SAC9B;QACD,KAAK;QACL,MAAM,EAAE;YACN,sEAAsE;YACtE,uEAAuE;YACvE,iEAAiE;YACjE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC;YACvD,SAAS,EAAE,QAAQ;YACnB,aAAa,EAAE,YAAY;YAC3B,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,YAAY,CAAC;YACjE,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,EAAE,YAAY,CAAC;YACjE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;SAC7C;KACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,IAAA,0BAAU,EAS5C,oDAAoD,EACpD,KAAK,EACH,KAIC,EACD,EAAE,SAAS,EAAE,EACb,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ;QAC5B,CAAC,CAAC,KAAK,CAAC,QAAQ;QAChB,CAAC,CAAC,KAAK,CAAC,cAAc;YACpB,CAAC,CAAC,MAAM,yBAAyB,CAAC,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC;YAClE,CAAC,CAAC,IAAI,CAAA;IAEV,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,YAAY,EAC9B,gEAAgE,CACjE,CAAA;IACH,CAAC;IACD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QACzB,MAAM,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAC,+BAA+B,CAAC;YACvE,QAAQ,EAAE,OAAO;YACjB,cAAc,EAAE,KAAK,CAAC,cAAc;SACrC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,mCAAsB,EAAC,SAAS,CAAC,CAAC,GAAG,CAAC;QACvE,KAAK,EAAE;YACL,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE;gBACN,IAAI;gBACJ,YAAY;gBACZ,OAAO;gBACP,aAAa;gBACb,eAAe;gBACf,aAAa;gBACb,oBAAoB;gBACnB,iBAAiB;gBACjB,yBAAyB;gBACzB,yBAAyB;gBACzB,0BAA0B;gBAC3B,4BAA4B;gBAC5B,2BAA2B;gBAC3B,yBAAyB;gBACzB,2BAA2B;gBAC3B,2BAA2B;gBAC3B,6BAA6B;gBAC7B,sBAAsB;gBACtB,8BAA8B;gBAC9B,SAAS;gBACT,mBAAmB;gBACnB,mBAAmB;gBACnB,oBAAoB;gBACpB,8BAA8B;gBAC9B,eAAe;gBACf,WAAW;gBACX,mBAAmB;gBACnB,mBAAmB;gBACnB,OAAO;aACR;SACF;KACF,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,SAAS,OAAO,gCAAgC,CACjD,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,MAAM,UAAU,GACd,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,YAAY,IAAI;QACxE,CAAC,CAAC,KAAK,CAAC,WAAW;QACnB,CAAC,CAAC,IAAI,CAAA;IACV,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IACpE,IACE,CAAC,IAAA,+CAA8B,EAAC;QAC9B,WAAW,EAAE,UAAU;QACvB,kBAAkB,EAAE,iBAAiB;KACtC,CAAC,EACF,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,YAAY,EAC9B,UAAU;gBACR,CAAC,CAAC,6CAA6C,OAAO,eAAe;gBACrE,CAAC,CAAC,4EAA4E,OAAO,sCAAsC,iBAAiB,IAAI,SAAS,IAAI,CAChK,CAAA;QACH,CAAC;QAED,OAAO,IAAI,4BAAY,CAAmB;YACxC,YAAY,EAAE,KAAK;YACnB,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,IAAI;YACjB,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,IAAI,IAAI;YAC5D,QAAQ,EAAE,OAAO;YACjB,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI;SAC7C,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,aAAa,GAAG,KAAK,CAAC,cAAc,IAAI,IAAI,CAAA;IAChD,IAAI,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;QACpD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC;YACpD,CAAC,CAAC,KAAK,CAAC,YAAY;iBACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,oBAAc,EAAC,KAAK,CAAC,CAAC;iBACrC,MAAM,CACL,CAAC,KAAK,EAAoC,EAAE,CAC1C,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CACtE;iBACA,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACf,cAAc,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,gBAAgB,CAAC;gBAC5D,UAAU,EAAE,cAAc,CACxB,KAAK,CAAC,UAAU,EAChB,wBAAwB,CACzB;aACF,CAAC,CAAC;YACP,CAAC,CAAC,EAAE,CAAA;QACN,aAAa,GAAG,IAAA,oDAA8B,EAAC,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,SAAS,OAAO,qDAAqD,CACtE,CAAA;QACH,CAAC;QACD,MAAM,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAC,+BAA+B,CAAC;YACvE,QAAQ,EAAE,OAAO;YACjB,cAAc,EAAE,aAAa;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,uBAAuB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IAC1E,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzE,OAAO,IAAI,4BAAY,CAAmB;QACxC,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC;QAC/D,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC;QAChD,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,IAAI,IAAI;QAC5D,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,aAAa;KAC9B,CAAC,CAAA;AACJ,CAAC,CACF,CAAA;AAED,MAAM,gBAAgB,GAAG,IAAA,0BAAU,EACjC,+BAA+B,EAC/B,KAAK,EAAE,SAA2B,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;IACnD,IAAI,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACjD,IAAI,SAAS,CAAC,cAAc,EAAE,CAAC;YAC7B,MAAM,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAC,4BAA4B,CAAC;gBACpE,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,cAAc,EAAE,SAAS,CAAC,cAAc;gBACxC,cAAc,EAAE,KAAK;aACtB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,IAAI,4BAAY,CACrB;YACE,MAAM,EAAE,cAAc;YACtB,aAAa,EAAE,KAAK;YACpB,WAAW,EAAE,IAAI;YACjB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,SAAS;YACf,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,IAAI;YACxB,sBAAsB,EAAE,IAAI;YAC5B,gBAAgB,EAAE,IAAI;YACtB,gBAAgB,EAAE,KAAK;YACvB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,IAAI;YACvB,cAAc,EAAE,SAAS,CAAC,cAAc;SACzC,EACD,IAAI,CACL,CAAA;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,KAAK,CAAA;IACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAA;IAC3B,IAAI,SAAS,CAAC,sBAAsB,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,mBAAmB,CAClD,SAAS,CAAC,sBAAsB,EAChC,OAAO,CACR,CAAA;QACD,IAAI,CAAC,QAAQ,EAAE,eAAe,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YACtD,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,YAAY,EAC9B,6DAA6D,CAC9D,CAAA;QACH,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC3E,IAAI,YAAY,CAAC,MAAM,KAAK,aAAa,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC;YACzE,OAAO,IAAI,4BAAY,CACrB;gBACE,MAAM,EAAE,aAAa;gBACrB,aAAa,EAAE,KAAK;gBACpB,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,SAAS;gBACf,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE;gBACpD,sBAAsB,EAAE,IAAI;gBAC5B,gBAAgB,EAAE,QAAQ,CAAC,OAAO;gBAClC,gBAAgB,EAAE,IAAI;gBACtB,aAAa,EAAE,IAAI;gBACnB,iBAAiB,EAAE,IAAI;gBACvB,cAAc,EAAE,IAAI;aACrB,EACD,IAAI,CACL,CAAA;QACH,CAAC;QAED,OAAO,IAAI,4BAAY,CACrB;YACE,MAAM,EAAE,YAAY;YACpB,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,QAAQ,CAAC,EAAE;YACxB,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,IAAI,EAAE,SAAS;YACf,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE;YACpD,sBAAsB,EAAE,IAAI;YAC5B,gBAAgB,EAAE,QAAQ,CAAC,OAAO;YAClC,gBAAgB,EAAE,IAAI;YACtB,aAAa,EAAE,YAAY,CAAC,aAAa;YACzC,iBAAiB,EAAE,IAAI;YACvB,cAAc,EAAE,IAAI;SACrB,EACD,IAAI,CACL,CAAA;IACH,CAAC;IAED,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC9B,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,SAAS,OAAO,uCAAuC,CACxD,CAAA;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,IAAA,0CAAuB,EAC5C,SAAS,CACV,CAAC,4BAA4B,CAAC;QAC7B,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,cAAc;QACxC,cAAc,EAAE,IAAI;KACrB,CAAC,CAAA;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,gBAAgB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;QACxE,OAAO,IAAI,4BAAY,CACrB;YACE,MAAM,EACJ,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ;YAC9D,aAAa,EAAE,KAAK;YACpB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB;YACpD,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,SAAS;YACf,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,IAAI;YACxB,sBAAsB,EAAE,IAAI;YAC5B,gBAAgB,EAAE,IAAI;YACtB,gBAAgB,EAAE,KAAK;YACvB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,IAAI;YACvB,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc;SACnD,EACD,IAAI,CACL,CAAA;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC;QAC5E,QAAQ,EAAE,OAAO;QACjB,gBAAgB,EAAE,QAAQ,CAAC,UAAU;QACrC,WAAW,EAAE,SAAS,CAAC,WAAW;QAClC,eAAe,EAAE,QAAQ,CAAC,KAAK;KAChC,CAAC,CAAA;IAEF,OAAO,IAAI,4BAAY,CACrB;QACE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,OAAO,CAAC,MAAM,KAAK,KAAK;QACvC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;QAChC,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,eAAe;QACjD,kBAAkB,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE;QAC5D,sBAAsB,EAAE,IAAI;QAC5B,gBAAgB,EAAE,IAAI;QACtB,gBAAgB,EAAE,KAAK;QACvB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc;KACnD,EACD,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CACtD,CAAA;AACH,CAAC,CACF,CAAA;AAED,MAAM,mBAAmB,GAAG,IAAA,0BAAU,EAIpC,4BAA4B,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;IAC3E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,4BAAY,CAAgB,IAAI,CAAC,CAAA;IAC9C,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,0CAAuB,EAAC,SAAS,CAAC,CAAA;IACpD,IAAI,CAAC;QACH,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBACzB,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,QAAQ,EAC1B,qDAAqD,CACtD,CAAA;YACH,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,4BAA4B,CAAC;gBAC7D,EAAE,EAAE,QAAQ,CAAC,WAAW;gBACxB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,gBAAgB,EAAE,IAAI;gBACtB,aAAa,EAAE,KAAK,CAAC,aAAa;aACnC,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAG,SAAS,CAAC,iBAAiB,CAAA;YACpD,IACE,gBAAgB;gBAChB,IAAA,+CAAyB,EAAC,gBAAgB,CAAC;gBAC3C,gBAAgB,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,EAC7C,CAAC;gBACD,MAAM,IAAA,6CAA4B,EAChC,SAAS,EACT,gBAAgB,CAAC,OAAO,EACxB,QAAQ,CAAC,WAAW,EACpB,gBAAgB,CAAC,EAAE,CACpB,CAAA;YACH,CAAC;YACD,OAAO,IAAI,4BAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC/C,CAAC;QACD,IACE,CAAC,KAAK,CAAC,cAAc;YACrB,CAAC,KAAK,CAAC,iBAAiB;YACxB,CAAC,KAAK,CAAC,aAAa,EACpB,CAAC;YACD,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,QAAQ,EAC1B,mDAAmD,CACpD,CAAA;QACH,CAAC;QACD,MAAM,SAAS,CAAC,uBAAuB,CAAC;YACtC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACpC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;YAC1C,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,cAAc,EAAE,KAAK,CAAC,aAAa;YACnC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;SAC5B,CAAC,CAAA;QACF,OAAO,IAAI,4BAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAA,6CAA4B,EAChC,SAAS,EACT,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,WAAW,CACrB,CAAA;QACD,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC5B,MAAM,SAAS,CAAC,8BAA8B,CAAC;gBAC7C,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;aAC3C,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,SAAS,CAAC,0BAA0B,CAAC;gBACzC,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,MAAM,EAAE,qCAAqC;aAC9C,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAC,CAAA;AAWW,QAAA,iCAAiC,GAAG,IAAA,8BAAc,EAC7D,wCAAwC,EACxC,CAAC,KAAqC,EAAE,EAAE;IACxC,MAAM,SAAS,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAA;IACpD,IAAA,2CAA0B,EACxB,IAAA,yBAAS,EAAC,EAAE,SAAS,EAAE,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3C,QAAQ,EAAE,SAAS,CAAC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;KAC9D,CAAC,CAAC,CACJ,CAAA;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC3E,MAAM,aAAa,GAAG,IAAA,yBAAS,EAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACvD,CAAC,KAAK,CAAC,gBAAgB,CACxB,CAAA;IACD,IAAA,iDAAwB,EAAC;QACvB,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,gBAAgB;QACvB,OAAO,EAAE,aAAa;KACvB,CAAC,CAAA;IAEF,OAAO,IAAI,gCAAgB,CAAC,gBAAgB,CAAC,CAAA;AAC/C,CAAC,CACF,CAAA"}
|
package/README.md
CHANGED
|
@@ -2374,10 +2374,24 @@ separate documents package since 1.0.0.
|
|
|
2374
2374
|
persists the customer company, customer UID and exemption wording in that
|
|
2375
2375
|
same snapshot. B2C and non-eligible evidence add no tax-proof statement.
|
|
2376
2376
|
- Freezes a tax breakdown (`totals.tax_breakdown`) grouped by the order's
|
|
2377
|
-
item
|
|
2378
|
-
|
|
2379
|
-
|
|
2380
|
-
|
|
2377
|
+
item tax-line name and rate, as configured on the Medusa tax region, with
|
|
2378
|
+
the tax and the net amount (`taxable_amount`, after discounts) per rate.
|
|
2379
|
+
Shipping follows the items: a shipping tax line with the code
|
|
2380
|
+
`APPORTIONED_SHIPPING_TAX_CODE` (`/lib`; Tax Compliance's "Anteilige
|
|
2381
|
+
Versandsteuer") is split back onto the item rates by the items' net
|
|
2382
|
+
amount after discounts, the key Tax Compliance weights it by, so the
|
|
2383
|
+
invoice never prints a weighted rate. Other shipping tax joins the items'
|
|
2384
|
+
row when the cart has one item rate equal to it, otherwise it keeps its
|
|
2385
|
+
own row.
|
|
2386
|
+
Amounts are rounded to the currency and add up exactly to the tax total;
|
|
2387
|
+
cancellations scale them proportionally. Snapshots issued before these
|
|
2388
|
+
fields existed read as an empty breakdown or without net amounts.
|
|
2389
|
+
- Prints net amounts before discounts: line unit price and "Summe",
|
|
2390
|
+
"Zwischensumme" (items), "Versand" (before a free-shipping promotion),
|
|
2391
|
+
then all promotions as one net "Rabatt" (only when there is a discount),
|
|
2392
|
+
the tax rows and the gross "Gesamt"; the rows add up to the total. With
|
|
2393
|
+
several tax rates each tax row also names its net amount ("AT Reduziert
|
|
2394
|
+
10 % auf € 55,00").
|
|
2381
2395
|
- Persists one immutable decision per shipped Fulfillment. A leased, Order-
|
|
2382
2396
|
unique coordinator chooses exactly one invoice carrier without assuming
|
|
2383
2397
|
event delivery order; all other shipments become `non_carrier`.
|
|
@@ -63,7 +63,7 @@ const renderLines = (input, timeZone) => input.lines
|
|
|
63
63
|
</td>
|
|
64
64
|
<td class="number quantity">${(0, lib_1.escapeHtml)(line.quantity)}</td>
|
|
65
65
|
<td class="number">${(0, html_utils_1.renderMoney)(line.unit_price)}</td>
|
|
66
|
-
<td class="number">${(0, html_utils_1.renderMoney)(line.
|
|
66
|
+
<td class="number">${(0, html_utils_1.renderMoney)(line.subtotal)}</td>
|
|
67
67
|
</tr>`)
|
|
68
68
|
.join("");
|
|
69
69
|
const isExemptIntraCommunitySupply = (input) => input.order.tax_compliance?.exemption_wording ===
|
|
@@ -93,11 +93,30 @@ const formatTaxRate = (rate) => new Intl.NumberFormat(format_1.DEFAULT_FORMAT_LO
|
|
|
93
93
|
}).format(rate / 100);
|
|
94
94
|
/** One totals row below the Menge/Einzelpreis columns; the amount sits under "Summe". */
|
|
95
95
|
const renderTotalRow = (label, value, className) => `<tr${className ? ` class="${className}"` : ""}><td class="spacer"></td><td class="label" colspan="2">${(0, lib_1.escapeHtml)(label)}</td><td class="number">${value}</td></tr>`;
|
|
96
|
+
/** No discount, no row. */
|
|
97
|
+
const renderDiscountRow = (input) => Number(input.totals.discount_total.amount) === 0
|
|
98
|
+
? ""
|
|
99
|
+
: renderTotalRow("Rabatt", renderDiscountTotal(input));
|
|
100
|
+
/**
|
|
101
|
+
* One row per tax rate. With several rates each row also names its net
|
|
102
|
+
* amount, since an invoice states the amount taxed at every rate.
|
|
103
|
+
*/
|
|
96
104
|
const renderTaxRows = (input) => {
|
|
97
105
|
const { tax_breakdown: breakdown, tax_total: taxTotal } = input.totals;
|
|
106
|
+
const withNetAmount = breakdown.length > 1;
|
|
98
107
|
const rows = breakdown.length > 0
|
|
99
108
|
? breakdown.map((entry) => ({
|
|
100
|
-
label:
|
|
109
|
+
label: [
|
|
110
|
+
`${entry.name} ${formatTaxRate(entry.rate)}`,
|
|
111
|
+
withNetAmount && entry.taxable_amount
|
|
112
|
+
? `auf ${(0, format_1.formatMoney)({
|
|
113
|
+
amount: entry.taxable_amount.amount,
|
|
114
|
+
currencyCode: entry.taxable_amount.currency_code,
|
|
115
|
+
})}`
|
|
116
|
+
: null,
|
|
117
|
+
]
|
|
118
|
+
.filter((part) => Boolean(part))
|
|
119
|
+
.join(" "),
|
|
101
120
|
money: entry.tax_total,
|
|
102
121
|
}))
|
|
103
122
|
: [{ label: "Umsatzsteuer", money: taxTotal }];
|
|
@@ -141,7 +160,7 @@ const renderFinancialDocument = (input, layout, timeZone) => {
|
|
|
141
160
|
<tbody class="totals">
|
|
142
161
|
${renderTotalRow("Zwischensumme", (0, html_utils_1.renderMoney)(totals.subtotal))}
|
|
143
162
|
${renderTotalRow("Versand", (0, html_utils_1.renderMoney)(totals.shipping_total))}
|
|
144
|
-
${
|
|
163
|
+
${renderDiscountRow(input)}
|
|
145
164
|
${renderTaxRows(input)}
|
|
146
165
|
${renderTotalRow("Gesamt", (0, html_utils_1.renderMoney)(totals.total), "grand-total")}
|
|
147
166
|
</tbody>
|
|
@@ -40,13 +40,20 @@ export type DocumentTaxBreakdownEntry = {
|
|
|
40
40
|
code: string | null;
|
|
41
41
|
rate: number;
|
|
42
42
|
tax_total: DocumentMoney;
|
|
43
|
+
/**
|
|
44
|
+
* Net amount taxed at this rate (items and their share of shipping, after
|
|
45
|
+
* discounts). Missing in snapshots issued before it was recorded.
|
|
46
|
+
*/
|
|
47
|
+
taxable_amount?: DocumentMoney;
|
|
43
48
|
};
|
|
44
49
|
export type DocumentTemplateLine = {
|
|
45
50
|
id: string;
|
|
46
51
|
title: string;
|
|
47
52
|
sku: string | null;
|
|
48
53
|
quantity: number;
|
|
54
|
+
/** Net, before discounts (older invoice snapshots: Medusa's unit price). */
|
|
49
55
|
unit_price: DocumentMoney;
|
|
56
|
+
/** Net, before discounts; printed under "Summe". */
|
|
50
57
|
subtotal: DocumentMoney;
|
|
51
58
|
tax_total: DocumentMoney;
|
|
52
59
|
total: DocumentMoney;
|
|
@@ -74,6 +81,12 @@ export type DocumentTemplateInput = {
|
|
|
74
81
|
tax_compliance: DocumentTaxComplianceDTO | null;
|
|
75
82
|
};
|
|
76
83
|
lines: DocumentTemplateLine[];
|
|
84
|
+
/**
|
|
85
|
+
* Subtotal (items) and shipping are net amounts before discounts, the
|
|
86
|
+
* discount is net, so they add up with the tax to the total. Older invoice
|
|
87
|
+
* snapshots carry Medusa's order subtotal (items plus shipping) and gross
|
|
88
|
+
* shipping and discount totals.
|
|
89
|
+
*/
|
|
77
90
|
totals: {
|
|
78
91
|
subtotal: DocumentMoney;
|
|
79
92
|
tax_total: DocumentMoney;
|
package/dist/shared/lib/index.js
CHANGED
|
@@ -24,6 +24,7 @@ __exportStar(require("./hash"), exports);
|
|
|
24
24
|
__exportStar(require("./logging"), exports);
|
|
25
25
|
__exportStar(require("./money"), exports);
|
|
26
26
|
__exportStar(require("./refreshing-snapshot"), exports);
|
|
27
|
+
__exportStar(require("./shipping-tax"), exports);
|
|
27
28
|
__exportStar(require("./text"), exports);
|
|
28
29
|
__exportStar(require("./transaction"), exports);
|
|
29
30
|
__exportStar(require("./wire-response"), exports);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Code of a shipping tax line whose rate is the item rates weighted by the
|
|
3
|
+
* items' net amount after discounts (shipping follows the main supplies,
|
|
4
|
+
* split by their Entgelt). Tax Compliance writes it; Documents splits such a
|
|
5
|
+
* line back onto the item tax rates by the same key, because an invoice
|
|
6
|
+
* states the tax per actual rate.
|
|
7
|
+
*/
|
|
8
|
+
export declare const APPORTIONED_SHIPPING_TAX_CODE = "shipping_blended";
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.APPORTIONED_SHIPPING_TAX_CODE = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Code of a shipping tax line whose rate is the item rates weighted by the
|
|
6
|
+
* items' net amount after discounts (shipping follows the main supplies,
|
|
7
|
+
* split by their Entgelt). Tax Compliance writes it; Documents splits such a
|
|
8
|
+
* line back onto the item tax rates by the same key, because an invoice
|
|
9
|
+
* states the tax per actual rate.
|
|
10
|
+
*/
|
|
11
|
+
exports.APPORTIONED_SHIPPING_TAX_CODE = "shipping_blended";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hartl-services/medusa-base",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.10.0",
|
|
4
4
|
"description": "Base plugin for Hartl Services Medusa shops: per-plugin feature toggles with a generic Admin settings page, a Store endpoint for storefronts, enforcement helpers, the complete-cart hook composition, the root redirect, cart-promotion link repair, the built-in E-Mail, Documents and S3 file storage modules, config helpers with the turnkey food-shop preset, and the Sentry logger wrapper and instrumentation.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
"mime-types": "3.0.1",
|
|
102
102
|
"nodemailer": "6.10.1",
|
|
103
103
|
"ulid": "^2.4.0",
|
|
104
|
-
"@hartl-services/medusa-food-supplements-contracts": "^0.
|
|
104
|
+
"@hartl-services/medusa-food-supplements-contracts": "^0.30.0"
|
|
105
105
|
},
|
|
106
106
|
"devDependencies": {
|
|
107
107
|
"@medusajs/admin-sdk": "2.19.0",
|