order-management 0.0.89 → 0.0.91
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 +76 -19
- package/.medusa/server/src/admin/index.mjs +77 -20
- package/.medusa/server/src/api/admin/orders/[order_id]/refund-context/route.js +18 -1
- package/.medusa/server/src/api/admin/return/[id]/route.js +9 -2
- package/.medusa/server/src/api/admin/return/route.js +43 -3
- package/.medusa/server/src/api/store/orders/[order_id]/refund-payment-mappings/route.js +4 -2
- package/.medusa/server/src/api/store/returns/[id]/route.js +13 -3
- package/.medusa/server/src/api/store/returns/route.js +36 -3
- package/.medusa/server/src/helpers/index.js +3 -1
- package/.medusa/server/src/helpers/order-line-presentation.js +72 -0
- package/.medusa/server/src/helpers/refund-calculation.js +274 -0
- package/.medusa/server/src/helpers/returns.js +2 -1
- package/.medusa/server/src/workflows/steps/retrieve-order-step.js +6 -1
- package/.medusa/server/src/workflows/steps/transform-order-to-cart-step.js +4 -3
- package/README.md +29 -11
- package/package.json +1 -1
|
@@ -470,6 +470,48 @@ const OrderGiftItemsWidget = ({ data }) => {
|
|
|
470
470
|
adminSdk.defineWidgetConfig({
|
|
471
471
|
zone: "order.details.side.after"
|
|
472
472
|
});
|
|
473
|
+
function formatRefundCurrency(amount, currencyCode = "inr", options) {
|
|
474
|
+
const formatted = new Intl.NumberFormat("en-IN", {
|
|
475
|
+
style: "currency",
|
|
476
|
+
currency: (currencyCode || "inr").toUpperCase(),
|
|
477
|
+
currencyDisplay: "symbol",
|
|
478
|
+
minimumFractionDigits: 2,
|
|
479
|
+
maximumFractionDigits: 2
|
|
480
|
+
}).format(amount);
|
|
481
|
+
if ((options == null ? void 0 : options.signed) && amount > 0) {
|
|
482
|
+
return `−${formatted}`;
|
|
483
|
+
}
|
|
484
|
+
return formatted;
|
|
485
|
+
}
|
|
486
|
+
const RefundCalculationBlock = ({ refund }) => {
|
|
487
|
+
const currency = refund.currency_code || "inr";
|
|
488
|
+
const finalLabel = refund.is_processed ? formatRefundCurrency(refund.final_refund_amount ?? 0, currency) : "Refund pending";
|
|
489
|
+
return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-2", children: [
|
|
490
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", className: "text-ui-fg-subtle", children: "Refund calculation" }),
|
|
491
|
+
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-1.5", children: [
|
|
492
|
+
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-4", children: [
|
|
493
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-muted", children: "Product amount" }),
|
|
494
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", children: formatRefundCurrency(refund.product_amount, currency) })
|
|
495
|
+
] }),
|
|
496
|
+
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-4", children: [
|
|
497
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-muted", children: "Return charge" }),
|
|
498
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", children: formatRefundCurrency(refund.return_charge, currency, { signed: true }) })
|
|
499
|
+
] }),
|
|
500
|
+
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-4 border-t border-ui-border-base pt-1.5", children: [
|
|
501
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: "Final refund amount" }),
|
|
502
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: finalLabel })
|
|
503
|
+
] })
|
|
504
|
+
] }),
|
|
505
|
+
refund.is_processed && refund.destination_label ? /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "xsmall", className: "text-ui-fg-muted", children: [
|
|
506
|
+
formatRefundCurrency(refund.final_refund_amount ?? 0, currency),
|
|
507
|
+
" will be refunded to",
|
|
508
|
+
" ",
|
|
509
|
+
refund.destination_label,
|
|
510
|
+
"."
|
|
511
|
+
] }) : null,
|
|
512
|
+
!refund.is_processed ? /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "xsmall", className: "text-ui-fg-muted", children: "Refund pending." }) : null
|
|
513
|
+
] });
|
|
514
|
+
};
|
|
473
515
|
const FIELD_LABELS = {
|
|
474
516
|
// UPI
|
|
475
517
|
upi_id: "UPI ID",
|
|
@@ -636,7 +678,7 @@ const OrderRefundContextWidget = (props) => {
|
|
|
636
678
|
}
|
|
637
679
|
};
|
|
638
680
|
if (!orderId) return null;
|
|
639
|
-
if (!loading && !error && context && !context.refund_mapping) return null;
|
|
681
|
+
if (!loading && !error && context && !context.refund_mapping && !context.refund) return null;
|
|
640
682
|
if (loading) {
|
|
641
683
|
return /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mt-6 divide-y p-0", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "py-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "text-ui-fg-subtle", children: "Loading refund context..." }) }) });
|
|
642
684
|
}
|
|
@@ -659,6 +701,7 @@ const OrderRefundContextWidget = (props) => {
|
|
|
659
701
|
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", children: context.return_id }),
|
|
660
702
|
((_d = context.refund_mapping) == null ? void 0 : _d.is_refunded) ? /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "green", children: "Refunded" }) : /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "orange", children: "Not refunded" })
|
|
661
703
|
] }),
|
|
704
|
+
context.refund ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-3 border-t border-ui-border-base pt-3", children: /* @__PURE__ */ jsxRuntime.jsx(RefundCalculationBlock, { refund: context.refund }) }) : null,
|
|
662
705
|
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-3 space-y-2 border-t border-ui-border-base pt-3", children: [
|
|
663
706
|
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-2", children: [
|
|
664
707
|
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", className: "text-ui-fg-subtle", children: "Payment method (refund destination)" }),
|
|
@@ -851,7 +894,10 @@ const OrderRefundContextWidget = (props) => {
|
|
|
851
894
|
markError && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-error", children: markError })
|
|
852
895
|
] })
|
|
853
896
|
] }),
|
|
854
|
-
hasReturn && !hasMapping && /* @__PURE__ */ jsxRuntime.
|
|
897
|
+
hasReturn && !hasMapping && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-subtle p-4", children: [
|
|
898
|
+
(context == null ? void 0 : context.refund) ? /* @__PURE__ */ jsxRuntime.jsx(RefundCalculationBlock, { refund: context.refund }) : null,
|
|
899
|
+
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-muted", children: "No refund payment mapping for this return. Ensure the refund_payment_mapping module is registered and a mapping was created when the return was created." })
|
|
900
|
+
] })
|
|
855
901
|
] }) });
|
|
856
902
|
};
|
|
857
903
|
adminSdk.defineWidgetConfig({
|
|
@@ -1536,13 +1582,23 @@ const ReturnsPage = () => {
|
|
|
1536
1582
|
}
|
|
1537
1583
|
) }),
|
|
1538
1584
|
/* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
|
|
1539
|
-
const
|
|
1540
|
-
if (
|
|
1585
|
+
const calc = returnOrder.refund;
|
|
1586
|
+
if ((calc == null ? void 0 : calc.is_processed) && calc.final_refund_amount != null) {
|
|
1587
|
+
return formatRefundCurrency(
|
|
1588
|
+
calc.final_refund_amount,
|
|
1589
|
+
calc.currency_code || returnOrder.currency_code
|
|
1590
|
+
);
|
|
1591
|
+
}
|
|
1592
|
+
if (calc) {
|
|
1593
|
+
return "Pending";
|
|
1594
|
+
}
|
|
1595
|
+
if (returnOrder.refund_amount == null) {
|
|
1541
1596
|
return "—";
|
|
1542
1597
|
}
|
|
1543
|
-
|
|
1544
|
-
|
|
1545
|
-
|
|
1598
|
+
return formatRefundCurrency(
|
|
1599
|
+
Number(returnOrder.refund_amount),
|
|
1600
|
+
returnOrder.currency_code
|
|
1601
|
+
);
|
|
1546
1602
|
})() }),
|
|
1547
1603
|
/* @__PURE__ */ jsxRuntime.jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
|
|
1548
1604
|
year: "numeric",
|
|
@@ -2169,7 +2225,7 @@ const ReturnDetailPage = () => {
|
|
|
2169
2225
|
try {
|
|
2170
2226
|
setIsLoading(true);
|
|
2171
2227
|
setError(null);
|
|
2172
|
-
const response = await fetch(`/admin/
|
|
2228
|
+
const response = await fetch(`/admin/return/${id}`, {
|
|
2173
2229
|
credentials: "include"
|
|
2174
2230
|
});
|
|
2175
2231
|
if (!response.ok) {
|
|
@@ -2195,7 +2251,7 @@ const ReturnDetailPage = () => {
|
|
|
2195
2251
|
setIsRejecting(true);
|
|
2196
2252
|
setUpdateError(null);
|
|
2197
2253
|
setUpdateSuccess(false);
|
|
2198
|
-
const response = await fetch(`/admin/
|
|
2254
|
+
const response = await fetch(`/admin/return/${id}/reject`, {
|
|
2199
2255
|
method: "POST",
|
|
2200
2256
|
headers: {
|
|
2201
2257
|
"Content-Type": "application/json"
|
|
@@ -2211,7 +2267,7 @@ const ReturnDetailPage = () => {
|
|
|
2211
2267
|
setReturnOrder(payload.return);
|
|
2212
2268
|
setUpdateSuccess(true);
|
|
2213
2269
|
setTimeout(() => setUpdateSuccess(false), 3e3);
|
|
2214
|
-
const detailResponse = await fetch(`/admin/
|
|
2270
|
+
const detailResponse = await fetch(`/admin/return/${id}`, {
|
|
2215
2271
|
credentials: "include"
|
|
2216
2272
|
});
|
|
2217
2273
|
if (detailResponse.ok) {
|
|
@@ -2278,6 +2334,7 @@ const ReturnDetailPage = () => {
|
|
|
2278
2334
|
) }),
|
|
2279
2335
|
/* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: 'Cancel this return request. Use "Mark as received" when items are received.' })
|
|
2280
2336
|
] }),
|
|
2337
|
+
returnOrder.refund ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: /* @__PURE__ */ jsxRuntime.jsx(RefundCalculationBlock, { refund: returnOrder.refund }) }) : null,
|
|
2281
2338
|
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
|
|
2282
2339
|
/* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Information" }),
|
|
2283
2340
|
/* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
|
|
@@ -2731,12 +2788,6 @@ const routeModule = {
|
|
|
2731
2788
|
};
|
|
2732
2789
|
const menuItemModule = {
|
|
2733
2790
|
menuItems: [
|
|
2734
|
-
{
|
|
2735
|
-
label: config$7.label,
|
|
2736
|
-
icon: config$7.icon,
|
|
2737
|
-
path: "/payments",
|
|
2738
|
-
nested: void 0
|
|
2739
|
-
},
|
|
2740
2791
|
{
|
|
2741
2792
|
label: config$6.label,
|
|
2742
2793
|
icon: config$6.icon,
|
|
@@ -2756,9 +2807,9 @@ const menuItemModule = {
|
|
|
2756
2807
|
nested: void 0
|
|
2757
2808
|
},
|
|
2758
2809
|
{
|
|
2759
|
-
label: config$
|
|
2760
|
-
icon: config$
|
|
2761
|
-
path: "/payments
|
|
2810
|
+
label: config$7.label,
|
|
2811
|
+
icon: config$7.icon,
|
|
2812
|
+
path: "/payments",
|
|
2762
2813
|
nested: void 0
|
|
2763
2814
|
},
|
|
2764
2815
|
{
|
|
@@ -2778,6 +2829,12 @@ const menuItemModule = {
|
|
|
2778
2829
|
icon: config.icon,
|
|
2779
2830
|
path: "/swaps/:id",
|
|
2780
2831
|
nested: void 0
|
|
2832
|
+
},
|
|
2833
|
+
{
|
|
2834
|
+
label: config$3.label,
|
|
2835
|
+
icon: config$3.icon,
|
|
2836
|
+
path: "/payments/:id",
|
|
2837
|
+
nested: void 0
|
|
2781
2838
|
}
|
|
2782
2839
|
]
|
|
2783
2840
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsxs, jsx, Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { defineWidgetConfig, defineRouteConfig } from "@medusajs/admin-sdk";
|
|
3
3
|
import { useState, useEffect, useRef, useCallback, useMemo } from "react";
|
|
4
|
-
import {
|
|
4
|
+
import { Text, Container, Heading, Badge, Button, Label, Select, Textarea, Input } from "@medusajs/ui";
|
|
5
5
|
import { CashSolid, PencilSquareSolid, Trash, CreditCard, Receipt, ArrowPath, CheckCircle, ArrowLeft } from "@medusajs/icons";
|
|
6
6
|
import { useNavigate, useParams } from "react-router-dom";
|
|
7
7
|
function roundRectPath(ctx, x, y, w, h, r) {
|
|
@@ -469,6 +469,48 @@ const OrderGiftItemsWidget = ({ data }) => {
|
|
|
469
469
|
defineWidgetConfig({
|
|
470
470
|
zone: "order.details.side.after"
|
|
471
471
|
});
|
|
472
|
+
function formatRefundCurrency(amount, currencyCode = "inr", options) {
|
|
473
|
+
const formatted = new Intl.NumberFormat("en-IN", {
|
|
474
|
+
style: "currency",
|
|
475
|
+
currency: (currencyCode || "inr").toUpperCase(),
|
|
476
|
+
currencyDisplay: "symbol",
|
|
477
|
+
minimumFractionDigits: 2,
|
|
478
|
+
maximumFractionDigits: 2
|
|
479
|
+
}).format(amount);
|
|
480
|
+
if ((options == null ? void 0 : options.signed) && amount > 0) {
|
|
481
|
+
return `−${formatted}`;
|
|
482
|
+
}
|
|
483
|
+
return formatted;
|
|
484
|
+
}
|
|
485
|
+
const RefundCalculationBlock = ({ refund }) => {
|
|
486
|
+
const currency = refund.currency_code || "inr";
|
|
487
|
+
const finalLabel = refund.is_processed ? formatRefundCurrency(refund.final_refund_amount ?? 0, currency) : "Refund pending";
|
|
488
|
+
return /* @__PURE__ */ jsxs("div", { className: "space-y-2", children: [
|
|
489
|
+
/* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", className: "text-ui-fg-subtle", children: "Refund calculation" }),
|
|
490
|
+
/* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
|
|
491
|
+
/* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-4", children: [
|
|
492
|
+
/* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-muted", children: "Product amount" }),
|
|
493
|
+
/* @__PURE__ */ jsx(Text, { size: "small", children: formatRefundCurrency(refund.product_amount, currency) })
|
|
494
|
+
] }),
|
|
495
|
+
/* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-4", children: [
|
|
496
|
+
/* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-muted", children: "Return charge" }),
|
|
497
|
+
/* @__PURE__ */ jsx(Text, { size: "small", children: formatRefundCurrency(refund.return_charge, currency, { signed: true }) })
|
|
498
|
+
] }),
|
|
499
|
+
/* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-4 border-t border-ui-border-base pt-1.5", children: [
|
|
500
|
+
/* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: "Final refund amount" }),
|
|
501
|
+
/* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: finalLabel })
|
|
502
|
+
] })
|
|
503
|
+
] }),
|
|
504
|
+
refund.is_processed && refund.destination_label ? /* @__PURE__ */ jsxs(Text, { size: "xsmall", className: "text-ui-fg-muted", children: [
|
|
505
|
+
formatRefundCurrency(refund.final_refund_amount ?? 0, currency),
|
|
506
|
+
" will be refunded to",
|
|
507
|
+
" ",
|
|
508
|
+
refund.destination_label,
|
|
509
|
+
"."
|
|
510
|
+
] }) : null,
|
|
511
|
+
!refund.is_processed ? /* @__PURE__ */ jsx(Text, { size: "xsmall", className: "text-ui-fg-muted", children: "Refund pending." }) : null
|
|
512
|
+
] });
|
|
513
|
+
};
|
|
472
514
|
const FIELD_LABELS = {
|
|
473
515
|
// UPI
|
|
474
516
|
upi_id: "UPI ID",
|
|
@@ -635,7 +677,7 @@ const OrderRefundContextWidget = (props) => {
|
|
|
635
677
|
}
|
|
636
678
|
};
|
|
637
679
|
if (!orderId) return null;
|
|
638
|
-
if (!loading && !error && context && !context.refund_mapping) return null;
|
|
680
|
+
if (!loading && !error && context && !context.refund_mapping && !context.refund) return null;
|
|
639
681
|
if (loading) {
|
|
640
682
|
return /* @__PURE__ */ jsx(Container, { className: "mt-6 divide-y p-0", children: /* @__PURE__ */ jsx("div", { className: "py-4", children: /* @__PURE__ */ jsx(Text, { className: "text-ui-fg-subtle", children: "Loading refund context..." }) }) });
|
|
641
683
|
}
|
|
@@ -658,6 +700,7 @@ const OrderRefundContextWidget = (props) => {
|
|
|
658
700
|
/* @__PURE__ */ jsx(Text, { size: "small", children: context.return_id }),
|
|
659
701
|
((_d = context.refund_mapping) == null ? void 0 : _d.is_refunded) ? /* @__PURE__ */ jsx(Badge, { color: "green", children: "Refunded" }) : /* @__PURE__ */ jsx(Badge, { color: "orange", children: "Not refunded" })
|
|
660
702
|
] }),
|
|
703
|
+
context.refund ? /* @__PURE__ */ jsx("div", { className: "mt-3 border-t border-ui-border-base pt-3", children: /* @__PURE__ */ jsx(RefundCalculationBlock, { refund: context.refund }) }) : null,
|
|
661
704
|
/* @__PURE__ */ jsxs("div", { className: "mt-3 space-y-2 border-t border-ui-border-base pt-3", children: [
|
|
662
705
|
/* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
|
|
663
706
|
/* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", className: "text-ui-fg-subtle", children: "Payment method (refund destination)" }),
|
|
@@ -850,7 +893,10 @@ const OrderRefundContextWidget = (props) => {
|
|
|
850
893
|
markError && /* @__PURE__ */ jsx(Text, { size: "small", className: "mt-2 text-ui-fg-error", children: markError })
|
|
851
894
|
] })
|
|
852
895
|
] }),
|
|
853
|
-
hasReturn && !hasMapping && /* @__PURE__ */
|
|
896
|
+
hasReturn && !hasMapping && /* @__PURE__ */ jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-subtle p-4", children: [
|
|
897
|
+
(context == null ? void 0 : context.refund) ? /* @__PURE__ */ jsx(RefundCalculationBlock, { refund: context.refund }) : null,
|
|
898
|
+
/* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-muted", children: "No refund payment mapping for this return. Ensure the refund_payment_mapping module is registered and a mapping was created when the return was created." })
|
|
899
|
+
] })
|
|
854
900
|
] }) });
|
|
855
901
|
};
|
|
856
902
|
defineWidgetConfig({
|
|
@@ -1535,13 +1581,23 @@ const ReturnsPage = () => {
|
|
|
1535
1581
|
}
|
|
1536
1582
|
) }),
|
|
1537
1583
|
/* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: (() => {
|
|
1538
|
-
const
|
|
1539
|
-
if (
|
|
1584
|
+
const calc = returnOrder.refund;
|
|
1585
|
+
if ((calc == null ? void 0 : calc.is_processed) && calc.final_refund_amount != null) {
|
|
1586
|
+
return formatRefundCurrency(
|
|
1587
|
+
calc.final_refund_amount,
|
|
1588
|
+
calc.currency_code || returnOrder.currency_code
|
|
1589
|
+
);
|
|
1590
|
+
}
|
|
1591
|
+
if (calc) {
|
|
1592
|
+
return "Pending";
|
|
1593
|
+
}
|
|
1594
|
+
if (returnOrder.refund_amount == null) {
|
|
1540
1595
|
return "—";
|
|
1541
1596
|
}
|
|
1542
|
-
|
|
1543
|
-
|
|
1544
|
-
|
|
1597
|
+
return formatRefundCurrency(
|
|
1598
|
+
Number(returnOrder.refund_amount),
|
|
1599
|
+
returnOrder.currency_code
|
|
1600
|
+
);
|
|
1545
1601
|
})() }),
|
|
1546
1602
|
/* @__PURE__ */ jsx("td", { className: "px-4 py-4 text-ui-fg-subtle", children: new Date(returnOrder.created_at).toLocaleDateString("en-US", {
|
|
1547
1603
|
year: "numeric",
|
|
@@ -2168,7 +2224,7 @@ const ReturnDetailPage = () => {
|
|
|
2168
2224
|
try {
|
|
2169
2225
|
setIsLoading(true);
|
|
2170
2226
|
setError(null);
|
|
2171
|
-
const response = await fetch(`/admin/
|
|
2227
|
+
const response = await fetch(`/admin/return/${id}`, {
|
|
2172
2228
|
credentials: "include"
|
|
2173
2229
|
});
|
|
2174
2230
|
if (!response.ok) {
|
|
@@ -2194,7 +2250,7 @@ const ReturnDetailPage = () => {
|
|
|
2194
2250
|
setIsRejecting(true);
|
|
2195
2251
|
setUpdateError(null);
|
|
2196
2252
|
setUpdateSuccess(false);
|
|
2197
|
-
const response = await fetch(`/admin/
|
|
2253
|
+
const response = await fetch(`/admin/return/${id}/reject`, {
|
|
2198
2254
|
method: "POST",
|
|
2199
2255
|
headers: {
|
|
2200
2256
|
"Content-Type": "application/json"
|
|
@@ -2210,7 +2266,7 @@ const ReturnDetailPage = () => {
|
|
|
2210
2266
|
setReturnOrder(payload.return);
|
|
2211
2267
|
setUpdateSuccess(true);
|
|
2212
2268
|
setTimeout(() => setUpdateSuccess(false), 3e3);
|
|
2213
|
-
const detailResponse = await fetch(`/admin/
|
|
2269
|
+
const detailResponse = await fetch(`/admin/return/${id}`, {
|
|
2214
2270
|
credentials: "include"
|
|
2215
2271
|
});
|
|
2216
2272
|
if (detailResponse.ok) {
|
|
@@ -2277,6 +2333,7 @@ const ReturnDetailPage = () => {
|
|
|
2277
2333
|
) }),
|
|
2278
2334
|
/* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: 'Cancel this return request. Use "Mark as received" when items are received.' })
|
|
2279
2335
|
] }),
|
|
2336
|
+
returnOrder.refund ? /* @__PURE__ */ jsx("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: /* @__PURE__ */ jsx(RefundCalculationBlock, { refund: returnOrder.refund }) }) : null,
|
|
2280
2337
|
/* @__PURE__ */ jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
|
|
2281
2338
|
/* @__PURE__ */ jsx(Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Information" }),
|
|
2282
2339
|
/* @__PURE__ */ jsxs("div", { className: "space-y-3", children: [
|
|
@@ -2730,12 +2787,6 @@ const routeModule = {
|
|
|
2730
2787
|
};
|
|
2731
2788
|
const menuItemModule = {
|
|
2732
2789
|
menuItems: [
|
|
2733
|
-
{
|
|
2734
|
-
label: config$7.label,
|
|
2735
|
-
icon: config$7.icon,
|
|
2736
|
-
path: "/payments",
|
|
2737
|
-
nested: void 0
|
|
2738
|
-
},
|
|
2739
2790
|
{
|
|
2740
2791
|
label: config$6.label,
|
|
2741
2792
|
icon: config$6.icon,
|
|
@@ -2755,9 +2806,9 @@ const menuItemModule = {
|
|
|
2755
2806
|
nested: void 0
|
|
2756
2807
|
},
|
|
2757
2808
|
{
|
|
2758
|
-
label: config$
|
|
2759
|
-
icon: config$
|
|
2760
|
-
path: "/payments
|
|
2809
|
+
label: config$7.label,
|
|
2810
|
+
icon: config$7.icon,
|
|
2811
|
+
path: "/payments",
|
|
2761
2812
|
nested: void 0
|
|
2762
2813
|
},
|
|
2763
2814
|
{
|
|
@@ -2777,6 +2828,12 @@ const menuItemModule = {
|
|
|
2777
2828
|
icon: config.icon,
|
|
2778
2829
|
path: "/swaps/:id",
|
|
2779
2830
|
nested: void 0
|
|
2831
|
+
},
|
|
2832
|
+
{
|
|
2833
|
+
label: config$3.label,
|
|
2834
|
+
icon: config$3.icon,
|
|
2835
|
+
path: "/payments/:id",
|
|
2836
|
+
nested: void 0
|
|
2780
2837
|
}
|
|
2781
2838
|
]
|
|
2782
2839
|
};
|
|
@@ -5,6 +5,7 @@ const utils_1 = require("@medusajs/framework/utils");
|
|
|
5
5
|
const refund_payment_mapping_1 = require("../../../../../modules/refund-payment-mapping");
|
|
6
6
|
const payment_detail_1 = require("../../../../../modules/payment-detail");
|
|
7
7
|
const detect_cod_1 = require("../../../../../helpers/detect-cod");
|
|
8
|
+
const refund_calculation_1 = require("../../../../../helpers/refund-calculation");
|
|
8
9
|
/**
|
|
9
10
|
* GET /admin/orders/:order_id/refund-context
|
|
10
11
|
*
|
|
@@ -47,6 +48,7 @@ async function GET(req, res) {
|
|
|
47
48
|
return_id: null,
|
|
48
49
|
refund_mapping: null,
|
|
49
50
|
payment_detail: null,
|
|
51
|
+
refund: null,
|
|
50
52
|
};
|
|
51
53
|
res.json(empty);
|
|
52
54
|
return;
|
|
@@ -60,11 +62,17 @@ async function GET(req, res) {
|
|
|
60
62
|
paymentDetailService = req.scope.resolve(payment_detail_1.PAYMENT_DETAIL_MODULE);
|
|
61
63
|
}
|
|
62
64
|
catch {
|
|
65
|
+
const destLabel = (0, refund_calculation_1.resolveDestinationLabel)({ is_cod: isCod });
|
|
66
|
+
const refund = await (0, refund_calculation_1.loadRefundCalculation)(orderId, req.scope, {
|
|
67
|
+
returnId,
|
|
68
|
+
destinationLabel: destLabel,
|
|
69
|
+
});
|
|
63
70
|
const partial = {
|
|
64
71
|
is_cod: isCod,
|
|
65
72
|
return_id: returnId,
|
|
66
73
|
refund_mapping: null,
|
|
67
74
|
payment_detail: null,
|
|
75
|
+
refund,
|
|
68
76
|
};
|
|
69
77
|
res.json(partial);
|
|
70
78
|
return;
|
|
@@ -123,11 +131,20 @@ async function GET(req, res) {
|
|
|
123
131
|
}
|
|
124
132
|
}
|
|
125
133
|
}
|
|
134
|
+
const destinationLabel = (0, refund_calculation_1.resolveDestinationLabel)({
|
|
135
|
+
is_cod: isCod,
|
|
136
|
+
payment_type: paymentDetailBlock?.type,
|
|
137
|
+
});
|
|
138
|
+
const refund = await (0, refund_calculation_1.loadRefundCalculation)(orderId, req.scope, {
|
|
139
|
+
returnId,
|
|
140
|
+
destinationLabel,
|
|
141
|
+
});
|
|
126
142
|
const payload = {
|
|
127
143
|
is_cod: isCod,
|
|
128
144
|
return_id: returnId,
|
|
129
145
|
refund_mapping: refundMappingBlock,
|
|
130
146
|
payment_detail: paymentDetailBlock,
|
|
147
|
+
refund,
|
|
131
148
|
};
|
|
132
149
|
res.json(payload);
|
|
133
150
|
}
|
|
@@ -140,4 +157,4 @@ async function GET(req, res) {
|
|
|
140
157
|
});
|
|
141
158
|
}
|
|
142
159
|
}
|
|
143
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL29yZGVycy9bb3JkZXJfaWRdL3JlZnVuZC1jb250ZXh0L3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBb0RBLGtCQThKQztBQWpORCxxREFBOEU7QUFFOUUsMEZBQTZGO0FBRTdGLDBFQUE2RTtBQUU3RSxrRUFBa0U7QUFDbEUsa0ZBSWtEO0FBK0JsRDs7Ozs7Ozs7R0FRRztBQUNJLEtBQUssVUFBVSxHQUFHLENBQ3ZCLEdBQWtCLEVBQ2xCLEdBQW1CO0lBRW5CLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBa0IsQ0FBQTtJQUU3QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDYixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNuQixPQUFPLEVBQUUsc0JBQXNCO1lBQy9CLElBQUksRUFBRSxjQUFjO1NBQ3JCLENBQUMsQ0FBQTtRQUNGLE9BQU07SUFDUixDQUFDO0lBRUQsSUFBSSxDQUFDO1FBQ0gsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQWEsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDNUUsTUFBTSxDQUFDLEtBQUssRUFBRSwwQkFBMEIsQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUM1RCxJQUFBLDJCQUFjLEVBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQztZQUM5QixPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFzQixlQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDdkUsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxrQkFBa0IsR0FBRywwQkFBMEIsQ0FBQTtRQUVyRCxNQUFNLEtBQUssR0FBRyxNQUFNLGtCQUFrQixDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDL0UsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ1gsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ25CLE9BQU8sRUFBRSxpQkFBaUI7Z0JBQzFCLElBQUksRUFBRSxXQUFXO2FBQ2xCLENBQUMsQ0FBQTtZQUNGLE9BQU07UUFDUixDQUFDO1FBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLE1BQU0sa0JBQWtCLENBQUMsbUJBQW1CLENBQ2hFLEVBQUUsUUFBUSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQStELEVBQ3BGLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FDM0MsQ0FBQTtRQUNELE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO1FBQzdELE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQStCLENBQUE7UUFFNUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pCLE1BQU0sS0FBSyxHQUEwQjtnQkFDbkMsTUFBTSxFQUFFLEtBQUs7Z0JBQ2IsU0FBUyxFQUFFLElBQUk7Z0JBQ2YsY0FBYyxFQUFFLElBQUk7Z0JBQ3BCLGNBQWMsRUFBRSxJQUFJO2dCQUNwQixNQUFNLEVBQUUsSUFBSTthQUNiLENBQUE7WUFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ2YsT0FBTTtRQUNSLENBQUM7UUFFRCxNQUFNLFFBQVEsR0FBRyxXQUFXLENBQUMsRUFBRSxDQUFBO1FBQy9CLE1BQU0sZUFBZSxHQUFJLEtBQWtDLENBQUMsV0FBVyxDQUFBO1FBRXZFLElBQUksb0JBQXVELENBQUE7UUFDM0QsSUFBSSxvQkFBZ0QsQ0FBQTtRQUVwRCxJQUFJLENBQUM7WUFDSCxvQkFBb0IsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBb0Msc0RBQTZCLENBQUMsQ0FBQTtZQUMxRyxvQkFBb0IsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBNkIsc0NBQXFCLENBQUMsQ0FBQTtRQUM3RixDQUFDO1FBQUMsTUFBTSxDQUFDO1lBQ1AsTUFBTSxTQUFTLEdBQUcsSUFBQSw0Q0FBdUIsRUFBQyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQzVELE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSwwQ0FBcUIsRUFBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLEtBQUssRUFBRTtnQkFDN0QsUUFBUTtnQkFDUixnQkFBZ0IsRUFBRSxTQUFTO2FBQzVCLENBQUMsQ0FBQTtZQUNGLE1BQU0sT0FBTyxHQUEwQjtnQkFDckMsTUFBTSxFQUFFLEtBQUs7Z0JBQ2IsU0FBUyxFQUFFLFFBQVE7Z0JBQ25CLGNBQWMsRUFBRSxJQUFJO2dCQUNwQixjQUFjLEVBQUUsSUFBSTtnQkFDcEIsTUFBTTthQUNQLENBQUE7WUFDRCxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1lBQ2pCLE9BQU07UUFDUixDQUFDO1FBRUQsZ0ZBQWdGO1FBQ2hGLE1BQU0sYUFBYSxHQUFHLE1BQU0sb0JBQW9CLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3hFLE1BQU0sa0JBQWtCLEdBQTRDLGFBQWE7WUFDL0UsQ0FBQyxDQUFDO2dCQUNFLEVBQUUsRUFBRSxhQUFhLENBQUMsRUFBRTtnQkFDcEIsVUFBVSxFQUFFLGFBQWEsQ0FBQyxVQUFVO2dCQUNwQyxXQUFXLEVBQUUsYUFBYSxDQUFDLFdBQVc7Z0JBQ3RDLFdBQVcsRUFBRSxhQUFhLENBQUMsV0FBVztnQkFDdEMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxNQUFNO2dCQUM1QixPQUFPLEVBQUUsYUFBYSxDQUFDLE9BQU87YUFDL0I7WUFDSCxDQUFDLENBQUMsSUFBSSxDQUFBO1FBRVIseUJBQXlCO1FBQ3pCLElBQUksa0JBQWtCLEdBQTRDLElBQUksQ0FBQTtRQUN0RSxtR0FBbUc7UUFDbkcsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQUMsQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUE7UUFFdkQsSUFBSSxlQUFlLEVBQUUsQ0FBQztZQUNwQixJQUFJLGlCQUFpQixFQUFFLENBQUM7Z0JBQ3RCLHVGQUF1RjtnQkFDdkYsNEZBQTRGO2dCQUM1RixJQUFJLENBQUM7b0JBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFjLENBQUMsVUFBVyxFQUFFLGVBQWUsQ0FBQyxDQUFBO29CQUN2RyxrQkFBa0IsR0FBRzt3QkFDbkIsRUFBRSxFQUFFLE1BQU0sQ0FBQyxFQUFFO3dCQUNiLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSTt3QkFDakIsV0FBVyxFQUFFLENBQUMsTUFBTSxDQUFDLFdBQVcsSUFBSSxFQUFFLENBQTRCO3dCQUNsRSxVQUFVLEVBQUUsTUFBTSxDQUFDLFVBQVU7d0JBQzdCLE1BQU0sRUFBRSxXQUFXO3FCQUNwQixDQUFBO2dCQUNILENBQUM7Z0JBQUMsTUFBTSxDQUFDO29CQUNQLGdGQUFnRjtnQkFDbEYsQ0FBQztZQUNILENBQUM7aUJBQU0sQ0FBQztnQkFDTixzRUFBc0U7Z0JBQ3RFLElBQUksQ0FBQztvQkFDSCxNQUFNLENBQUMsY0FBYyxDQUFDLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyw0QkFBNEIsQ0FDOUUsZUFBZSxFQUNmLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUNaLENBQUE7b0JBQ0QsTUFBTSxhQUFhLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtvQkFDbkYsSUFBSSxhQUFhLEVBQUUsQ0FBQzt3QkFDbEIsa0JBQWtCLEdBQUc7NEJBQ25CLEVBQUUsRUFBRSxhQUFhLENBQUMsRUFBRTs0QkFDcEIsSUFBSSxFQUFFLGFBQWEsQ0FBQyxJQUFJOzRCQUN4QixXQUFXLEVBQUUsQ0FBQyxhQUFhLENBQUMsV0FBVyxJQUFJLEVBQUUsQ0FBNEI7NEJBQ3pFLFVBQVUsRUFBRSxhQUFhLENBQUMsVUFBVTs0QkFDcEMsTUFBTSxFQUFFLFNBQVM7eUJBQ2xCLENBQUE7b0JBQ0gsQ0FBQztnQkFDSCxDQUFDO2dCQUFDLE1BQU0sQ0FBQztvQkFDUCxrQ0FBa0M7Z0JBQ3BDLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBQSw0Q0FBdUIsRUFBQztZQUMvQyxNQUFNLEVBQUUsS0FBSztZQUNiLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxJQUFJO1NBQ3ZDLENBQUMsQ0FBQTtRQUNGLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSwwQ0FBcUIsRUFBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLEtBQUssRUFBRTtZQUM3RCxRQUFRO1lBQ1IsZ0JBQWdCO1NBQ2pCLENBQUMsQ0FBQTtRQUVGLE1BQU0sT0FBTyxHQUEwQjtZQUNyQyxNQUFNLEVBQUUsS0FBSztZQUNiLFNBQVMsRUFBRSxRQUFRO1lBQ25CLGNBQWMsRUFBRSxrQkFBa0I7WUFDbEMsY0FBYyxFQUFFLGtCQUFrQjtZQUNsQyxNQUFNO1NBQ1AsQ0FBQTtRQUNELEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDbkIsQ0FBQztJQUFDLE9BQU8sR0FBWSxFQUFFLENBQUM7UUFDdEIsTUFBTSxPQUFPLEdBQUcsR0FBRyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFBO1FBQ3BFLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ25CLE9BQU8sRUFBRSwrQkFBK0I7WUFDeEMsS0FBSyxFQUFFLE9BQU87WUFDZCxJQUFJLEVBQUUsZ0JBQWdCO1NBQ3ZCLENBQUMsQ0FBQTtJQUNKLENBQUM7QUFDSCxDQUFDIn0=
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.GET = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const returns_1 = require("../../../../helpers/returns");
|
|
6
|
+
const refund_calculation_1 = require("../../../../helpers/refund-calculation");
|
|
6
7
|
const GET = async (req, res) => {
|
|
7
8
|
const { id } = req.params;
|
|
8
9
|
if (!id) {
|
|
@@ -11,7 +12,9 @@ const GET = async (req, res) => {
|
|
|
11
12
|
}
|
|
12
13
|
try {
|
|
13
14
|
const orderModuleService = req.scope.resolve(utils_1.Modules.ORDER);
|
|
14
|
-
const returnOrder = await orderModuleService
|
|
15
|
+
const returnOrder = await orderModuleService
|
|
16
|
+
.retrieveReturn(id, { relations: ["items", "shipping_methods"] })
|
|
17
|
+
.catch(() => null);
|
|
15
18
|
if (!returnOrder) {
|
|
16
19
|
res.status(404).json({
|
|
17
20
|
message: `Return with id: ${id} was not found`,
|
|
@@ -37,9 +40,13 @@ const GET = async (req, res) => {
|
|
|
37
40
|
...returnData,
|
|
38
41
|
items,
|
|
39
42
|
});
|
|
43
|
+
const refund = orderId
|
|
44
|
+
? await (0, refund_calculation_1.loadRefundCalculation)(orderId, req.scope, { returnId: id })
|
|
45
|
+
: null;
|
|
40
46
|
res.status(200).json({
|
|
41
47
|
return: {
|
|
42
48
|
...returnPayload,
|
|
49
|
+
refund,
|
|
43
50
|
order: orderData
|
|
44
51
|
? {
|
|
45
52
|
id: orderData.id,
|
|
@@ -71,4 +78,4 @@ const GET = async (req, res) => {
|
|
|
71
78
|
}
|
|
72
79
|
};
|
|
73
80
|
exports.GET = GET;
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldHVybi9baWRdL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHFEQUFtRDtBQUVuRCx5REFBNkc7QUFDN0csK0VBQThFO0FBRXZFLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUFrQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNuRSxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQTtJQUV6QixJQUFJLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDUixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxDQUFDLENBQUE7UUFDMUQsT0FBTTtJQUNSLENBQUM7SUFFRCxJQUFJLENBQUM7UUFDSCxNQUFNLGtCQUFrQixHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFzQixlQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFFaEYsTUFBTSxXQUFXLEdBQUcsTUFBTSxrQkFBa0I7YUFDekMsY0FBYyxDQUFDLEVBQUUsRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLE9BQU8sRUFBRSxrQkFBa0IsQ0FBQyxFQUFFLENBQUM7YUFDaEUsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3BCLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNqQixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztnQkFDbkIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLGdCQUFnQjthQUMvQyxDQUFDLENBQUE7WUFDRixPQUFNO1FBQ1IsQ0FBQztRQUVELE1BQU0sVUFBVSxHQUFHLFdBY2xCLENBQUE7UUFFRCxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsUUFBUSxD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
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.GET = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const returns_1 = require("../../../helpers/returns");
|
|
6
|
+
const refund_calculation_1 = require("../../../helpers/refund-calculation");
|
|
7
|
+
const refund_payment_mapping_1 = require("../../../modules/refund-payment-mapping");
|
|
6
8
|
const validators_1 = require("./validators");
|
|
7
9
|
const GET = async (req, res) => {
|
|
8
10
|
const parseResult = validators_1.AdminListReturnsSchema.safeParse(req.query ?? {});
|
|
@@ -53,7 +55,7 @@ const GET = async (req, res) => {
|
|
|
53
55
|
const [returns, _totalCount] = await orderModuleService.listAndCountReturns(Object.keys(filters).length > 0 ? filters : undefined, {
|
|
54
56
|
take: 2000,
|
|
55
57
|
order: { created_at: "DESC" },
|
|
56
|
-
relations: ["items"],
|
|
58
|
+
relations: ["items", "shipping_methods"],
|
|
57
59
|
});
|
|
58
60
|
const allReturns = Array.isArray(returns) ? returns : [];
|
|
59
61
|
const createdByFilter = query.created_by ?? "all";
|
|
@@ -69,7 +71,45 @@ const GET = async (req, res) => {
|
|
|
69
71
|
return true;
|
|
70
72
|
});
|
|
71
73
|
const orderReturnsList = filteredReturns.slice(query.offset, query.offset + query.limit);
|
|
72
|
-
const
|
|
74
|
+
const refundInputs = [];
|
|
75
|
+
let mappingService = null;
|
|
76
|
+
try {
|
|
77
|
+
mappingService = req.scope.resolve(refund_payment_mapping_1.REFUND_PAYMENT_MAPPING_MODULE);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
mappingService = null;
|
|
81
|
+
}
|
|
82
|
+
for (const row of orderReturnsList) {
|
|
83
|
+
const raw = row;
|
|
84
|
+
let isRefunded = false;
|
|
85
|
+
if (mappingService && raw.id) {
|
|
86
|
+
const mapping = await mappingService.getByReturnId(raw.id).catch(() => null);
|
|
87
|
+
isRefunded = Boolean(mapping?.is_refunded);
|
|
88
|
+
}
|
|
89
|
+
refundInputs.push({
|
|
90
|
+
id: raw.id,
|
|
91
|
+
order_id: raw.order_id,
|
|
92
|
+
refund_amount: raw.refund_amount,
|
|
93
|
+
items: raw.items,
|
|
94
|
+
shipping_methods: raw.shipping_methods,
|
|
95
|
+
is_refunded: isRefunded,
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
const orderIds = refundInputs
|
|
99
|
+
.map((row) => row.order_id)
|
|
100
|
+
.filter((id) => typeof id === "string" && id.length > 0);
|
|
101
|
+
const orderMerchandise = await (0, refund_calculation_1.loadOrderMerchandiseByIds)(orderIds, req.scope);
|
|
102
|
+
const refundByReturnId = await (0, refund_calculation_1.loadRefundCalculationsForReturns)(refundInputs, req.scope, orderMerchandise);
|
|
103
|
+
const safeReturns = orderReturnsList.map((r) => {
|
|
104
|
+
const normalized = (0, returns_1.ensureReturnDatesForDashboard)((0, returns_1.normalizeOrderModuleReturnForDashboard)(r));
|
|
105
|
+
const returnId = typeof normalized.id === "string" ? normalized.id : String(r.id);
|
|
106
|
+
const refund = refundByReturnId.get(returnId) ?? null;
|
|
107
|
+
return {
|
|
108
|
+
...normalized,
|
|
109
|
+
refund,
|
|
110
|
+
currency_code: refund?.currency_code,
|
|
111
|
+
};
|
|
112
|
+
});
|
|
73
113
|
res.status(200).json({
|
|
74
114
|
returns: safeReturns,
|
|
75
115
|
count: filteredReturns.length,
|
|
@@ -87,4 +127,4 @@ const GET = async (req, res) => {
|
|
|
87
127
|
}
|
|
88
128
|
};
|
|
89
129
|
exports.GET = GET;
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3JldHVybi9yb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxREFBbUQ7QUFFbkQsc0RBR2lDO0FBQ2pDLDRFQUk0QztBQUM1QyxvRkFBdUY7QUFFdkYsNkNBQXFEO0FBRTlDLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUFrQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNuRSxNQUFNLFdBQVcsR0FBRyxtQ0FBc0IsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQTtJQUVyRSxJQUFJLEtBV0gsQ0FBQTtJQUVELElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDekIsTUFBTSxRQUFRLEdBQUcsR0FBRyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUE7UUFDaEMsTUFBTSxZQUFZLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQTtRQUN4QyxNQUFNLGlCQUFpQixHQUNyQixPQUFPLFlBQVksS0FBSyxRQUFRLElBQUksQ0FBQyxLQUFLLEVBQUUsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUM7WUFDckYsQ0FBQyxDQUFFLFlBQTZDO1lBQ2hELENBQUMsQ0FBQyxLQUFLLENBQUE7UUFDWCxLQUFLLEdBQUc7WUFDTixNQUFNLEVBQUUsT0FBTyxRQUFRLENBQUMsTUFBTSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsU0FBUztZQUN6RSxRQUFRLEVBQUUsT0FBTyxRQUFRLENBQUMsUUFBUSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUztZQUMvRSxjQUFjLEVBQUUsT0FBTyxRQUFRLENBQUMsY0FBYyxLQUFLLFFBQVEsQ0FB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
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.GET = GET;
|
|
4
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
5
5
|
const refund_payment_mapping_1 = require("../../../../../modules/refund-payment-mapping");
|
|
6
|
+
const refund_calculation_1 = require("../../../../../helpers/refund-calculation");
|
|
6
7
|
/**
|
|
7
8
|
* GET /store/orders/:order_id/refund-payment-mappings
|
|
8
9
|
* Customer can list refund payment mappings for their order's returns.
|
|
@@ -56,7 +57,8 @@ async function GET(req, res) {
|
|
|
56
57
|
for (const returnId of returnIds) {
|
|
57
58
|
const mapping = await mappingService.getByReturnId(returnId);
|
|
58
59
|
if (mapping) {
|
|
59
|
-
|
|
60
|
+
const refund = await (0, refund_calculation_1.loadRefundCalculation)(orderId, req.scope, { returnId });
|
|
61
|
+
refund_payment_mappings.push({ ...mapping, return_id: returnId, refund });
|
|
60
62
|
}
|
|
61
63
|
}
|
|
62
64
|
res.json({ refund_payment_mappings });
|
|
@@ -70,4 +72,4 @@ async function GET(req, res) {
|
|
|
70
72
|
});
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL3N0b3JlL29yZGVycy9bb3JkZXJfaWRdL3JlZnVuZC1wYXltZW50LW1hcHBpbmdzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBb0JBLGtCQTZFQztBQWhHRCxxREFBbUQ7QUFFbkQsMEZBQTZGO0FBRzdGLGtGQUdrRDtBQU1sRDs7OztHQUlHO0FBQ0ksS0FBSyxVQUFVLEdBQUcsQ0FDdkIsR0FBa0IsRUFDbEIsR0FBbUI7SUFFbkIsTUFBTSxXQUFXLEdBQUksR0FBcUUsQ0FBQyxZQUFZLENBQUE7SUFDdkcsTUFBTSxVQUFVLEdBQUcsV0FBVyxFQUFFLFFBQVEsQ0FBQTtJQUN4QyxNQUFNLFNBQVMsR0FBRyxXQUFXLEVBQUUsVUFBVSxDQUFBO0lBQ3pDLE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBa0IsQ0FBQTtJQUU3QyxJQUFJLENBQUMsVUFBVSxJQUFJLFNBQVMsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUM1QyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUNuQixPQUFPLEVBQUUsbURBQW1EO1lBQzVELElBQUksRUFBRSxjQUFjO1NBQ3JCLENBQUMsQ0FBQTtRQUNGLE9BQU07SUFDUixDQUFDO0lBRUQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDbkIsT0FBTyxFQUFFLHNCQUFzQjtZQUMvQixJQUFJLEVBQUUsY0FBYztTQUNyQixDQUFDLENBQUE7UUFDRixPQUFNO0lBQ1IsQ0FBQztJQUVELElBQUksQ0FBQztRQUNILE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQXNCLGVBQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNo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
|