@zosmaai/medusa-documents-v2 0.2.13 → 0.2.15
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/admin/index.js +58 -1
- package/.medusa/server/src/admin/index.mjs +59 -2
- package/.medusa/server/src/api/admin/documents/invoice/route.js +35 -25
- package/.medusa/server/src/modules/documents/migrations/Migration20260811120000.js +14 -0
- package/.medusa/server/src/modules/documents/models/document-invoice.js +2 -2
- package/.medusa/server/src/modules/documents/service.js +16 -6
- package/.medusa/server/src/modules/documents/services/templates/invoices/india-gst/parts/table.js +9 -4
- package/.medusa/server/src/modules/documents/types/constants.js +4 -2
- package/.medusa/server/src/ui-components/actions-dropdown/actions-dropdown.js +3 -2
- package/.medusa/server/src/ui-components/actions-dropdown/invoice/button-force-new-invoice.js +76 -0
- package/.medusa/server/src/ui-components/settings/settings-invoice.js +2 -2
- package/package.json +1 -1
|
@@ -70,6 +70,62 @@ const GenerateInvoiceDropdownButton = ({ order, updateInvoiceNumber }) => {
|
|
|
70
70
|
"Generate new invoice"
|
|
71
71
|
] });
|
|
72
72
|
};
|
|
73
|
+
const ForceNewInvoiceDropdownButton = ({ order, updateInvoiceNumber }) => {
|
|
74
|
+
const [isLoading, setLoading] = React.useState(false);
|
|
75
|
+
React.useEffect(() => {
|
|
76
|
+
if (!isLoading) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
fetch(`/admin/documents/invoice`, {
|
|
80
|
+
method: "POST",
|
|
81
|
+
credentials: "include",
|
|
82
|
+
headers: {
|
|
83
|
+
"Content-Type": "application/json"
|
|
84
|
+
},
|
|
85
|
+
body: JSON.stringify({
|
|
86
|
+
order_id: order.id,
|
|
87
|
+
force_new: true
|
|
88
|
+
})
|
|
89
|
+
}).then((res) => res.json()).then((responseJson) => {
|
|
90
|
+
if (responseJson && responseJson.message) {
|
|
91
|
+
ui.toast.error("Invoice", {
|
|
92
|
+
description: `Problem happened when generating new invoice number. ${responseJson.message}`
|
|
93
|
+
});
|
|
94
|
+
} else {
|
|
95
|
+
if (responseJson.buffer) {
|
|
96
|
+
updateInvoiceNumber(order.id, responseJson.invoice.displayNumber);
|
|
97
|
+
const anyBuffer = responseJson.buffer;
|
|
98
|
+
const blob = new Blob([new Uint8Array(anyBuffer.data)], { type: "application/pdf" });
|
|
99
|
+
ui.toast.dismiss();
|
|
100
|
+
const pdfURL = URL.createObjectURL(blob);
|
|
101
|
+
window.open(pdfURL, "_blank");
|
|
102
|
+
} else {
|
|
103
|
+
ui.toast.dismiss();
|
|
104
|
+
ui.toast.error("Invoice", {
|
|
105
|
+
description: "Problem happened when generating new invoice number"
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
setLoading(false);
|
|
110
|
+
}).catch((error) => {
|
|
111
|
+
var _a, _b;
|
|
112
|
+
console.error(error);
|
|
113
|
+
ui.toast.dismiss();
|
|
114
|
+
const trueError = error;
|
|
115
|
+
ui.toast.error("Invoice", {
|
|
116
|
+
description: (_b = (_a = trueError == null ? void 0 : trueError.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
}, [isLoading]);
|
|
120
|
+
return /* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu.Item, { className: "gap-x-2", onClick: () => {
|
|
121
|
+
if (window.confirm("This mints a brand new invoice number for this order, replacing the current one. The old number stays burned (not reusable). Continue?")) {
|
|
122
|
+
setLoading(true);
|
|
123
|
+
}
|
|
124
|
+
}, children: [
|
|
125
|
+
/* @__PURE__ */ jsxRuntime.jsx(icons.ArrowPath, {}),
|
|
126
|
+
"Generate new invoice number"
|
|
127
|
+
] });
|
|
128
|
+
};
|
|
73
129
|
const GeneratePackingSlipDropdownButton = ({ order, updatePackingSlipNumber }) => {
|
|
74
130
|
const [isLoading, setLoading] = React.useState(false);
|
|
75
131
|
const [error, setError] = React.useState(void 0);
|
|
@@ -127,6 +183,7 @@ function ActionsDropdown({ order, updateInvoiceNumber, updatePackingSlipNumber }
|
|
|
127
183
|
/* @__PURE__ */ jsxRuntime.jsx(ui.DropdownMenu.Trigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { children: /* @__PURE__ */ jsxRuntime.jsx(icons.EllipsisHorizontal, {}) }) }),
|
|
128
184
|
/* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu.Content, { children: [
|
|
129
185
|
/* @__PURE__ */ jsxRuntime.jsx(GenerateInvoiceDropdownButton, { order, updateInvoiceNumber }),
|
|
186
|
+
/* @__PURE__ */ jsxRuntime.jsx(ForceNewInvoiceDropdownButton, { order, updateInvoiceNumber }),
|
|
130
187
|
/* @__PURE__ */ jsxRuntime.jsx(ui.DropdownMenu.Separator, {}),
|
|
131
188
|
/* @__PURE__ */ jsxRuntime.jsx(GeneratePackingSlipDropdownButton, { order, updatePackingSlipNumber })
|
|
132
189
|
] })
|
|
@@ -1466,7 +1523,7 @@ const InvoiceSettingsForm = ({ invoiceSettings, setOpenModal }) => {
|
|
|
1466
1523
|
};
|
|
1467
1524
|
const INVOICE_NUMBER_PLACEHOLDER = "{invoice_number}";
|
|
1468
1525
|
const errorText = `Text ${INVOICE_NUMBER_PLACEHOLDER} needs to be included in input.`;
|
|
1469
|
-
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}`;
|
|
1526
|
+
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}. Optional: {year}, {month} (from order date), e.g. INV-{year}-{month}-{invoice_number}`;
|
|
1470
1527
|
const LABEL_MUST_FORCED = `Forced number must be a number`;
|
|
1471
1528
|
const LABEL_INFO_FORCED = `It will auto-increment starting from this number.`;
|
|
1472
1529
|
const validateFormatNumber = (value) => {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsxs, jsx, Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { defineRouteConfig } from "@medusajs/admin-sdk";
|
|
3
3
|
import { toast, DropdownMenu, IconButton, TooltipProvider, Tooltip, Text, StatusBadge, Table, Container, Alert, Heading, Button, RadioGroup, Label, Tabs, FocusModal, Input, Toaster } from "@medusajs/ui";
|
|
4
|
-
import { FlyingBox, EllipsisHorizontal, InformationCircle, DocumentText } from "@medusajs/icons";
|
|
4
|
+
import { FlyingBox, ArrowPath, EllipsisHorizontal, InformationCircle, DocumentText } from "@medusajs/icons";
|
|
5
5
|
import { Grid, CircularProgress, Link, Box } from "@mui/material";
|
|
6
6
|
import React, { useState, useEffect, useMemo, useReducer } from "react";
|
|
7
7
|
import clsx from "clsx";
|
|
@@ -65,6 +65,62 @@ const GenerateInvoiceDropdownButton = ({ order, updateInvoiceNumber }) => {
|
|
|
65
65
|
"Generate new invoice"
|
|
66
66
|
] });
|
|
67
67
|
};
|
|
68
|
+
const ForceNewInvoiceDropdownButton = ({ order, updateInvoiceNumber }) => {
|
|
69
|
+
const [isLoading, setLoading] = useState(false);
|
|
70
|
+
useEffect(() => {
|
|
71
|
+
if (!isLoading) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
fetch(`/admin/documents/invoice`, {
|
|
75
|
+
method: "POST",
|
|
76
|
+
credentials: "include",
|
|
77
|
+
headers: {
|
|
78
|
+
"Content-Type": "application/json"
|
|
79
|
+
},
|
|
80
|
+
body: JSON.stringify({
|
|
81
|
+
order_id: order.id,
|
|
82
|
+
force_new: true
|
|
83
|
+
})
|
|
84
|
+
}).then((res) => res.json()).then((responseJson) => {
|
|
85
|
+
if (responseJson && responseJson.message) {
|
|
86
|
+
toast.error("Invoice", {
|
|
87
|
+
description: `Problem happened when generating new invoice number. ${responseJson.message}`
|
|
88
|
+
});
|
|
89
|
+
} else {
|
|
90
|
+
if (responseJson.buffer) {
|
|
91
|
+
updateInvoiceNumber(order.id, responseJson.invoice.displayNumber);
|
|
92
|
+
const anyBuffer = responseJson.buffer;
|
|
93
|
+
const blob = new Blob([new Uint8Array(anyBuffer.data)], { type: "application/pdf" });
|
|
94
|
+
toast.dismiss();
|
|
95
|
+
const pdfURL = URL.createObjectURL(blob);
|
|
96
|
+
window.open(pdfURL, "_blank");
|
|
97
|
+
} else {
|
|
98
|
+
toast.dismiss();
|
|
99
|
+
toast.error("Invoice", {
|
|
100
|
+
description: "Problem happened when generating new invoice number"
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
setLoading(false);
|
|
105
|
+
}).catch((error) => {
|
|
106
|
+
var _a, _b;
|
|
107
|
+
console.error(error);
|
|
108
|
+
toast.dismiss();
|
|
109
|
+
const trueError = error;
|
|
110
|
+
toast.error("Invoice", {
|
|
111
|
+
description: (_b = (_a = trueError == null ? void 0 : trueError.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
}, [isLoading]);
|
|
115
|
+
return /* @__PURE__ */ jsxs(DropdownMenu.Item, { className: "gap-x-2", onClick: () => {
|
|
116
|
+
if (window.confirm("This mints a brand new invoice number for this order, replacing the current one. The old number stays burned (not reusable). Continue?")) {
|
|
117
|
+
setLoading(true);
|
|
118
|
+
}
|
|
119
|
+
}, children: [
|
|
120
|
+
/* @__PURE__ */ jsx(ArrowPath, {}),
|
|
121
|
+
"Generate new invoice number"
|
|
122
|
+
] });
|
|
123
|
+
};
|
|
68
124
|
const GeneratePackingSlipDropdownButton = ({ order, updatePackingSlipNumber }) => {
|
|
69
125
|
const [isLoading, setLoading] = useState(false);
|
|
70
126
|
const [error, setError] = useState(void 0);
|
|
@@ -122,6 +178,7 @@ function ActionsDropdown({ order, updateInvoiceNumber, updatePackingSlipNumber }
|
|
|
122
178
|
/* @__PURE__ */ jsx(DropdownMenu.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(IconButton, { children: /* @__PURE__ */ jsx(EllipsisHorizontal, {}) }) }),
|
|
123
179
|
/* @__PURE__ */ jsxs(DropdownMenu.Content, { children: [
|
|
124
180
|
/* @__PURE__ */ jsx(GenerateInvoiceDropdownButton, { order, updateInvoiceNumber }),
|
|
181
|
+
/* @__PURE__ */ jsx(ForceNewInvoiceDropdownButton, { order, updateInvoiceNumber }),
|
|
125
182
|
/* @__PURE__ */ jsx(DropdownMenu.Separator, {}),
|
|
126
183
|
/* @__PURE__ */ jsx(GeneratePackingSlipDropdownButton, { order, updatePackingSlipNumber })
|
|
127
184
|
] })
|
|
@@ -1461,7 +1518,7 @@ const InvoiceSettingsForm = ({ invoiceSettings, setOpenModal }) => {
|
|
|
1461
1518
|
};
|
|
1462
1519
|
const INVOICE_NUMBER_PLACEHOLDER = "{invoice_number}";
|
|
1463
1520
|
const errorText = `Text ${INVOICE_NUMBER_PLACEHOLDER} needs to be included in input.`;
|
|
1464
|
-
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}`;
|
|
1521
|
+
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}. Optional: {year}, {month} (from order date), e.g. INV-{year}-{month}-{invoice_number}`;
|
|
1465
1522
|
const LABEL_MUST_FORCED = `Forced number must be a number`;
|
|
1466
1523
|
const LABEL_INFO_FORCED = `It will auto-increment starting from this number.`;
|
|
1467
1524
|
const validateFormatNumber = (value) => {
|
|
@@ -30,33 +30,43 @@ const POST = async (req, res) => {
|
|
|
30
30
|
relations: ['shipping_address', 'billing_address', 'items']
|
|
31
31
|
});
|
|
32
32
|
if (order) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
id
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
newInvoiceId: result.invoice.id,
|
|
52
|
-
oldInvoiceId: orderWithInvoice.document_invoice ? orderWithInvoice.document_invoice.id : undefined
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
res.status(201).json(result);
|
|
33
|
+
// Idempotency check: if order already has an invoice, return it instead of minting new number
|
|
34
|
+
const query = req.scope.resolve(utils_3.ContainerRegistrationKeys.QUERY);
|
|
35
|
+
const { data: [orderWithInvoice], } = await query.graph({
|
|
36
|
+
entity: "order",
|
|
37
|
+
filters: {
|
|
38
|
+
id: [
|
|
39
|
+
order.id
|
|
40
|
+
]
|
|
41
|
+
},
|
|
42
|
+
fields: [
|
|
43
|
+
"document_invoice.*",
|
|
44
|
+
],
|
|
45
|
+
});
|
|
46
|
+
const forceNew = body.force_new === true;
|
|
47
|
+
let result;
|
|
48
|
+
if (orderWithInvoice.document_invoice && !forceNew) {
|
|
49
|
+
// Order already has invoice - regenerate PDF from existing invoice
|
|
50
|
+
result = await documentsModuleService.getInvoice(order, orderWithInvoice.document_invoice.id, true);
|
|
56
51
|
}
|
|
57
52
|
else {
|
|
58
|
-
|
|
53
|
+
// No existing invoice, or forced - mint a new number
|
|
54
|
+
result = await documentsModuleService.generateInvoiceForOrder(order);
|
|
55
|
+
if (result.invoice) {
|
|
56
|
+
await (0, assign_invoice_1.default)(req.scope)
|
|
57
|
+
.run({
|
|
58
|
+
input: {
|
|
59
|
+
orderId: order.id,
|
|
60
|
+
newInvoiceId: result.invoice.id,
|
|
61
|
+
oldInvoiceId: orderWithInvoice.document_invoice ? orderWithInvoice.document_invoice.id : undefined
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, 'Invoice not generated');
|
|
67
|
+
}
|
|
59
68
|
}
|
|
69
|
+
res.status(201).json(result);
|
|
60
70
|
}
|
|
61
71
|
else {
|
|
62
72
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, 'Invalid order id');
|
|
@@ -109,4 +119,4 @@ const GET = async (req, res) => {
|
|
|
109
119
|
}
|
|
110
120
|
};
|
|
111
121
|
exports.GET = GET;
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
122
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL2RvY3VtZW50cy9pbnZvaWNlL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7OztHQVVHOzs7Ozs7QUFPSCwyQ0FBNkM7QUFFN0MsNkRBQWdFO0FBQ2hFLHFEQUFvRDtBQUNwRCxxREFBc0U7QUFDdEUsMEZBQStFO0FBR3hFLE1BQU0sSUFBSSxHQUFHLEtBQUssRUFDdkIsR0FBa0IsRUFDbEIsR0FBbUIsRUFDbkIsRUFBRTtJQUVGLE1BQU0sc0JBQXNCLEdBQTJCLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLDRCQUFnQixDQUFDLENBQUE7SUFDMUYsTUFBTSxrQkFBa0IsR0FBeUIsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQ2hFLGVBQU8sQ0FBQyxLQUFLLENBQ2QsQ0FBQztJQUVGLElBQUksQ0FBQztRQUNILE1BQU0sSUFBSSxHQUFRLEdBQUcsQ0FBQyxJQUFXLENBQUM7UUFDbEMsTUFBTSxLQUFLLEdBQWEsTUFBTSxrQkFBa0IsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUM1RSxNQUFNLEVBQUUsQ0FBQyxHQUFHLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLFdBQVcsQ0FBQztZQUMxRCxTQUFTLEVBQUUsQ0FBQyxrQkFBa0IsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLENBQUM7U0FDNUQsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNWLDhGQUE4RjtZQUM5RixNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxpQ0FBeUIsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNoRSxNQUFNLEVBQ0osSUFBSSxFQUFFLENBQUMsZ0JBQWdCLENBQUMsR0FDekIsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7Z0JB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
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Migration20260811120000 = void 0;
|
|
4
|
+
const migrations_1 = require("@mikro-orm/migrations");
|
|
5
|
+
class Migration20260811120000 extends migrations_1.Migration {
|
|
6
|
+
async up() {
|
|
7
|
+
this.addSql(`alter table if exists "document_invoice" add constraint "document_invoice_number_unique" unique ("number");`);
|
|
8
|
+
}
|
|
9
|
+
async down() {
|
|
10
|
+
this.addSql(`alter table if exists "document_invoice" drop constraint if exists "document_invoice_number_unique";`);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
exports.Migration20260811120000 = Migration20260811120000;
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWlncmF0aW9uMjAyNjA4MTExMjAwMDAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9kb2N1bWVudHMvbWlncmF0aW9ucy9NaWdyYXRpb24yMDI2MDgxMTEyMDAwMC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxzREFBa0Q7QUFFbEQsTUFBYSx1QkFBd0IsU0FBUSxzQkFBUztJQUUzQyxLQUFLLENBQUMsRUFBRTtRQUNmLElBQUksQ0FBQyxNQUFNLENBQUMsNkdBQTZHLENBQUMsQ0FBQztJQUM3SCxDQUFDO0lBRVEsS0FBSyxDQUFDLElBQUk7UUFDakIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxzR0FBc0csQ0FBQyxDQUFDO0lBQ3RILENBQUM7Q0FFRjtBQVZELDBEQVVDIn0=
|
|
@@ -19,7 +19,7 @@ const document_invoice_settings_1 = __importDefault(require("./document-invoice-
|
|
|
19
19
|
const document_settings_1 = __importDefault(require("./document-settings"));
|
|
20
20
|
const DocumentInvoice = utils_1.model.define("document_invoice", {
|
|
21
21
|
id: utils_1.model.id().primaryKey(),
|
|
22
|
-
number: utils_1.model.number(),
|
|
22
|
+
number: utils_1.model.number().unique(),
|
|
23
23
|
displayNumber: utils_1.model.text(),
|
|
24
24
|
invoiceSettings: utils_1.model.belongsTo(() => document_invoice_settings_1.default, {
|
|
25
25
|
mappedBy: 'documentInvoice'
|
|
@@ -29,4 +29,4 @@ const DocumentInvoice = utils_1.model.define("document_invoice", {
|
|
|
29
29
|
})
|
|
30
30
|
});
|
|
31
31
|
exports.default = DocumentInvoice;
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdW1lbnQtaW52b2ljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9tb2R1bGVzL2RvY3VtZW50cy9tb2RlbHMvZG9jdW1lbnQtaW52b2ljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7R0FVRzs7Ozs7QUFFSCxxREFBaUQ7QUFDakQsNEZBQWlFO0FBQ2pFLDRFQUFrRDtBQUVsRCxNQUFNLGVBQWUsR0FBRyxhQUFLLENBQUMsTUFBTSxDQUFDLGtCQUFrQixFQUFFO0lBQ3ZELEVBQUUsRUFBRSxhQUFLLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxFQUFFO0lBQzNCLE1BQU0sRUFBRSxhQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsTUFBTSxFQUFFO0lBQy9CLGFBQWEsRUFBRSxhQUFLLENBQUMsSUFBSSxFQUFFO0lBQzNCLGVBQWUsRUFBRSxhQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLG1DQUF1QixFQUFFO1FBQzlELFFBQVEsRUFBRSxpQkFBaUI7S0FDNUIsQ0FBQztJQUNGLFFBQVEsRUFBRSxhQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLDJCQUFnQixFQUFFO1FBQ2hELFFBQVEsRUFBRSxpQkFBaUI7S0FDNUIsQ0FBQztDQUNILENBQUMsQ0FBQTtBQUVGLGtCQUFlLGVBQWUsQ0FBQSJ9
|
|
@@ -81,7 +81,7 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
81
81
|
}
|
|
82
82
|
const lastInvoice = await this.listDocumentInvoices({}, {
|
|
83
83
|
order: {
|
|
84
|
-
|
|
84
|
+
number: "DESC"
|
|
85
85
|
},
|
|
86
86
|
take: 1
|
|
87
87
|
});
|
|
@@ -90,10 +90,20 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
90
90
|
}
|
|
91
91
|
return '1';
|
|
92
92
|
}
|
|
93
|
+
formatInvoiceDisplayNumber(format, nextNumber, date) {
|
|
94
|
+
if (!format) {
|
|
95
|
+
return nextNumber;
|
|
96
|
+
}
|
|
97
|
+
const paddedNumber = nextNumber.padStart(2, '0');
|
|
98
|
+
return format
|
|
99
|
+
.replace(constants_1.INVOICE_YEAR_PLACEHOLDER, date.getFullYear().toString())
|
|
100
|
+
.replace(constants_1.INVOICE_MONTH_PLACEHOLDER, (date.getMonth() + 1).toString().padStart(2, '0'))
|
|
101
|
+
.replace(constants_1.INVOICE_NUMBER_PLACEHOLDER, paddedNumber);
|
|
102
|
+
}
|
|
93
103
|
async getNextPackingSlipNumber() {
|
|
94
104
|
const lastPackingSlip = await this.listDocumentPackingSlips({}, {
|
|
95
105
|
order: {
|
|
96
|
-
|
|
106
|
+
number: "DESC"
|
|
97
107
|
},
|
|
98
108
|
take: 1
|
|
99
109
|
});
|
|
@@ -197,7 +207,7 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
197
207
|
if (validationPassed) {
|
|
198
208
|
const testInvoice = {
|
|
199
209
|
number: parseInt(nextNumber),
|
|
200
|
-
displayNumber: invoiceSettings.numberFormat ?
|
|
210
|
+
displayNumber: this.formatInvoiceDisplayNumber(invoiceSettings.numberFormat, nextNumber, order.created_at ? new Date(order.created_at) : new Date()),
|
|
201
211
|
created_at: new Date(Date.now())
|
|
202
212
|
};
|
|
203
213
|
const buffer = await (0, invoice_generator_1.generateInvoice)(templateKind, lastDocumentSettings[0], testInvoice, order);
|
|
@@ -248,7 +258,7 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
248
258
|
const nextNumber = await this.getNextInvoiceNumber(RESET_FORCED_NUMBER);
|
|
249
259
|
const entryInvoice = {
|
|
250
260
|
number: parseInt(nextNumber),
|
|
251
|
-
displayNumber: invoiceSettings.numberFormat ?
|
|
261
|
+
displayNumber: this.formatInvoiceDisplayNumber(invoiceSettings.numberFormat, nextNumber, order.created_at ? new Date(order.created_at) : new Date()),
|
|
252
262
|
created_at: new Date(Date.now()),
|
|
253
263
|
invoice_settings_id: invoiceSettings.id,
|
|
254
264
|
settings_id: lastDocumentSettings[0].id
|
|
@@ -493,10 +503,10 @@ class DocumentsModuleService extends (0, utils_2.MedusaService)({
|
|
|
493
503
|
async getTestDisplayNumber(formatNumber, forcedNumber) {
|
|
494
504
|
const nextNumber = forcedNumber !== undefined ? forcedNumber : await this.getNextInvoiceNumber();
|
|
495
505
|
if (nextNumber) {
|
|
496
|
-
return
|
|
506
|
+
return this.formatInvoiceDisplayNumber(formatNumber, nextNumber, new Date());
|
|
497
507
|
}
|
|
498
508
|
throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, 'Neither forced number is set or any order present');
|
|
499
509
|
}
|
|
500
510
|
}
|
|
501
511
|
exports.default = DocumentsModuleService;
|
|
502
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":"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"}
|
|
512
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../../src/modules/documents/service.ts"],"names":[],"mappings":"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"}
|
package/.medusa/server/src/modules/documents/services/templates/invoices/india-gst/parts/table.js
CHANGED
|
@@ -21,8 +21,9 @@ function generateTableRow(doc, y, item, hsn, quantity, unitCost, lineTotal) {
|
|
|
21
21
|
nextY = _y + height;
|
|
22
22
|
}
|
|
23
23
|
doc
|
|
24
|
-
.text(
|
|
25
|
-
.text(
|
|
24
|
+
// ponytail: HSN/SAC column hidden, B2C-only for now. Re-enable when B2B sales resume: restore width 190, uncomment .text(hsn, 235, _y, { width: 55 })
|
|
25
|
+
.text(item, 40, _y, { width: 250 })
|
|
26
|
+
// .text(hsn, 235, _y, { width: 55 })
|
|
26
27
|
.text(quantity, 295, _y, { width: 45, align: "right" })
|
|
27
28
|
.text(unitCost, 345, _y, { width: 85, align: "right" })
|
|
28
29
|
.text(lineTotal, 435, _y, { width: 120, align: "right" });
|
|
@@ -42,13 +43,16 @@ function generateInvoiceTable(doc, y, order, items, isInterState) {
|
|
|
42
43
|
(0, hr_1.generateHr)(doc, invoiceTableTop + 15);
|
|
43
44
|
doc.font("Regular");
|
|
44
45
|
let currentY = invoiceTableTop + 25;
|
|
46
|
+
let taxableTotal = 0;
|
|
45
47
|
for (i = 0; i < items.length; i++) {
|
|
46
48
|
if (currentY > pageHeight) {
|
|
47
49
|
doc.addPage();
|
|
48
50
|
currentY = 50;
|
|
49
51
|
}
|
|
50
52
|
const item = items[i];
|
|
51
|
-
|
|
53
|
+
const lineTaxableValue = Number(item.raw_subtotal.value);
|
|
54
|
+
taxableTotal += lineTaxableValue;
|
|
55
|
+
currentY = generateTableRow(doc, currentY, item.title, item.metadata?.hsn_code ? String(item.metadata.hsn_code) : '', item.quantity, amountToDisplayNormalized(lineTaxableValue / item.quantity, order.currency_code), amountToDisplayNormalized(lineTaxableValue, order.currency_code));
|
|
52
56
|
currentY += 5;
|
|
53
57
|
if (currentY > pageHeight) {
|
|
54
58
|
doc.addPage();
|
|
@@ -66,6 +70,7 @@ function generateInvoiceTable(doc, y, order, items, isInterState) {
|
|
|
66
70
|
const taxTotal = order.tax_total.numeric;
|
|
67
71
|
const grandTotal = order.total.numeric;
|
|
68
72
|
doc.fontSize(9);
|
|
73
|
+
currentY = generateTotalRow(doc, currentY, (0, i18next_1.t)("invoice-table-taxable-value", "Taxable Value"), amountToDisplayNormalized(taxableTotal, order.currency_code));
|
|
69
74
|
currentY = generateTotalRow(doc, currentY, (0, i18next_1.t)("invoice-table-shipping", "Shipping"), amountToDisplayNormalized(shippingTotal, order.currency_code));
|
|
70
75
|
if (isInterState) {
|
|
71
76
|
currentY = generateTotalRow(doc, currentY, "IGST", amountToDisplayNormalized(taxTotal, order.currency_code));
|
|
@@ -85,4 +90,4 @@ function generateInvoiceTable(doc, y, order, items, isInterState) {
|
|
|
85
90
|
doc.font("Regular");
|
|
86
91
|
return currentY + 25;
|
|
87
92
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9kb2N1bWVudHMvc2VydmljZXMvdGVtcGxhdGVzL2ludm9pY2VzL2luZGlhLWdzdC9wYXJ0cy90YWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQTJDQSxvREEyR0M7QUF0SkQsNkNBQWtEO0FBQ2xELHFDQUE0QjtBQUU1Qiw0REFBaUU7QUFHakUsU0FBUyx5QkFBeUIsQ0FBQyxNQUFjLEVBQUUsWUFBb0I7SUFDckUsTUFBTSxhQUFhLEdBQUcsSUFBQSwyQkFBZ0IsRUFBQyxZQUFZLENBQUMsQ0FBQztJQUNyRCxPQUFPLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsSUFBSSxZQUFZLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQztBQUNqRyxDQUFDO0FBRUQsU0FBUyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxTQUFTO0lBQ3hFLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFaEIsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDO0lBQ3hDLE1BQU0sVUFBVSxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDNUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDeEMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ1gsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLE1BQU0sQ0FBQztJQUV2QixJQUFJLEtBQUssR0FBRyxVQUFVLEVBQUUs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
|
|
@@ -11,7 +11,9 @@
|
|
|
11
11
|
* limitations under the License.
|
|
12
12
|
*/
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.PACKING_SLIP_NUMBER_PLACEHOLDER = exports.INVOICE_NUMBER_PLACEHOLDER = void 0;
|
|
14
|
+
exports.INVOICE_MONTH_PLACEHOLDER = exports.INVOICE_YEAR_PLACEHOLDER = exports.PACKING_SLIP_NUMBER_PLACEHOLDER = exports.INVOICE_NUMBER_PLACEHOLDER = void 0;
|
|
15
15
|
exports.INVOICE_NUMBER_PLACEHOLDER = `{invoice_number}`;
|
|
16
16
|
exports.PACKING_SLIP_NUMBER_PLACEHOLDER = `{packing_slip_number}`;
|
|
17
|
-
|
|
17
|
+
exports.INVOICE_YEAR_PLACEHOLDER = `{year}`;
|
|
18
|
+
exports.INVOICE_MONTH_PLACEHOLDER = `{month}`;
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL21vZHVsZXMvZG9jdW1lbnRzL3R5cGVzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7R0FVRzs7O0FBRVUsUUFBQSwwQkFBMEIsR0FBRyxrQkFBa0IsQ0FBQztBQUNoRCxRQUFBLCtCQUErQixHQUFHLHVCQUF1QixDQUFDO0FBQzFELFFBQUEsd0JBQXdCLEdBQUcsUUFBUSxDQUFDO0FBQ3BDLFFBQUEseUJBQXlCLEdBQUcsU0FBUyxDQUFDIn0=
|
|
@@ -8,8 +8,9 @@ const jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
8
8
|
const icons_1 = require("@medusajs/icons");
|
|
9
9
|
const ui_1 = require("@medusajs/ui");
|
|
10
10
|
const button_generate_invoice_1 = __importDefault(require("./invoice/button-generate-invoice"));
|
|
11
|
+
const button_force_new_invoice_1 = __importDefault(require("./invoice/button-force-new-invoice"));
|
|
11
12
|
const button_generate_packing_slip_1 = __importDefault(require("./packing-slip/button-generate-packing-slip"));
|
|
12
13
|
function ActionsDropdown({ order, updateInvoiceNumber, updatePackingSlipNumber }) {
|
|
13
|
-
return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(ui_1.DropdownMenu, { children: [(0, jsx_runtime_1.jsx)(ui_1.DropdownMenu.Trigger, { asChild: true, children: (0, jsx_runtime_1.jsx)(ui_1.IconButton, { children: (0, jsx_runtime_1.jsx)(icons_1.EllipsisHorizontal, {}) }) }), (0, jsx_runtime_1.jsxs)(ui_1.DropdownMenu.Content, { children: [(0, jsx_runtime_1.jsx)(button_generate_invoice_1.default, { order: order, updateInvoiceNumber: updateInvoiceNumber }), (0, jsx_runtime_1.jsx)(ui_1.DropdownMenu.Separator, {}), (0, jsx_runtime_1.jsx)(button_generate_packing_slip_1.default, { order: order, updatePackingSlipNumber: updatePackingSlipNumber })] })] }) }));
|
|
14
|
+
return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsxs)(ui_1.DropdownMenu, { children: [(0, jsx_runtime_1.jsx)(ui_1.DropdownMenu.Trigger, { asChild: true, children: (0, jsx_runtime_1.jsx)(ui_1.IconButton, { children: (0, jsx_runtime_1.jsx)(icons_1.EllipsisHorizontal, {}) }) }), (0, jsx_runtime_1.jsxs)(ui_1.DropdownMenu.Content, { children: [(0, jsx_runtime_1.jsx)(button_generate_invoice_1.default, { order: order, updateInvoiceNumber: updateInvoiceNumber }), (0, jsx_runtime_1.jsx)(button_force_new_invoice_1.default, { order: order, updateInvoiceNumber: updateInvoiceNumber }), (0, jsx_runtime_1.jsx)(ui_1.DropdownMenu.Separator, {}), (0, jsx_runtime_1.jsx)(button_generate_packing_slip_1.default, { order: order, updatePackingSlipNumber: updatePackingSlipNumber })] })] }) }));
|
|
14
15
|
}
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWN0aW9ucy1kcm9wZG93bi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy91aS1jb21wb25lbnRzL2FjdGlvbnMtZHJvcGRvd24vYWN0aW9ucy1kcm9wZG93bi50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSwwQ0FtQkM7O0FBekJELDJDQUFvRDtBQUNwRCxxQ0FBdUQ7QUFDdkQsZ0dBQThFO0FBQzlFLGtHQUErRTtBQUMvRSwrR0FBNEY7QUFFNUYsU0FBZ0IsZUFBZSxDQUFDLEVBQUMsS0FBSyxFQUFFLG1CQUFtQixFQUFFLHVCQUF1QixFQUF3RTtJQUUxSixPQUFPLENBQ0wsMkRBQ0Esd0JBQUMsaUJBQVksZUFDWCx1QkFBQyxpQkFBWSxDQUFDLE9BQU8sSUFBQyxPQUFPLGtCQUMzQix1QkFBQyxlQUFVLGNBQ1QsdUJBQUMsMEJBQWtCLEtBQUcsR0FDWCxHQUNRLEVBQ3ZCLHdCQUFDLGlCQUFZLENBQUMsT0FBTyxlQUNuQix1QkFBQyxpQ0FBNkIsSUFBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLG1CQUFtQixFQUFFLG1CQUFtQixHQUFHLEVBQ3hGLHVCQUFDLGtDQUE2QixJQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEdBQUcsRUFDeEYsdUJBQUMsaUJBQVksQ0FBQyxTQUFTLEtBQUcsRUFDMUIsdUJBQUMsc0NBQWlDLElBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSx1QkFBdUIsRUFBRSx1QkFBdUIsR0FBRyxJQUMvRSxJQUNWLEdBQ1osQ0FDSixDQUFBO0FBQ0gsQ0FBQyJ9
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
4
|
+
/*
|
|
5
|
+
* Copyright 2024 RSC-Labs, https://rsoftcon.com/
|
|
6
|
+
*
|
|
7
|
+
* MIT License
|
|
8
|
+
*
|
|
9
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
* See the License for the specific language governing permissions and
|
|
13
|
+
* limitations under the License.
|
|
14
|
+
*/
|
|
15
|
+
const icons_1 = require("@medusajs/icons");
|
|
16
|
+
const ui_1 = require("@medusajs/ui");
|
|
17
|
+
const react_1 = require("react");
|
|
18
|
+
const ForceNewInvoiceDropdownButton = ({ order, updateInvoiceNumber }) => {
|
|
19
|
+
const [isLoading, setLoading] = (0, react_1.useState)(false);
|
|
20
|
+
(0, react_1.useEffect)(() => {
|
|
21
|
+
if (!isLoading) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
fetch(`/admin/documents/invoice`, {
|
|
25
|
+
method: "POST",
|
|
26
|
+
credentials: "include",
|
|
27
|
+
headers: {
|
|
28
|
+
"Content-Type": "application/json",
|
|
29
|
+
},
|
|
30
|
+
body: JSON.stringify({
|
|
31
|
+
order_id: order.id,
|
|
32
|
+
force_new: true
|
|
33
|
+
})
|
|
34
|
+
})
|
|
35
|
+
.then((res) => res.json())
|
|
36
|
+
.then((responseJson) => {
|
|
37
|
+
if (responseJson && responseJson.message) {
|
|
38
|
+
ui_1.toast.error("Invoice", {
|
|
39
|
+
description: `Problem happened when generating new invoice number. ${responseJson.message}`,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
if (responseJson.buffer) {
|
|
44
|
+
updateInvoiceNumber(order.id, responseJson.invoice.displayNumber);
|
|
45
|
+
const anyBuffer = responseJson.buffer;
|
|
46
|
+
const blob = new Blob([new Uint8Array(anyBuffer.data)], { type: 'application/pdf' });
|
|
47
|
+
ui_1.toast.dismiss();
|
|
48
|
+
const pdfURL = URL.createObjectURL(blob);
|
|
49
|
+
window.open(pdfURL, '_blank');
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
ui_1.toast.dismiss();
|
|
53
|
+
ui_1.toast.error("Invoice", {
|
|
54
|
+
description: 'Problem happened when generating new invoice number',
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
setLoading(false);
|
|
59
|
+
})
|
|
60
|
+
.catch((error) => {
|
|
61
|
+
console.error(error);
|
|
62
|
+
ui_1.toast.dismiss();
|
|
63
|
+
const trueError = error;
|
|
64
|
+
ui_1.toast.error("Invoice", {
|
|
65
|
+
description: trueError?.response?.data?.message,
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
}, [isLoading]);
|
|
69
|
+
return ((0, jsx_runtime_1.jsxs)(ui_1.DropdownMenu.Item, { className: "gap-x-2", onClick: () => {
|
|
70
|
+
if (window.confirm('This mints a brand new invoice number for this order, replacing the current one. The old number stays burned (not reusable). Continue?')) {
|
|
71
|
+
setLoading(true);
|
|
72
|
+
}
|
|
73
|
+
}, children: [(0, jsx_runtime_1.jsx)(icons_1.ArrowPath, {}), "Generate new invoice number"] }));
|
|
74
|
+
};
|
|
75
|
+
exports.default = ForceNewInvoiceDropdownButton;
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnV0dG9uLWZvcmNlLW5ldy1pbnZvaWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3VpLWNvbXBvbmVudHMvYWN0aW9ucy1kcm9wZG93bi9pbnZvaWNlL2J1dHRvbi1mb3JjZS1uZXctaW52b2ljZS50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUE7Ozs7Ozs7Ozs7R0FVRztBQUVILDJDQUEyQztBQUMzQyxxQ0FBa0Q7QUFDbEQsaUNBQTRDO0FBRTVDLE1BQU0sNkJBQTZCLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxtQkFBbUIsRUFBNEMsRUFBRSxFQUFFO0lBRWpILE1BQU0sQ0FBQyxTQUFTLEVBQUUsVUFBVSxDQUFDLEdBQUcsSUFBQSxnQkFBUSxFQUFDLEtBQUssQ0FBQyxDQUFBO0lBRS9DLElBQUEsaUJBQVMsRUFBQyxHQUFHLEVBQUU7UUFDYixJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDZixPQUFPO1FBQ1QsQ0FBQztRQUNELEtBQUssQ0FBQywwQkFBMEIsRUFBRTtZQUNoQyxNQUFNLEVBQUUsTUFBTTtZQUNkLFdBQVcsRUFBRSxTQUFTO1lBQ3RCLE9BQU8sRUFBRTtnQkFDUCxjQUFjLEVBQUUsa0JBQWtCO2FBQ25DO1lBQ0QsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUM7Z0JBQ25CLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBRTtnQkFDbEIsU0FBUyxFQUFFLElBQUk7YUFDaEIsQ0FBQztTQUNILENBQUM7YUFDRCxJQUFJLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQzthQUN6QixJQUFJLENBQUMsQ0FBQyxZQUFZLEVBQUUsRUFBRTtZQUNyQixJQUFJLFlBQVksSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3pDLFVBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFO29CQUNyQixXQUFXLEVBQUUsd0RBQXdELFlBQVksQ0FBQyxPQUFPLEVBQUU7aUJBQzVGLENBQUMsQ0FBQTtZQUNKLENBQUM7aUJBQU0sQ0FBQztnQkFDTixJQUFJLFlBQVksQ0FBQyxNQUFNLEVBQUUsQ0FBQztvQkFDeEIsbUJBQW1CLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxZQUFZLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFBO29CQUNqRSxNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUMsTUFBYSxDQUFDO29CQUM3QyxNQUFNLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFFLElBQUksVUFBVSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFHLGlCQUFpQixFQUFDLENBQUMsQ0FBQztvQkFDeEYsVUFBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO29CQUNoQixNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO29CQUN6QyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDaEMsQ0FBQztxQkFBTSxDQUFDO29CQUNOLFVBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztvQkFDaEIsVUFBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUU7d0JBQ3JCLFdBQVcsRUFBRSxxREFBcUQ7cUJBQ25FLENBQUMsQ0FBQTtnQkFDSixDQUFDO1lBQ0gsQ0FBQztZQUNELFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQixDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtZQUNmLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDckIsVUFBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2hCLE1BQU0sU0FBUyxHQUFHLEtBQVksQ0FBQztZQUMvQixVQUFLLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtnQkFDckIsV0FBVyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE9BQU87YUFDaEQsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO0lBRWYsT0FBTyxDQUNMLHdCQUFDLGlCQUFZLENBQUMsSUFBSSxJQUFDLFNBQVMsRUFBQyxTQUFTLEVBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtZQUNuRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsd0lBQXdJLENBQUMsRUFBRSxDQUFDO2dCQUM3SixVQUFVLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDbEIsQ0FBQztRQUNILENBQUMsYUFDQyx1QkFBQyxpQkFBUyxLQUFFLG1DQUVNLENBQ3JCLENBQUE7QUFDSCxDQUFDLENBQUE7QUFFRCxrQkFBZSw2QkFBNkIsQ0FBQSJ9
|
|
@@ -61,7 +61,7 @@ const InvoiceSettingsForm = ({ invoiceSettings, setOpenModal }) => {
|
|
|
61
61
|
};
|
|
62
62
|
const INVOICE_NUMBER_PLACEHOLDER = '{invoice_number}';
|
|
63
63
|
const errorText = `Text ${INVOICE_NUMBER_PLACEHOLDER} needs to be included in input.`;
|
|
64
|
-
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}`;
|
|
64
|
+
const LABEL_MUST_FORMAT = `Format must include ${INVOICE_NUMBER_PLACEHOLDER}. Optional: {year}, {month} (from order date), e.g. INV-{year}-{month}-{invoice_number}`;
|
|
65
65
|
const LABEL_MUST_FORCED = `Forced number must be a number`;
|
|
66
66
|
const LABEL_INFO_FORCED = `It will auto-increment starting from this number.`;
|
|
67
67
|
const validateFormatNumber = (value) => {
|
|
@@ -136,4 +136,4 @@ const InvoiceSettingsModal = () => {
|
|
|
136
136
|
return ((0, jsx_runtime_1.jsxs)(ui_1.FocusModal, { open: open, onOpenChange: setOpen, children: [(0, jsx_runtime_1.jsx)(ui_1.FocusModal.Trigger, { asChild: true, children: (0, jsx_runtime_1.jsx)(ui_1.Button, { children: "Change settings" }) }), (0, jsx_runtime_1.jsxs)(ui_1.FocusModal.Content, { children: [(0, jsx_runtime_1.jsx)(ui_1.FocusModal.Header, {}), (0, jsx_runtime_1.jsx)(InvoiceSettingsModalDetails, { setOpenModal: setOpen })] })] }));
|
|
137
137
|
};
|
|
138
138
|
exports.default = InvoiceSettingsModal;
|
|
139
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"settings-invoice.js","sourceRoot":"","sources":["../../../../../src/ui-components/settings/settings-invoice.tsx"],"names":[],"mappings":"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"}
|