@medusajs/medusa 1.3.9-alpha.0 → 1.3.9
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +2 -12
- package/dist/api/index.d.ts +0 -1
- package/dist/api/index.js +0 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/routes/admin/batch/create-batch-job.js +7 -10
- package/dist/api/routes/admin/batch/create-batch-job.js.map +1 -1
- package/dist/api/routes/admin/currencies/index.d.ts +0 -0
- package/dist/api/routes/admin/currencies/index.js +0 -0
- package/dist/api/routes/admin/currencies/index.js.map +0 -0
- package/dist/api/routes/admin/currencies/list-currencies.d.ts +0 -0
- package/dist/api/routes/admin/currencies/list-currencies.js +0 -0
- package/dist/api/routes/admin/currencies/list-currencies.js.map +0 -0
- package/dist/api/routes/admin/currencies/update-currency.d.ts +0 -0
- package/dist/api/routes/admin/currencies/update-currency.js +0 -0
- package/dist/api/routes/admin/currencies/update-currency.js.map +0 -0
- package/dist/api/routes/admin/currency/index.d.ts +0 -0
- package/dist/api/routes/admin/currency/index.js +0 -0
- package/dist/api/routes/admin/currency/index.js.map +0 -0
- package/dist/api/routes/admin/currency/list-currencies.d.ts +0 -0
- package/dist/api/routes/admin/currency/list-currencies.js +0 -0
- package/dist/api/routes/admin/currency/list-currencies.js.map +0 -0
- package/dist/api/routes/admin/currency/update-currency.d.ts +0 -0
- package/dist/api/routes/admin/currency/update-currency.js +0 -0
- package/dist/api/routes/admin/currency/update-currency.js.map +0 -0
- package/dist/api/routes/admin/index.js +4 -6
- package/dist/api/routes/admin/index.js.map +1 -1
- package/dist/api/routes/admin/price-lists/create-price-list.d.ts +0 -4
- package/dist/api/routes/admin/price-lists/create-price-list.js +1 -16
- package/dist/api/routes/admin/price-lists/create-price-list.js.map +1 -1
- package/dist/api/routes/admin/price-lists/index.d.ts +1 -2
- package/dist/api/routes/admin/price-lists/index.js +1 -8
- package/dist/api/routes/admin/price-lists/index.js.map +1 -1
- package/dist/api/routes/admin/price-lists/update-price-list.d.ts +0 -4
- package/dist/api/routes/admin/price-lists/update-price-list.js +1 -16
- package/dist/api/routes/admin/price-lists/update-price-list.js.map +1 -1
- package/dist/api/routes/admin/products/update-variant.js +0 -1
- package/dist/api/routes/admin/products/update-variant.js.map +1 -1
- package/dist/api/routes/admin/regions/create-region.d.ts +0 -4
- package/dist/api/routes/admin/regions/create-region.js +1 -16
- package/dist/api/routes/admin/regions/create-region.js.map +1 -1
- package/dist/api/routes/admin/regions/index.d.ts +1 -2
- package/dist/api/routes/admin/regions/index.js +1 -5
- package/dist/api/routes/admin/regions/index.js.map +1 -1
- package/dist/api/routes/admin/regions/update-region.d.ts +0 -4
- package/dist/api/routes/admin/regions/update-region.js +1 -16
- package/dist/api/routes/admin/regions/update-region.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/create-shipping-option.d.ts +0 -4
- package/dist/api/routes/admin/shipping-options/create-shipping-option.js +0 -15
- package/dist/api/routes/admin/shipping-options/create-shipping-option.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/index.d.ts +1 -2
- package/dist/api/routes/admin/shipping-options/index.js +1 -5
- package/dist/api/routes/admin/shipping-options/index.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/update-shipping-option.d.ts +0 -4
- package/dist/api/routes/admin/shipping-options/update-shipping-option.js +0 -15
- package/dist/api/routes/admin/shipping-options/update-shipping-option.js.map +1 -1
- package/dist/api/routes/store/carts/create-cart.js +60 -40
- package/dist/api/routes/store/carts/create-cart.js.map +1 -1
- package/dist/helpers/test-request.js +4 -27
- package/dist/helpers/test-request.js.map +1 -1
- package/dist/interfaces/price-selection-strategy.d.ts +0 -4
- package/dist/interfaces/price-selection-strategy.js.map +1 -1
- package/dist/loaders/feature-flags/index.d.ts +0 -1
- package/dist/loaders/feature-flags/index.js +3 -18
- package/dist/loaders/feature-flags/index.js.map +1 -1
- package/dist/loaders/feature-flags/tax-inclusive-pricing.d.ts +0 -0
- package/dist/loaders/feature-flags/tax-inclusive-pricing.js +0 -0
- package/dist/loaders/feature-flags/tax-inclusive-pricing.js.map +0 -0
- package/dist/migrations/1659501357661-tax_inclusive_pricing.d.ts +0 -0
- package/dist/migrations/1659501357661-tax_inclusive_pricing.js +0 -0
- package/dist/migrations/1659501357661-tax_inclusive_pricing.js.map +0 -0
- package/dist/models/currency.d.ts +0 -4
- package/dist/models/currency.js +0 -12
- package/dist/models/currency.js.map +1 -1
- package/dist/models/custom-shipping-option.d.ts +0 -3
- package/dist/models/custom-shipping-option.js +0 -3
- package/dist/models/custom-shipping-option.js.map +1 -1
- package/dist/models/line-item.d.ts +0 -4
- package/dist/models/line-item.js +0 -12
- package/dist/models/line-item.js.map +1 -1
- package/dist/models/money-amount.d.ts +2 -2
- package/dist/models/money-amount.js.map +1 -1
- package/dist/models/price-list.d.ts +0 -5
- package/dist/models/price-list.js +0 -13
- package/dist/models/price-list.js.map +1 -1
- package/dist/models/region.d.ts +0 -4
- package/dist/models/region.js +0 -12
- package/dist/models/region.js.map +1 -1
- package/dist/models/shipping-method.d.ts +0 -4
- package/dist/models/shipping-method.js +0 -12
- package/dist/models/shipping-method.js.map +1 -1
- package/dist/models/shipping-option.d.ts +0 -4
- package/dist/models/shipping-option.js +0 -12
- package/dist/models/shipping-option.js.map +1 -1
- package/dist/repositories/currency.d.ts +1 -1
- package/dist/repositories/currency.js +2 -2
- package/dist/repositories/currency.js.map +1 -1
- package/dist/repositories/money-amount.d.ts +1 -1
- package/dist/repositories/money-amount.js +4 -8
- package/dist/repositories/money-amount.js.map +1 -1
- package/dist/services/batch-job.js +2 -4
- package/dist/services/batch-job.js.map +1 -1
- package/dist/services/cart.js +74 -83
- package/dist/services/cart.js.map +1 -1
- package/dist/services/claim.js +43 -45
- package/dist/services/claim.js.map +1 -1
- package/dist/services/currency.d.ts +0 -0
- package/dist/services/currency.js +0 -0
- package/dist/services/currency.js.map +0 -0
- package/dist/services/discount.d.ts +1 -4
- package/dist/services/discount.js +20 -39
- package/dist/services/discount.js.map +1 -1
- package/dist/services/index.d.ts +1 -1
- package/dist/services/index.js +3 -3
- package/dist/services/index.js.map +1 -1
- package/dist/services/line-item-adjustment.d.ts +4 -1
- package/dist/services/line-item-adjustment.js +1 -2
- package/dist/services/line-item-adjustment.js.map +1 -1
- package/dist/services/line-item.d.ts +7 -12
- package/dist/services/line-item.js +10 -22
- package/dist/services/line-item.js.map +1 -1
- package/dist/services/notification.js +2 -3
- package/dist/services/notification.js.map +1 -1
- package/dist/services/order.js +115 -214
- package/dist/services/order.js.map +1 -1
- package/dist/services/price-list.d.ts +4 -7
- package/dist/services/price-list.js +11 -25
- package/dist/services/price-list.js.map +1 -1
- package/dist/services/pricing.d.ts +4 -7
- package/dist/services/pricing.js +12 -39
- package/dist/services/pricing.js.map +1 -1
- package/dist/services/product-variant.js +1 -1
- package/dist/services/product-variant.js.map +1 -1
- package/dist/services/region.d.ts +7 -10
- package/dist/services/region.js +6 -22
- package/dist/services/region.js.map +1 -1
- package/dist/services/return.js +19 -23
- package/dist/services/return.js.map +1 -1
- package/dist/services/shipping-option.d.ts +8 -12
- package/dist/services/shipping-option.js +2 -23
- package/dist/services/shipping-option.js.map +1 -1
- package/dist/services/store.d.ts +2 -1
- package/dist/services/store.js.map +1 -1
- package/dist/services/totals.d.ts +20 -18
- package/dist/services/totals.js +358 -614
- package/dist/services/totals.js.map +1 -1
- package/dist/strategies/__fixtures__/product-export-data.js +2 -6
- package/dist/strategies/__fixtures__/product-export-data.js.map +1 -1
- package/dist/strategies/batch-jobs/product/export.d.ts +0 -6
- package/dist/strategies/batch-jobs/product/export.js +2 -11
- package/dist/strategies/batch-jobs/product/export.js.map +1 -1
- package/dist/strategies/batch-jobs/product/import.d.ts +5 -6
- package/dist/strategies/batch-jobs/product/import.js +183 -271
- package/dist/strategies/batch-jobs/product/import.js.map +1 -1
- package/dist/strategies/batch-jobs/product/index.js +2 -2
- package/dist/strategies/batch-jobs/product/types.d.ts +0 -8
- package/dist/strategies/batch-jobs/product/types.js.map +1 -1
- package/dist/strategies/batch-jobs/product/utils.d.ts +1 -1
- package/dist/strategies/batch-jobs/product/utils.js +1 -10
- package/dist/strategies/batch-jobs/product/utils.js.map +1 -1
- package/dist/strategies/price-selection.d.ts +2 -6
- package/dist/strategies/price-selection.js +10 -124
- package/dist/strategies/price-selection.js.map +1 -1
- package/dist/strategies/tax-calculation.d.ts +5 -7
- package/dist/strategies/tax-calculation.js +17 -47
- package/dist/strategies/tax-calculation.js.map +1 -1
- package/dist/subscribers/batch-job.d.ts +1 -4
- package/dist/subscribers/batch-job.js +44 -71
- package/dist/subscribers/batch-job.js.map +1 -1
- package/dist/types/currency.d.ts +0 -0
- package/dist/types/currency.js +0 -0
- package/dist/types/currency.js.map +0 -0
- package/dist/types/price-list.d.ts +1 -2
- package/dist/types/pricing.d.ts +2 -5
- package/dist/types/region.d.ts +0 -2
- package/dist/types/shipping-options.d.ts +0 -2
- package/dist/utils/calculate-price-tax-amount.d.ts +0 -0
- package/dist/utils/calculate-price-tax-amount.js +0 -0
- package/dist/utils/calculate-price-tax-amount.js.map +0 -0
- package/dist/utils/csv-cell-content-formatter.d.ts +0 -0
- package/dist/utils/csv-cell-content-formatter.js +0 -0
- package/dist/utils/csv-cell-content-formatter.js.map +0 -0
- package/dist/utils/feature-flag-decorators.js +16 -4
- package/dist/utils/feature-flag-decorators.js.map +1 -1
- package/dist/utils/flag-router.d.ts +1 -1
- package/dist/utils/flag-router.js.map +1 -1
- package/dist/utils/index.d.ts +0 -2
- package/dist/utils/index.js +0 -2
- package/dist/utils/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import { BaseService } from "medusa-interfaces";
|
|
2
2
|
import { EntityManager } from "typeorm";
|
|
3
3
|
import { DeepPartial } from "typeorm/common/DeepPartial";
|
|
4
|
-
import { LineItemTaxLine } from "../models";
|
|
5
|
-
import { Cart } from "../models/cart";
|
|
6
|
-
import { LineItem } from "../models/line-item";
|
|
7
|
-
import { CartRepository } from "../repositories/cart";
|
|
8
4
|
import { LineItemRepository } from "../repositories/line-item";
|
|
9
5
|
import { LineItemTaxLineRepository } from "../repositories/line-item-tax-line";
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
6
|
+
import { PricingService, ProductService, RegionService, ProductVariantService } from "./index";
|
|
7
|
+
import { CartRepository } from "../repositories/cart";
|
|
8
|
+
import { LineItem } from "../models/line-item";
|
|
13
9
|
import LineItemAdjustmentService from "./line-item-adjustment";
|
|
10
|
+
import { Cart } from "../models/cart";
|
|
11
|
+
import { FindConfig } from "../types/common";
|
|
12
|
+
import { LineItemTaxLine } from "../models";
|
|
14
13
|
declare type InjectedDependencies = {
|
|
15
14
|
manager: EntityManager;
|
|
16
15
|
lineItemRepository: typeof LineItemRepository;
|
|
@@ -21,7 +20,6 @@ declare type InjectedDependencies = {
|
|
|
21
20
|
pricingService: PricingService;
|
|
22
21
|
regionService: RegionService;
|
|
23
22
|
lineItemAdjustmentService: LineItemAdjustmentService;
|
|
24
|
-
featureFlagRouter: FlagRouter;
|
|
25
23
|
};
|
|
26
24
|
/**
|
|
27
25
|
* Provides layer to manipulate line items.
|
|
@@ -34,11 +32,9 @@ declare class LineItemService extends BaseService {
|
|
|
34
32
|
protected readonly cartRepository_: typeof CartRepository;
|
|
35
33
|
protected readonly productVariantService_: ProductVariantService;
|
|
36
34
|
protected readonly productService_: ProductService;
|
|
37
|
-
protected readonly pricingService_: PricingService;
|
|
38
35
|
protected readonly regionService_: RegionService;
|
|
39
|
-
protected readonly featureFlagRouter_: FlagRouter;
|
|
40
36
|
protected readonly lineItemAdjustmentService_: LineItemAdjustmentService;
|
|
41
|
-
constructor({ manager, lineItemRepository, lineItemTaxLineRepository, productVariantService, productService, pricingService, regionService, cartRepository, lineItemAdjustmentService,
|
|
37
|
+
constructor({ manager, lineItemRepository, lineItemTaxLineRepository, productVariantService, productService, pricingService, regionService, cartRepository, lineItemAdjustmentService, }: InjectedDependencies);
|
|
42
38
|
withTransaction(transactionManager: EntityManager): LineItemService;
|
|
43
39
|
list(selector: any, config?: FindConfig<LineItem>): Promise<LineItem[]>;
|
|
44
40
|
/**
|
|
@@ -58,7 +54,6 @@ declare class LineItemService extends BaseService {
|
|
|
58
54
|
createReturnLines(returnId: string, cartId: string): Promise<LineItem[]>;
|
|
59
55
|
generate(variantId: string, regionId: string, quantity: number, context?: {
|
|
60
56
|
unit_price?: number;
|
|
61
|
-
includes_tax?: boolean;
|
|
62
57
|
metadata?: Record<string, unknown>;
|
|
63
58
|
customer_id?: string;
|
|
64
59
|
cart?: Cart;
|
|
@@ -88,13 +88,9 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
88
88
|
}
|
|
89
89
|
return ar;
|
|
90
90
|
};
|
|
91
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
92
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
93
|
-
};
|
|
94
91
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
95
92
|
var medusa_core_utils_1 = require("medusa-core-utils");
|
|
96
93
|
var medusa_interfaces_1 = require("medusa-interfaces");
|
|
97
|
-
var tax_inclusive_pricing_1 = __importDefault(require("../loaders/feature-flags/tax-inclusive-pricing"));
|
|
98
94
|
/**
|
|
99
95
|
* Provides layer to manipulate line items.
|
|
100
96
|
* @extends BaseService
|
|
@@ -102,7 +98,7 @@ var tax_inclusive_pricing_1 = __importDefault(require("../loaders/feature-flags/
|
|
|
102
98
|
var LineItemService = /** @class */ (function (_super) {
|
|
103
99
|
__extends(LineItemService, _super);
|
|
104
100
|
function LineItemService(_a) {
|
|
105
|
-
var manager = _a.manager, lineItemRepository = _a.lineItemRepository, lineItemTaxLineRepository = _a.lineItemTaxLineRepository, productVariantService = _a.productVariantService, productService = _a.productService, pricingService = _a.pricingService, regionService = _a.regionService, cartRepository = _a.cartRepository, lineItemAdjustmentService = _a.lineItemAdjustmentService
|
|
101
|
+
var manager = _a.manager, lineItemRepository = _a.lineItemRepository, lineItemTaxLineRepository = _a.lineItemTaxLineRepository, productVariantService = _a.productVariantService, productService = _a.productService, pricingService = _a.pricingService, regionService = _a.regionService, cartRepository = _a.cartRepository, lineItemAdjustmentService = _a.lineItemAdjustmentService;
|
|
106
102
|
var _this = _super.call(this) || this;
|
|
107
103
|
_this.manager_ = manager;
|
|
108
104
|
_this.lineItemRepository_ = lineItemRepository;
|
|
@@ -113,7 +109,6 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
113
109
|
_this.regionService_ = regionService;
|
|
114
110
|
_this.cartRepository_ = cartRepository;
|
|
115
111
|
_this.lineItemAdjustmentService_ = lineItemAdjustmentService;
|
|
116
|
-
_this.featureFlagRouter_ = featureFlagRouter;
|
|
117
112
|
return _this;
|
|
118
113
|
}
|
|
119
114
|
LineItemService.prototype.withTransaction = function (transactionManager) {
|
|
@@ -130,7 +125,6 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
130
125
|
regionService: this.regionService_,
|
|
131
126
|
cartRepository: this.cartRepository_,
|
|
132
127
|
lineItemAdjustmentService: this.lineItemAdjustmentService_,
|
|
133
|
-
featureFlagRouter: this.featureFlagRouter_,
|
|
134
128
|
});
|
|
135
129
|
cloned.transactionManager_ = transactionManager;
|
|
136
130
|
return cloned;
|
|
@@ -254,10 +248,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
254
248
|
return __generator(this, function (_a) {
|
|
255
249
|
switch (_a.label) {
|
|
256
250
|
case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
|
|
257
|
-
var _a, variant, region, unit_price,
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
switch (_c.label) {
|
|
251
|
+
var _a, variant, region, unit_price, shouldMerge, variantPricing, rawLineItem, lineItemRepo, lineItem, adjustments;
|
|
252
|
+
return __generator(this, function (_b) {
|
|
253
|
+
switch (_b.label) {
|
|
261
254
|
case 0: return [4 /*yield*/, Promise.all([
|
|
262
255
|
this.productVariantService_
|
|
263
256
|
.withTransaction(transactionManager)
|
|
@@ -269,9 +262,8 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
269
262
|
.retrieve(regionId),
|
|
270
263
|
])];
|
|
271
264
|
case 1:
|
|
272
|
-
_a = __read.apply(void 0, [
|
|
265
|
+
_a = __read.apply(void 0, [_b.sent(), 2]), variant = _a[0], region = _a[1];
|
|
273
266
|
unit_price = Number(context.unit_price) < 0 ? 0 : context.unit_price;
|
|
274
|
-
unitPriceIncludesTax = false;
|
|
275
267
|
shouldMerge = false;
|
|
276
268
|
if (!(context.unit_price === undefined || context.unit_price === null)) return [3 /*break*/, 3];
|
|
277
269
|
shouldMerge = true;
|
|
@@ -284,10 +276,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
284
276
|
include_discount_prices: true,
|
|
285
277
|
})];
|
|
286
278
|
case 2:
|
|
287
|
-
variantPricing =
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
_c.label = 3;
|
|
279
|
+
variantPricing = _b.sent();
|
|
280
|
+
unit_price = variantPricing.calculated_price;
|
|
281
|
+
_b.label = 3;
|
|
291
282
|
case 3:
|
|
292
283
|
rawLineItem = {
|
|
293
284
|
unit_price: unit_price,
|
|
@@ -301,9 +292,6 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
301
292
|
metadata: (context === null || context === void 0 ? void 0 : context.metadata) || {},
|
|
302
293
|
should_merge: shouldMerge,
|
|
303
294
|
};
|
|
304
|
-
if (this.featureFlagRouter_.isFeatureEnabled(tax_inclusive_pricing_1.default.key)) {
|
|
305
|
-
rawLineItem.includes_tax = unitPriceIncludesTax;
|
|
306
|
-
}
|
|
307
295
|
lineItemRepo = transactionManager.getCustomRepository(this.lineItemRepository_);
|
|
308
296
|
lineItem = lineItemRepo.create(rawLineItem);
|
|
309
297
|
if (!context.cart) return [3 /*break*/, 5];
|
|
@@ -311,9 +299,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
311
299
|
.withTransaction(transactionManager)
|
|
312
300
|
.generateAdjustments(context.cart, lineItem, { variant: variant })];
|
|
313
301
|
case 4:
|
|
314
|
-
adjustments =
|
|
302
|
+
adjustments = _b.sent();
|
|
315
303
|
lineItem.adjustments = adjustments;
|
|
316
|
-
|
|
304
|
+
_b.label = 5;
|
|
317
305
|
case 5: return [2 /*return*/, lineItem];
|
|
318
306
|
}
|
|
319
307
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-item.js","sourceRoot":"","sources":["../../src/services/line-item.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"line-item.js","sourceRoot":"","sources":["../../src/services/line-item.ts"],"names":[],"mappings":"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"}
|
|
@@ -336,7 +336,7 @@ var NotificationService = /** @class */ (function (_super) {
|
|
|
336
336
|
return __generator(this, function (_a) {
|
|
337
337
|
switch (_a.label) {
|
|
338
338
|
case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
|
|
339
|
-
var notification, provider, _a, to, data, notiRepo,
|
|
339
|
+
var notification, provider, _a, to, data, notiRepo, created;
|
|
340
340
|
return __generator(this, function (_b) {
|
|
341
341
|
switch (_b.label) {
|
|
342
342
|
case 0: return [4 /*yield*/, this.retrieve(id)];
|
|
@@ -347,8 +347,7 @@ var NotificationService = /** @class */ (function (_super) {
|
|
|
347
347
|
case 2:
|
|
348
348
|
_a = _b.sent(), to = _a.to, data = _a.data;
|
|
349
349
|
notiRepo = transactionManager.getCustomRepository(this.notificationRepository_);
|
|
350
|
-
|
|
351
|
-
created = notiRepo.create(__assign(__assign({}, resendNoti), { to: to, data: data, parent_id: id }));
|
|
350
|
+
created = notiRepo.create(__assign(__assign({}, notification), { to: to, data: data, parent_id: id }));
|
|
352
351
|
return [2 /*return*/, notiRepo.save(created)];
|
|
353
352
|
}
|
|
354
353
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../src/services/notification.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../src/services/notification.ts"],"names":[],"mappings":"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"}
|
package/dist/services/order.js
CHANGED
|
@@ -1806,255 +1806,156 @@ var OrderService = /** @class */ (function (_super) {
|
|
|
1806
1806
|
OrderService.prototype.decorateTotals = function (order, totalsFields) {
|
|
1807
1807
|
if (totalsFields === void 0) { totalsFields = []; }
|
|
1808
1808
|
return __awaiter(this, void 0, void 0, function () {
|
|
1809
|
-
var totalsFields_1, totalsFields_1_1, totalField, _a,
|
|
1810
|
-
var
|
|
1811
|
-
|
|
1812
|
-
|
|
1809
|
+
var totalsFields_1, totalsFields_1_1, totalField, _a, giftCardBreakdown, _b, _c, paid_total, refunded_total, _d, _e, s, _f, _g, c, e_16_1;
|
|
1810
|
+
var e_16, _h, e_17, _j, e_18, _k;
|
|
1811
|
+
var _this = this;
|
|
1812
|
+
return __generator(this, function (_l) {
|
|
1813
|
+
switch (_l.label) {
|
|
1813
1814
|
case 0:
|
|
1814
|
-
|
|
1815
|
+
_l.trys.push([0, 19, 20, 21]);
|
|
1815
1816
|
totalsFields_1 = __values(totalsFields), totalsFields_1_1 = totalsFields_1.next();
|
|
1816
|
-
|
|
1817
|
+
_l.label = 1;
|
|
1817
1818
|
case 1:
|
|
1818
|
-
if (!!totalsFields_1_1.done) return [3 /*break*/,
|
|
1819
|
+
if (!!totalsFields_1_1.done) return [3 /*break*/, 18];
|
|
1819
1820
|
totalField = totalsFields_1_1.value;
|
|
1820
1821
|
_a = totalField;
|
|
1821
1822
|
switch (_a) {
|
|
1822
1823
|
case "shipping_total": return [3 /*break*/, 2];
|
|
1823
|
-
case "gift_card_total": return [3 /*break*/,
|
|
1824
|
-
case "discount_total": return [3 /*break*/,
|
|
1825
|
-
case "tax_total": return [3 /*break*/,
|
|
1826
|
-
case "subtotal": return [3 /*break*/,
|
|
1827
|
-
case "total": return [3 /*break*/,
|
|
1828
|
-
case "refunded_total": return [3 /*break*/,
|
|
1829
|
-
case "paid_total": return [3 /*break*/,
|
|
1830
|
-
case "refundable_amount": return [3 /*break*/,
|
|
1831
|
-
case "items.refundable": return [3 /*break*/,
|
|
1832
|
-
case "swaps.additional_items.refundable": return [3 /*break*/,
|
|
1833
|
-
case "claims.additional_items.refundable": return [3 /*break*/,
|
|
1824
|
+
case "gift_card_total": return [3 /*break*/, 3];
|
|
1825
|
+
case "discount_total": return [3 /*break*/, 4];
|
|
1826
|
+
case "tax_total": return [3 /*break*/, 5];
|
|
1827
|
+
case "subtotal": return [3 /*break*/, 7];
|
|
1828
|
+
case "total": return [3 /*break*/, 8];
|
|
1829
|
+
case "refunded_total": return [3 /*break*/, 10];
|
|
1830
|
+
case "paid_total": return [3 /*break*/, 11];
|
|
1831
|
+
case "refundable_amount": return [3 /*break*/, 12];
|
|
1832
|
+
case "items.refundable": return [3 /*break*/, 13];
|
|
1833
|
+
case "swaps.additional_items.refundable": return [3 /*break*/, 14];
|
|
1834
|
+
case "claims.additional_items.refundable": return [3 /*break*/, 15];
|
|
1834
1835
|
}
|
|
1835
|
-
return [3 /*break*/,
|
|
1836
|
+
return [3 /*break*/, 16];
|
|
1836
1837
|
case 2:
|
|
1837
|
-
|
|
1838
|
-
|
|
1838
|
+
{
|
|
1839
|
+
order.shipping_total = this.totalsService_.getShippingTotal(order);
|
|
1840
|
+
return [3 /*break*/, 17];
|
|
1841
|
+
}
|
|
1842
|
+
_l.label = 3;
|
|
1839
1843
|
case 3:
|
|
1840
|
-
|
|
1841
|
-
|
|
1842
|
-
|
|
1844
|
+
{
|
|
1845
|
+
giftCardBreakdown = this.totalsService_.getGiftCardTotal(order);
|
|
1846
|
+
order.gift_card_total = giftCardBreakdown.total;
|
|
1847
|
+
order.gift_card_tax_total = giftCardBreakdown.tax_total;
|
|
1848
|
+
return [3 /*break*/, 17];
|
|
1849
|
+
}
|
|
1850
|
+
_l.label = 4;
|
|
1851
|
+
case 4:
|
|
1852
|
+
{
|
|
1853
|
+
order.discount_total = this.totalsService_.getDiscountTotal(order);
|
|
1854
|
+
return [3 /*break*/, 17];
|
|
1855
|
+
}
|
|
1856
|
+
_l.label = 5;
|
|
1843
1857
|
case 5:
|
|
1844
|
-
|
|
1845
|
-
|
|
1846
|
-
order.gift_card_tax_total = giftCardBreakdown.tax_total;
|
|
1847
|
-
return [3 /*break*/, 57];
|
|
1858
|
+
_b = order;
|
|
1859
|
+
return [4 /*yield*/, this.totalsService_.getTaxTotal(order)];
|
|
1848
1860
|
case 6:
|
|
1849
|
-
|
|
1850
|
-
return [
|
|
1861
|
+
_b.tax_total = _l.sent();
|
|
1862
|
+
return [3 /*break*/, 17];
|
|
1851
1863
|
case 7:
|
|
1852
|
-
|
|
1853
|
-
|
|
1864
|
+
{
|
|
1865
|
+
order.subtotal = this.totalsService_.getSubtotal(order);
|
|
1866
|
+
return [3 /*break*/, 17];
|
|
1867
|
+
}
|
|
1868
|
+
_l.label = 8;
|
|
1854
1869
|
case 8:
|
|
1855
|
-
|
|
1856
|
-
return [4 /*yield*/, this.totalsService_.getTaxTotal(order)];
|
|
1857
|
-
case 9:
|
|
1858
|
-
_d.tax_total = _10.sent();
|
|
1859
|
-
return [3 /*break*/, 57];
|
|
1860
|
-
case 10:
|
|
1861
|
-
_e = order;
|
|
1862
|
-
return [4 /*yield*/, this.totalsService_.getSubtotal(order)];
|
|
1863
|
-
case 11:
|
|
1864
|
-
_e.subtotal = _10.sent();
|
|
1865
|
-
return [3 /*break*/, 57];
|
|
1866
|
-
case 12:
|
|
1867
|
-
_f = order;
|
|
1870
|
+
_c = order;
|
|
1868
1871
|
return [4 /*yield*/, this.totalsService_
|
|
1869
1872
|
.withTransaction(this.manager_)
|
|
1870
1873
|
.getTotal(order)];
|
|
1871
|
-
case
|
|
1872
|
-
|
|
1873
|
-
return [3 /*break*/,
|
|
1874
|
-
case
|
|
1874
|
+
case 9:
|
|
1875
|
+
_c.total = _l.sent();
|
|
1876
|
+
return [3 /*break*/, 17];
|
|
1877
|
+
case 10:
|
|
1875
1878
|
{
|
|
1876
1879
|
order.refunded_total = this.totalsService_.getRefundedTotal(order);
|
|
1877
|
-
return [3 /*break*/,
|
|
1880
|
+
return [3 /*break*/, 17];
|
|
1878
1881
|
}
|
|
1879
|
-
|
|
1880
|
-
case
|
|
1882
|
+
_l.label = 11;
|
|
1883
|
+
case 11:
|
|
1881
1884
|
{
|
|
1882
1885
|
order.paid_total = this.totalsService_.getPaidTotal(order);
|
|
1883
|
-
return [3 /*break*/,
|
|
1886
|
+
return [3 /*break*/, 17];
|
|
1884
1887
|
}
|
|
1885
|
-
|
|
1886
|
-
case
|
|
1888
|
+
_l.label = 12;
|
|
1889
|
+
case 12:
|
|
1887
1890
|
{
|
|
1888
1891
|
paid_total = this.totalsService_.getPaidTotal(order);
|
|
1889
1892
|
refunded_total = this.totalsService_.getRefundedTotal(order);
|
|
1890
1893
|
order.refundable_amount = paid_total - refunded_total;
|
|
1891
|
-
return [3 /*break*/,
|
|
1894
|
+
return [3 /*break*/, 17];
|
|
1892
1895
|
}
|
|
1893
|
-
|
|
1894
|
-
case
|
|
1895
|
-
|
|
1896
|
-
|
|
1897
|
-
|
|
1898
|
-
_10.trys.push([18, 23, 24, 25]);
|
|
1899
|
-
_g = (e_16 = void 0, __values(order.items)), _h = _g.next();
|
|
1900
|
-
_10.label = 19;
|
|
1901
|
-
case 19:
|
|
1902
|
-
if (!!_h.done) return [3 /*break*/, 22];
|
|
1903
|
-
item = _h.value;
|
|
1904
|
-
_k = (_j = items).push;
|
|
1905
|
-
_l = [__assign({}, item)];
|
|
1906
|
-
_3 = {};
|
|
1907
|
-
return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
|
|
1908
|
-
case 20:
|
|
1909
|
-
_k.apply(_j, [__assign.apply(void 0, _l.concat([(_3.refundable = _10.sent(), _3)]))]);
|
|
1910
|
-
_10.label = 21;
|
|
1911
|
-
case 21:
|
|
1912
|
-
_h = _g.next();
|
|
1913
|
-
return [3 /*break*/, 19];
|
|
1914
|
-
case 22: return [3 /*break*/, 25];
|
|
1915
|
-
case 23:
|
|
1916
|
-
e_16_1 = _10.sent();
|
|
1917
|
-
e_16 = { error: e_16_1 };
|
|
1918
|
-
return [3 /*break*/, 25];
|
|
1919
|
-
case 24:
|
|
1920
|
-
try {
|
|
1921
|
-
if (_h && !_h.done && (_2 = _g.return)) _2.call(_g);
|
|
1922
|
-
}
|
|
1923
|
-
finally { if (e_16) throw e_16.error; }
|
|
1924
|
-
return [7 /*endfinally*/];
|
|
1925
|
-
case 25:
|
|
1926
|
-
order.items = items;
|
|
1927
|
-
return [3 /*break*/, 57];
|
|
1928
|
-
case 26:
|
|
1929
|
-
_10.trys.push([26, 38, 39, 40]);
|
|
1930
|
-
_m = (e_18 = void 0, __values(order.swaps)), _o = _m.next();
|
|
1931
|
-
_10.label = 27;
|
|
1932
|
-
case 27:
|
|
1933
|
-
if (!!_o.done) return [3 /*break*/, 37];
|
|
1934
|
-
s = _o.value;
|
|
1935
|
-
items = [];
|
|
1936
|
-
_10.label = 28;
|
|
1937
|
-
case 28:
|
|
1938
|
-
_10.trys.push([28, 33, 34, 35]);
|
|
1939
|
-
_p = (e_17 = void 0, __values(s.additional_items)), _q = _p.next();
|
|
1940
|
-
_10.label = 29;
|
|
1941
|
-
case 29:
|
|
1942
|
-
if (!!_q.done) return [3 /*break*/, 32];
|
|
1943
|
-
item = _q.value;
|
|
1944
|
-
_s = (_r = items).push;
|
|
1945
|
-
_t = [__assign({}, item)];
|
|
1946
|
-
_6 = {};
|
|
1947
|
-
return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
|
|
1948
|
-
case 30:
|
|
1949
|
-
_s.apply(_r, [__assign.apply(void 0, _t.concat([(_6.refundable = _10.sent(), _6)]))]);
|
|
1950
|
-
_10.label = 31;
|
|
1951
|
-
case 31:
|
|
1952
|
-
_q = _p.next();
|
|
1953
|
-
return [3 /*break*/, 29];
|
|
1954
|
-
case 32: return [3 /*break*/, 35];
|
|
1955
|
-
case 33:
|
|
1956
|
-
e_17_1 = _10.sent();
|
|
1957
|
-
e_17 = { error: e_17_1 };
|
|
1958
|
-
return [3 /*break*/, 35];
|
|
1959
|
-
case 34:
|
|
1960
|
-
try {
|
|
1961
|
-
if (_q && !_q.done && (_5 = _p.return)) _5.call(_p);
|
|
1962
|
-
}
|
|
1963
|
-
finally { if (e_17) throw e_17.error; }
|
|
1964
|
-
return [7 /*endfinally*/];
|
|
1965
|
-
case 35:
|
|
1966
|
-
s.additional_items = items;
|
|
1967
|
-
_10.label = 36;
|
|
1968
|
-
case 36:
|
|
1969
|
-
_o = _m.next();
|
|
1970
|
-
return [3 /*break*/, 27];
|
|
1971
|
-
case 37: return [3 /*break*/, 40];
|
|
1972
|
-
case 38:
|
|
1973
|
-
e_18_1 = _10.sent();
|
|
1974
|
-
e_18 = { error: e_18_1 };
|
|
1975
|
-
return [3 /*break*/, 40];
|
|
1976
|
-
case 39:
|
|
1977
|
-
try {
|
|
1978
|
-
if (_o && !_o.done && (_4 = _m.return)) _4.call(_m);
|
|
1896
|
+
_l.label = 13;
|
|
1897
|
+
case 13:
|
|
1898
|
+
{
|
|
1899
|
+
order.items = order.items.map(function (i) { return (__assign(__assign({}, i), { refundable: _this.totalsService_.getLineItemRefund(order, __assign(__assign({}, i), { quantity: i.quantity - (i.returned_quantity || 0) })) })); });
|
|
1900
|
+
return [3 /*break*/, 17];
|
|
1979
1901
|
}
|
|
1980
|
-
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
|
|
1990
|
-
|
|
1991
|
-
|
|
1992
|
-
|
|
1993
|
-
|
|
1994
|
-
|
|
1995
|
-
|
|
1996
|
-
|
|
1997
|
-
if (!!_x.done) return [3 /*break*/, 47];
|
|
1998
|
-
item = _x.value;
|
|
1999
|
-
_z = (_y = items).push;
|
|
2000
|
-
_0 = [__assign({}, item)];
|
|
2001
|
-
_9 = {};
|
|
2002
|
-
return [4 /*yield*/, this.totalsService_.getLineItemRefund(order, __assign(__assign({}, item), { quantity: item.quantity - (item.returned_quantity || 0) }))];
|
|
2003
|
-
case 45:
|
|
2004
|
-
_z.apply(_y, [__assign.apply(void 0, _0.concat([(_9.refundable = _10.sent(), _9)]))]);
|
|
2005
|
-
_10.label = 46;
|
|
2006
|
-
case 46:
|
|
2007
|
-
_x = _w.next();
|
|
2008
|
-
return [3 /*break*/, 44];
|
|
2009
|
-
case 47: return [3 /*break*/, 50];
|
|
2010
|
-
case 48:
|
|
2011
|
-
e_19_1 = _10.sent();
|
|
2012
|
-
e_19 = { error: e_19_1 };
|
|
2013
|
-
return [3 /*break*/, 50];
|
|
2014
|
-
case 49:
|
|
2015
|
-
try {
|
|
2016
|
-
if (_x && !_x.done && (_8 = _w.return)) _8.call(_w);
|
|
1902
|
+
_l.label = 14;
|
|
1903
|
+
case 14:
|
|
1904
|
+
{
|
|
1905
|
+
try {
|
|
1906
|
+
for (_d = (e_17 = void 0, __values(order.swaps)), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
1907
|
+
s = _e.value;
|
|
1908
|
+
s.additional_items = s.additional_items.map(function (i) { return (__assign(__assign({}, i), { refundable: _this.totalsService_.getLineItemRefund(order, __assign(__assign({}, i), { quantity: i.quantity - (i.returned_quantity || 0) })) })); });
|
|
1909
|
+
}
|
|
1910
|
+
}
|
|
1911
|
+
catch (e_17_1) { e_17 = { error: e_17_1 }; }
|
|
1912
|
+
finally {
|
|
1913
|
+
try {
|
|
1914
|
+
if (_e && !_e.done && (_j = _d.return)) _j.call(_d);
|
|
1915
|
+
}
|
|
1916
|
+
finally { if (e_17) throw e_17.error; }
|
|
1917
|
+
}
|
|
1918
|
+
return [3 /*break*/, 17];
|
|
2017
1919
|
}
|
|
2018
|
-
|
|
2019
|
-
|
|
2020
|
-
|
|
2021
|
-
|
|
2022
|
-
|
|
2023
|
-
|
|
2024
|
-
|
|
2025
|
-
|
|
2026
|
-
|
|
2027
|
-
|
|
2028
|
-
|
|
2029
|
-
|
|
2030
|
-
|
|
2031
|
-
|
|
2032
|
-
|
|
2033
|
-
|
|
1920
|
+
_l.label = 15;
|
|
1921
|
+
case 15:
|
|
1922
|
+
{
|
|
1923
|
+
try {
|
|
1924
|
+
for (_f = (e_18 = void 0, __values(order.claims)), _g = _f.next(); !_g.done; _g = _f.next()) {
|
|
1925
|
+
c = _g.value;
|
|
1926
|
+
c.additional_items = c.additional_items.map(function (i) { return (__assign(__assign({}, i), { refundable: _this.totalsService_.getLineItemRefund(order, __assign(__assign({}, i), { quantity: i.quantity - (i.returned_quantity || 0) })) })); });
|
|
1927
|
+
}
|
|
1928
|
+
}
|
|
1929
|
+
catch (e_18_1) { e_18 = { error: e_18_1 }; }
|
|
1930
|
+
finally {
|
|
1931
|
+
try {
|
|
1932
|
+
if (_g && !_g.done && (_k = _f.return)) _k.call(_f);
|
|
1933
|
+
}
|
|
1934
|
+
finally { if (e_18) throw e_18.error; }
|
|
1935
|
+
}
|
|
1936
|
+
return [3 /*break*/, 17];
|
|
2034
1937
|
}
|
|
2035
|
-
|
|
2036
|
-
|
|
2037
|
-
case 55: return [3 /*break*/, 57];
|
|
2038
|
-
case 56:
|
|
1938
|
+
_l.label = 16;
|
|
1939
|
+
case 16:
|
|
2039
1940
|
{
|
|
2040
|
-
return [3 /*break*/,
|
|
1941
|
+
return [3 /*break*/, 17];
|
|
2041
1942
|
}
|
|
2042
|
-
|
|
2043
|
-
case
|
|
1943
|
+
_l.label = 17;
|
|
1944
|
+
case 17:
|
|
2044
1945
|
totalsFields_1_1 = totalsFields_1.next();
|
|
2045
1946
|
return [3 /*break*/, 1];
|
|
2046
|
-
case
|
|
2047
|
-
case
|
|
2048
|
-
|
|
2049
|
-
|
|
2050
|
-
return [3 /*break*/,
|
|
2051
|
-
case
|
|
1947
|
+
case 18: return [3 /*break*/, 21];
|
|
1948
|
+
case 19:
|
|
1949
|
+
e_16_1 = _l.sent();
|
|
1950
|
+
e_16 = { error: e_16_1 };
|
|
1951
|
+
return [3 /*break*/, 21];
|
|
1952
|
+
case 20:
|
|
2052
1953
|
try {
|
|
2053
|
-
if (totalsFields_1_1 && !totalsFields_1_1.done && (
|
|
1954
|
+
if (totalsFields_1_1 && !totalsFields_1_1.done && (_h = totalsFields_1.return)) _h.call(totalsFields_1);
|
|
2054
1955
|
}
|
|
2055
|
-
finally { if (
|
|
1956
|
+
finally { if (e_16) throw e_16.error; }
|
|
2056
1957
|
return [7 /*endfinally*/];
|
|
2057
|
-
case
|
|
1958
|
+
case 21: return [2 /*return*/, order];
|
|
2058
1959
|
}
|
|
2059
1960
|
});
|
|
2060
1961
|
});
|
|
@@ -2079,7 +1980,7 @@ var OrderService = /** @class */ (function (_super) {
|
|
|
2079
1980
|
switch (_a.label) {
|
|
2080
1981
|
case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
|
|
2081
1982
|
var order, refundAmount, orderRepo, result_2, isFullReturn, _a, _b, i, refund, result;
|
|
2082
|
-
var
|
|
1983
|
+
var e_19, _c;
|
|
2083
1984
|
return __generator(this, function (_d) {
|
|
2084
1985
|
switch (_d.label) {
|
|
2085
1986
|
case 0: return [4 /*yield*/, this.retrieve(orderId, {
|
|
@@ -2119,12 +2020,12 @@ var OrderService = /** @class */ (function (_super) {
|
|
|
2119
2020
|
}
|
|
2120
2021
|
}
|
|
2121
2022
|
}
|
|
2122
|
-
catch (
|
|
2023
|
+
catch (e_19_1) { e_19 = { error: e_19_1 }; }
|
|
2123
2024
|
finally {
|
|
2124
2025
|
try {
|
|
2125
2026
|
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
2126
2027
|
}
|
|
2127
|
-
finally { if (
|
|
2028
|
+
finally { if (e_19) throw e_19.error; }
|
|
2128
2029
|
}
|
|
2129
2030
|
if (!(receivedReturn.refund_amount > 0)) return [3 /*break*/, 5];
|
|
2130
2031
|
return [4 /*yield*/, this.paymentProviderService_
|