@medusajs/medusa 1.6.1 → 1.6.2-alpha.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.
Files changed (13) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/CHANGELOG.md +6 -0
  3. package/dist/api/routes/admin/draft-orders/get-draft-order.js +1 -2
  4. package/dist/api/routes/admin/draft-orders/get-draft-order.js.map +1 -1
  5. package/dist/services/cart.js +1 -8
  6. package/dist/services/cart.js.map +1 -1
  7. package/dist/services/order.js +202 -176
  8. package/dist/services/order.js.map +1 -1
  9. package/dist/services/shipping-option.js +4 -4
  10. package/dist/services/shipping-option.js.map +1 -1
  11. package/dist/services/swap.js +83 -81
  12. package/dist/services/swap.js.map +1 -1
  13. package/package.json +1 -1
package/dist/services/order.js CHANGED
@@ -1799,255 +1799,281 @@ var OrderService = /** @class */ (function (_super) {
1799
1799
  OrderService.prototype.decorateTotals = function (order, totalsFields) {
1800
1800
  if (totalsFields === void 0) { totalsFields = []; }
1801
1801
  return __awaiter(this, void 0, void 0, function () {
1802
- var totalsFields_1, totalsFields_1_1, totalField, _a, _b, giftCardBreakdown, _c, _d, _e, _f, paid_total, refunded_total, items, _g, _h, item, _j, _k, _l, e_16_1, _m, _o, s, items, _p, _q, item, _r, _s, _t, e_17_1, e_18_1, _u, _v, c, items, _w, _x, item, _y, _z, _0, e_19_1, e_20_1, e_21_1;
1803
- var e_21, _1, e_16, _2, _3, e_18, _4, e_17, _5, _6, e_20, _7, e_19, _8, _9;
1804
- return __generator(this, function (_10) {
1805
- switch (_10.label) {
1802
+ var calculationContext_1, _a, totalsFields_1, totalsFields_1_1, totalField, _b, _c, giftCardBreakdown, _d, _e, _f, _g, paid_total, refunded_total, items, _h, _j, item, _k, _l, _m, e_16_1, _o, _p, s, items, _q, _r, item, _s, _t, _u, e_17_1, e_18_1, _v, _w, c, items, _x, _y, item, _z, _0, _1, e_19_1, e_20_1, e_21_1;
1803
+ var e_21, _2, e_16, _3, _4, e_18, _5, e_17, _6, _7, e_20, _8, e_19, _9, _10;
1804
+ var _this = this;
1805
+ return __generator(this, function (_11) {
1806
+ switch (_11.label) {
1806
1807
  case 0:
1807
- _10.trys.push([0, 59, 60, 61]);
1808
- totalsFields_1 = __values(totalsFields), totalsFields_1_1 = totalsFields_1.next();
1809
- _10.label = 1;
1808
+ if (!totalsFields.some(function (field) { return ["subtotal", "total"].includes(field); })) return [3 /*break*/, 3];
1809
+ return [4 /*yield*/, this.totalsService_.getCalculationContext(order, {
1810
+ exclude_shipping: true,
1811
+ })];
1810
1812
  case 1:
1811
- if (!!totalsFields_1_1.done) return [3 /*break*/, 58];
1812
- totalField = totalsFields_1_1.value;
1813
- _a = totalField;
1814
- switch (_a) {
1815
- case "shipping_total": return [3 /*break*/, 2];
1816
- case "gift_card_total": return [3 /*break*/, 4];
1817
- case "discount_total": return [3 /*break*/, 6];
1818
- case "tax_total": return [3 /*break*/, 8];
1819
- case "subtotal": return [3 /*break*/, 10];
1820
- case "total": return [3 /*break*/, 12];
1821
- case "refunded_total": return [3 /*break*/, 14];
1822
- case "paid_total": return [3 /*break*/, 15];
1823
- case "refundable_amount": return [3 /*break*/, 16];
1824
- case "items.refundable": return [3 /*break*/, 17];
1825
- case "swaps.additional_items.refundable": return [3 /*break*/, 26];
1826
- case "claims.additional_items.refundable": return [3 /*break*/, 41];
1827
- }
1828
- return [3 /*break*/, 56];
1813
+ calculationContext_1 = _11.sent();
1814
+ _a = order;
1815
+ return [4 /*yield*/, Promise.all((order.items || []).map(function (item) { return __awaiter(_this, void 0, void 0, function () {
1816
+ var itemTotals;
1817
+ return __generator(this, function (_a) {
1818
+ switch (_a.label) {
1819
+ case 0: return [4 /*yield*/, this.totalsService_.getLineItemTotals(item, order, {
1820
+ include_tax: true,
1821
+ calculation_context: calculationContext_1,
1822
+ })];
1823
+ case 1:
1824
+ itemTotals = _a.sent();
1825
+ return [2 /*return*/, Object.assign(item, itemTotals)];
1826
+ }
1827
+ });
1828
+ }); }))];
1829
1829
  case 2:
1830
- _b = order;
1831
- return [4 /*yield*/, this.totalsService_.getShippingTotal(order)];
1830
+ _a.items = _11.sent();
1831
+ _11.label = 3;
1832
1832
  case 3:
1833
- _b.shipping_total = _10.sent();
1834
- return [3 /*break*/, 57];
1835
- case 4: return [4 /*yield*/, this.totalsService_.getGiftCardTotal(order)];
1833
+ _11.trys.push([3, 62, 63, 64]);
1834
+ totalsFields_1 = __values(totalsFields), totalsFields_1_1 = totalsFields_1.next();
1835
+ _11.label = 4;
1836
+ case 4:
1837
+ if (!!totalsFields_1_1.done) return [3 /*break*/, 61];
1838
+ totalField = totalsFields_1_1.value;
1839
+ _b = totalField;
1840
+ switch (_b) {
1841
+ case "shipping_total": return [3 /*break*/, 5];
1842
+ case "gift_card_total": return [3 /*break*/, 7];
1843
+ case "discount_total": return [3 /*break*/, 9];
1844
+ case "tax_total": return [3 /*break*/, 11];
1845
+ case "subtotal": return [3 /*break*/, 13];
1846
+ case "total": return [3 /*break*/, 15];
1847
+ case "refunded_total": return [3 /*break*/, 17];
1848
+ case "paid_total": return [3 /*break*/, 18];
1849
+ case "refundable_amount": return [3 /*break*/, 19];
1850
+ case "items.refundable": return [3 /*break*/, 20];
1851
+ case "swaps.additional_items.refundable": return [3 /*break*/, 29];
1852
+ case "claims.additional_items.refundable": return [3 /*break*/, 44];
1853
+ }
1854
+ return [3 /*break*/, 59];
1836
1855
  case 5:
1837
- giftCardBreakdown = _10.sent();
1838
- order.gift_card_total = giftCardBreakdown.total;
1839
- order.gift_card_tax_total = giftCardBreakdown.tax_total;
1840
- return [3 /*break*/, 57];
1841
- case 6:
1842
1856
  _c = order;
1843
- return [4 /*yield*/, this.totalsService_.getDiscountTotal(order)];
1844
- case 7:
1845
- _c.discount_total = _10.sent();
1846
- return [3 /*break*/, 57];
1857
+ return [4 /*yield*/, this.totalsService_.getShippingTotal(order)];
1858
+ case 6:
1859
+ _c.shipping_total = _11.sent();
1860
+ return [3 /*break*/, 60];
1861
+ case 7: return [4 /*yield*/, this.totalsService_.getGiftCardTotal(order)];
1847
1862
  case 8:
1848
- _d = order;
1849
- return [4 /*yield*/, this.totalsService_.getTaxTotal(order)];
1863
+ giftCardBreakdown = _11.sent();
1864
+ order.gift_card_total = giftCardBreakdown.total;
1865
+ order.gift_card_tax_total = giftCardBreakdown.tax_total;
1866
+ return [3 /*break*/, 60];
1850
1867
  case 9:
1851
- _d.tax_total = _10.sent();
1852
- return [3 /*break*/, 57];
1868
+ _d = order;
1869
+ return [4 /*yield*/, this.totalsService_.getDiscountTotal(order)];
1853
1870
  case 10:
1854
- _e = order;
1855
- return [4 /*yield*/, this.totalsService_.getSubtotal(order)];
1871
+ _d.discount_total = _11.sent();
1872
+ return [3 /*break*/, 60];
1856
1873
  case 11:
1857
- _e.subtotal = _10.sent();
1858
- return [3 /*break*/, 57];
1874
+ _e = order;
1875
+ return [4 /*yield*/, this.totalsService_.getTaxTotal(order)];
1859
1876
  case 12:
1877
+ _e.tax_total = _11.sent();
1878
+ return [3 /*break*/, 60];
1879
+ case 13:
1860
1880
  _f = order;
1881
+ return [4 /*yield*/, this.totalsService_.getSubtotal(order)];
1882
+ case 14:
1883
+ _f.subtotal = _11.sent();
1884
+ return [3 /*break*/, 60];
1885
+ case 15:
1886
+ _g = order;
1861
1887
  return [4 /*yield*/, this.totalsService_
1862
1888
  .withTransaction(this.manager_)
1863
1889
  .getTotal(order)];
1864
- case 13:
1865
- _f.total = _10.sent();
1866
- return [3 /*break*/, 57];
1867
- case 14:
1890
+ case 16:
1891
+ _g.total = _11.sent();
1892
+ return [3 /*break*/, 60];
1893
+ case 17:
1868
1894
  {
1869
1895
  order.refunded_total = this.totalsService_.getRefundedTotal(order);
1870
- return [3 /*break*/, 57];
1896
+ return [3 /*break*/, 60];
1871
1897
  }
1872
- _10.label = 15;
1873
- case 15:
1898
+ _11.label = 18;
1899
+ case 18:
1874
1900
  {
1875
1901
  order.paid_total = this.totalsService_.getPaidTotal(order);
1876
- return [3 /*break*/, 57];
1902
+ return [3 /*break*/, 60];
1877
1903
  }
1878
- _10.label = 16;
1879
- case 16:
1904
+ _11.label = 19;
1905
+ case 19:
1880
1906
  {
1881
1907
  paid_total = this.totalsService_.getPaidTotal(order);
1882
1908
  refunded_total = this.totalsService_.getRefundedTotal(order);
1883
1909
  order.refundable_amount = paid_total - refunded_total;
1884
- return [3 /*break*/, 57];
1910
+ return [3 /*break*/, 60];
1885
1911
  }
1886
- _10.label = 17;
1887
- case 17:
1888
- items = [];
1889
- _10.label = 18;
1890
- case 18:
1891
- _10.trys.push([18, 23, 24, 25]);
1892
- _g = (e_16 = void 0, __values(order.items)), _h = _g.next();
1893
- _10.label = 19;
1894
- case 19:
1895
- if (!!_h.done) return [3 /*break*/, 22];
1896
- item = _h.value;
1897
- _k = (_j = items).push;
1898
- _l = [__assign({}, item)];
1899
- _3 = {};
1900
- return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
1912
+ _11.label = 20;
1901
1913
  case 20:
1902
- _k.apply(_j, [__assign.apply(void 0, _l.concat([(_3.refundable = _10.sent(), _3)]))]);
1903
- _10.label = 21;
1914
+ items = [];
1915
+ _11.label = 21;
1904
1916
  case 21:
1905
- _h = _g.next();
1906
- return [3 /*break*/, 19];
1907
- case 22: return [3 /*break*/, 25];
1917
+ _11.trys.push([21, 26, 27, 28]);
1918
+ _h = (e_16 = void 0, __values(order.items)), _j = _h.next();
1919
+ _11.label = 22;
1920
+ case 22:
1921
+ if (!!_j.done) return [3 /*break*/, 25];
1922
+ item = _j.value;
1923
+ _l = (_k = items).push;
1924
+ _m = [__assign({}, item)];
1925
+ _4 = {};
1926
+ return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
1908
1927
  case 23:
1909
- e_16_1 = _10.sent();
1910
- e_16 = { error: e_16_1 };
1911
- return [3 /*break*/, 25];
1928
+ _l.apply(_k, [__assign.apply(void 0, _m.concat([(_4.refundable = _11.sent(), _4)]))]);
1929
+ _11.label = 24;
1912
1930
  case 24:
1931
+ _j = _h.next();
1932
+ return [3 /*break*/, 22];
1933
+ case 25: return [3 /*break*/, 28];
1934
+ case 26:
1935
+ e_16_1 = _11.sent();
1936
+ e_16 = { error: e_16_1 };
1937
+ return [3 /*break*/, 28];
1938
+ case 27:
1913
1939
  try {
1914
- if (_h && !_h.done && (_2 = _g.return)) _2.call(_g);
1940
+ if (_j && !_j.done && (_3 = _h.return)) _3.call(_h);
1915
1941
  }
1916
1942
  finally { if (e_16) throw e_16.error; }
1917
1943
  return [7 /*endfinally*/];
1918
- case 25:
1919
- order.items = items;
1920
- return [3 /*break*/, 57];
1921
- case 26:
1922
- _10.trys.push([26, 38, 39, 40]);
1923
- _m = (e_18 = void 0, __values(order.swaps)), _o = _m.next();
1924
- _10.label = 27;
1925
- case 27:
1926
- if (!!_o.done) return [3 /*break*/, 37];
1927
- s = _o.value;
1928
- items = [];
1929
- _10.label = 28;
1930
1944
  case 28:
1931
- _10.trys.push([28, 33, 34, 35]);
1932
- _p = (e_17 = void 0, __values(s.additional_items)), _q = _p.next();
1933
- _10.label = 29;
1945
+ order.items = items;
1946
+ return [3 /*break*/, 60];
1934
1947
  case 29:
1935
- if (!!_q.done) return [3 /*break*/, 32];
1936
- item = _q.value;
1937
- _s = (_r = items).push;
1938
- _t = [__assign({}, item)];
1939
- _6 = {};
1940
- return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
1948
+ _11.trys.push([29, 41, 42, 43]);
1949
+ _o = (e_18 = void 0, __values(order.swaps)), _p = _o.next();
1950
+ _11.label = 30;
1941
1951
  case 30:
1942
- _s.apply(_r, [__assign.apply(void 0, _t.concat([(_6.refundable = _10.sent(), _6)]))]);
1943
- _10.label = 31;
1952
+ if (!!_p.done) return [3 /*break*/, 40];
1953
+ s = _p.value;
1954
+ items = [];
1955
+ _11.label = 31;
1944
1956
  case 31:
1945
- _q = _p.next();
1946
- return [3 /*break*/, 29];
1947
- case 32: return [3 /*break*/, 35];
1957
+ _11.trys.push([31, 36, 37, 38]);
1958
+ _q = (e_17 = void 0, __values(s.additional_items)), _r = _q.next();
1959
+ _11.label = 32;
1960
+ case 32:
1961
+ if (!!_r.done) return [3 /*break*/, 35];
1962
+ item = _r.value;
1963
+ _t = (_s = items).push;
1964
+ _u = [__assign({}, item)];
1965
+ _7 = {};
1966
+ return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
1948
1967
  case 33:
1949
- e_17_1 = _10.sent();
1950
- e_17 = { error: e_17_1 };
1951
- return [3 /*break*/, 35];
1968
+ _t.apply(_s, [__assign.apply(void 0, _u.concat([(_7.refundable = _11.sent(), _7)]))]);
1969
+ _11.label = 34;
1952
1970
  case 34:
1971
+ _r = _q.next();
1972
+ return [3 /*break*/, 32];
1973
+ case 35: return [3 /*break*/, 38];
1974
+ case 36:
1975
+ e_17_1 = _11.sent();
1976
+ e_17 = { error: e_17_1 };
1977
+ return [3 /*break*/, 38];
1978
+ case 37:
1953
1979
  try {
1954
- if (_q && !_q.done && (_5 = _p.return)) _5.call(_p);
1980
+ if (_r && !_r.done && (_6 = _q.return)) _6.call(_q);
1955
1981
  }
1956
1982
  finally { if (e_17) throw e_17.error; }
1957
1983
  return [7 /*endfinally*/];
1958
- case 35:
1959
- s.additional_items = items;
1960
- _10.label = 36;
1961
- case 36:
1962
- _o = _m.next();
1963
- return [3 /*break*/, 27];
1964
- case 37: return [3 /*break*/, 40];
1965
1984
  case 38:
1966
- e_18_1 = _10.sent();
1967
- e_18 = { error: e_18_1 };
1968
- return [3 /*break*/, 40];
1985
+ s.additional_items = items;
1986
+ _11.label = 39;
1969
1987
  case 39:
1988
+ _p = _o.next();
1989
+ return [3 /*break*/, 30];
1990
+ case 40: return [3 /*break*/, 43];
1991
+ case 41:
1992
+ e_18_1 = _11.sent();
1993
+ e_18 = { error: e_18_1 };
1994
+ return [3 /*break*/, 43];
1995
+ case 42:
1970
1996
  try {
1971
- if (_o && !_o.done && (_4 = _m.return)) _4.call(_m);
1997
+ if (_p && !_p.done && (_5 = _o.return)) _5.call(_o);
1972
1998
  }
1973
1999
  finally { if (e_18) throw e_18.error; }
1974
2000
  return [7 /*endfinally*/];
1975
- case 40: return [3 /*break*/, 57];
1976
- case 41:
1977
- _10.trys.push([41, 53, 54, 55]);
1978
- _u = (e_20 = void 0, __values(order.claims)), _v = _u.next();
1979
- _10.label = 42;
1980
- case 42:
1981
- if (!!_v.done) return [3 /*break*/, 52];
1982
- c = _v.value;
1983
- items = [];
1984
- _10.label = 43;
1985
- case 43:
1986
- _10.trys.push([43, 48, 49, 50]);
1987
- _w = (e_19 = void 0, __values(c.additional_items)), _x = _w.next();
1988
- _10.label = 44;
2001
+ case 43: return [3 /*break*/, 60];
1989
2002
  case 44:
1990
- if (!!_x.done) return [3 /*break*/, 47];
1991
- item = _x.value;
1992
- _z = (_y = items).push;
1993
- _0 = [__assign({}, item)];
1994
- _9 = {};
1995
- return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
2003
+ _11.trys.push([44, 56, 57, 58]);
2004
+ _v = (e_20 = void 0, __values(order.claims)), _w = _v.next();
2005
+ _11.label = 45;
1996
2006
  case 45:
1997
- _z.apply(_y, [__assign.apply(void 0, _0.concat([(_9.refundable = _10.sent(), _9)]))]);
1998
- _10.label = 46;
2007
+ if (!!_w.done) return [3 /*break*/, 55];
2008
+ c = _w.value;
2009
+ items = [];
2010
+ _11.label = 46;
1999
2011
  case 46:
2000
- _x = _w.next();
2001
- return [3 /*break*/, 44];
2002
- case 47: return [3 /*break*/, 50];
2012
+ _11.trys.push([46, 51, 52, 53]);
2013
+ _x = (e_19 = void 0, __values(c.additional_items)), _y = _x.next();
2014
+ _11.label = 47;
2015
+ case 47:
2016
+ if (!!_y.done) return [3 /*break*/, 50];
2017
+ item = _y.value;
2018
+ _0 = (_z = items).push;
2019
+ _1 = [__assign({}, item)];
2020
+ _10 = {};
2021
+ return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
2003
2022
  case 48:
2004
- e_19_1 = _10.sent();
2005
- e_19 = { error: e_19_1 };
2006
- return [3 /*break*/, 50];
2023
+ _0.apply(_z, [__assign.apply(void 0, _1.concat([(_10.refundable = _11.sent(), _10)]))]);
2024
+ _11.label = 49;
2007
2025
  case 49:
2026
+ _y = _x.next();
2027
+ return [3 /*break*/, 47];
2028
+ case 50: return [3 /*break*/, 53];
2029
+ case 51:
2030
+ e_19_1 = _11.sent();
2031
+ e_19 = { error: e_19_1 };
2032
+ return [3 /*break*/, 53];
2033
+ case 52:
2008
2034
  try {
2009
- if (_x && !_x.done && (_8 = _w.return)) _8.call(_w);
2035
+ if (_y && !_y.done && (_9 = _x.return)) _9.call(_x);
2010
2036
  }
2011
2037
  finally { if (e_19) throw e_19.error; }
2012
2038
  return [7 /*endfinally*/];
2013
- case 50:
2014
- c.additional_items = items;
2015
- _10.label = 51;
2016
- case 51:
2017
- _v = _u.next();
2018
- return [3 /*break*/, 42];
2019
- case 52: return [3 /*break*/, 55];
2020
2039
  case 53:
2021
- e_20_1 = _10.sent();
2022
- e_20 = { error: e_20_1 };
2023
- return [3 /*break*/, 55];
2040
+ c.additional_items = items;
2041
+ _11.label = 54;
2024
2042
  case 54:
2043
+ _w = _v.next();
2044
+ return [3 /*break*/, 45];
2045
+ case 55: return [3 /*break*/, 58];
2046
+ case 56:
2047
+ e_20_1 = _11.sent();
2048
+ e_20 = { error: e_20_1 };
2049
+ return [3 /*break*/, 58];
2050
+ case 57:
2025
2051
  try {
2026
- if (_v && !_v.done && (_7 = _u.return)) _7.call(_u);
2052
+ if (_w && !_w.done && (_8 = _v.return)) _8.call(_v);
2027
2053
  }
2028
2054
  finally { if (e_20) throw e_20.error; }
2029
2055
  return [7 /*endfinally*/];
2030
- case 55: return [3 /*break*/, 57];
2031
- case 56:
2056
+ case 58: return [3 /*break*/, 60];
2057
+ case 59:
2032
2058
  {
2033
- return [3 /*break*/, 57];
2059
+ return [3 /*break*/, 60];
2034
2060
  }
2035
- _10.label = 57;
2036
- case 57:
2061
+ _11.label = 60;
2062
+ case 60:
2037
2063
  totalsFields_1_1 = totalsFields_1.next();
2038
- return [3 /*break*/, 1];
2039
- case 58: return [3 /*break*/, 61];
2040
- case 59:
2041
- e_21_1 = _10.sent();
2064
+ return [3 /*break*/, 4];
2065
+ case 61: return [3 /*break*/, 64];
2066
+ case 62:
2067
+ e_21_1 = _11.sent();
2042
2068
  e_21 = { error: e_21_1 };
2043
- return [3 /*break*/, 61];
2044
- case 60:
2069
+ return [3 /*break*/, 64];
2070
+ case 63:
2045
2071
  try {
2046
- if (totalsFields_1_1 && !totalsFields_1_1.done && (_1 = totalsFields_1.return)) _1.call(totalsFields_1);
2072
+ if (totalsFields_1_1 && !totalsFields_1_1.done && (_2 = totalsFields_1.return)) _2.call(totalsFields_1);
2047
2073
  }
2048
2074
  finally { if (e_21) throw e_21.error; }
2049
2075
  return [7 /*endfinally*/];
2050
- case 61: return [2 /*return*/, order];
2076
+ case 64: return [2 /*return*/, order];
2051
2077
  }
2052
2078
  });
2053
2079
  });