@medusajs/medusa 1.3.9 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +12 -0
- package/dist/api/index.d.ts +1 -0
- package/dist/api/index.js +1 -0
- package/dist/api/index.js.map +1 -1
- package/dist/api/routes/admin/batch/create-batch-job.js +10 -7
- package/dist/api/routes/admin/batch/create-batch-job.js.map +1 -1
- package/dist/api/routes/admin/index.js +6 -4
- package/dist/api/routes/admin/index.js.map +1 -1
- package/dist/api/routes/admin/price-lists/create-price-list.d.ts +4 -0
- package/dist/api/routes/admin/price-lists/create-price-list.js +16 -1
- package/dist/api/routes/admin/price-lists/create-price-list.js.map +1 -1
- package/dist/api/routes/admin/price-lists/index.d.ts +2 -1
- package/dist/api/routes/admin/price-lists/index.js +8 -1
- package/dist/api/routes/admin/price-lists/index.js.map +1 -1
- package/dist/api/routes/admin/price-lists/update-price-list.d.ts +4 -0
- package/dist/api/routes/admin/price-lists/update-price-list.js +16 -1
- package/dist/api/routes/admin/price-lists/update-price-list.js.map +1 -1
- package/dist/api/routes/admin/products/update-variant.js +1 -0
- package/dist/api/routes/admin/products/update-variant.js.map +1 -1
- package/dist/api/routes/admin/regions/create-region.d.ts +4 -0
- package/dist/api/routes/admin/regions/create-region.js +16 -1
- package/dist/api/routes/admin/regions/create-region.js.map +1 -1
- package/dist/api/routes/admin/regions/index.d.ts +2 -1
- package/dist/api/routes/admin/regions/index.js +5 -1
- package/dist/api/routes/admin/regions/index.js.map +1 -1
- package/dist/api/routes/admin/regions/update-region.d.ts +4 -0
- package/dist/api/routes/admin/regions/update-region.js +16 -1
- package/dist/api/routes/admin/regions/update-region.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/create-shipping-option.d.ts +4 -0
- package/dist/api/routes/admin/shipping-options/create-shipping-option.js +15 -0
- package/dist/api/routes/admin/shipping-options/create-shipping-option.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/index.d.ts +2 -1
- package/dist/api/routes/admin/shipping-options/index.js +5 -1
- package/dist/api/routes/admin/shipping-options/index.js.map +1 -1
- package/dist/api/routes/admin/shipping-options/update-shipping-option.d.ts +4 -0
- package/dist/api/routes/admin/shipping-options/update-shipping-option.js +15 -0
- package/dist/api/routes/admin/shipping-options/update-shipping-option.js.map +1 -1
- package/dist/helpers/test-request.js +27 -4
- package/dist/helpers/test-request.js.map +1 -1
- package/dist/interfaces/price-selection-strategy.d.ts +4 -0
- package/dist/interfaces/price-selection-strategy.js.map +1 -1
- package/dist/loaders/feature-flags/index.d.ts +1 -0
- package/dist/loaders/feature-flags/index.js +18 -3
- package/dist/loaders/feature-flags/index.js.map +1 -1
- package/dist/loaders/feature-flags/order-editing.d.ts +3 -0
- package/dist/loaders/feature-flags/order-editing.js +10 -0
- package/dist/loaders/feature-flags/order-editing.js.map +1 -0
- package/dist/migrations/1663059812399-order_editing.d.ts +7 -0
- package/dist/migrations/1663059812399-order_editing.js +112 -0
- package/dist/migrations/1663059812399-order_editing.js.map +1 -0
- package/dist/models/currency.d.ts +4 -0
- package/dist/models/currency.js +12 -0
- package/dist/models/currency.js.map +1 -1
- package/dist/models/custom-shipping-option.d.ts +3 -0
- package/dist/models/custom-shipping-option.js +3 -0
- package/dist/models/custom-shipping-option.js.map +1 -1
- package/dist/models/line-item.d.ts +4 -0
- package/dist/models/line-item.js +12 -0
- 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/order-edit.d.ts +111 -0
- package/dist/models/order-edit.js +204 -0
- package/dist/models/order-edit.js.map +1 -0
- package/dist/models/order-item-change.d.ts +60 -0
- package/dist/models/order-item-change.js +143 -0
- package/dist/models/order-item-change.js.map +1 -0
- package/dist/models/order.d.ts +7 -0
- package/dist/models/order.js +16 -0
- package/dist/models/order.js.map +1 -1
- package/dist/models/price-list.d.ts +5 -0
- package/dist/models/price-list.js +13 -0
- package/dist/models/price-list.js.map +1 -1
- package/dist/models/region.d.ts +4 -0
- package/dist/models/region.js +12 -0
- package/dist/models/region.js.map +1 -1
- package/dist/models/shipping-method.d.ts +4 -0
- package/dist/models/shipping-method.js +12 -0
- package/dist/models/shipping-method.js.map +1 -1
- package/dist/models/shipping-option.d.ts +4 -0
- package/dist/models/shipping-option.js +12 -0
- 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 +8 -4
- package/dist/repositories/money-amount.js.map +1 -1
- package/dist/repositories/order-edit.d.ts +4 -0
- package/dist/repositories/order-edit.js +38 -0
- package/dist/repositories/order-edit.js.map +1 -0
- package/dist/repositories/order-item-change.d.ts +4 -0
- package/dist/repositories/order-item-change.js +38 -0
- package/dist/repositories/order-item-change.js.map +1 -0
- package/dist/services/batch-job.js +4 -2
- package/dist/services/batch-job.js.map +1 -1
- package/dist/services/cart.js +83 -74
- package/dist/services/cart.js.map +1 -1
- package/dist/services/claim.js +45 -43
- package/dist/services/claim.js.map +1 -1
- package/dist/services/discount.d.ts +4 -1
- package/dist/services/discount.js +39 -20
- 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 +1 -4
- package/dist/services/line-item-adjustment.js +2 -1
- package/dist/services/line-item-adjustment.js.map +1 -1
- package/dist/services/line-item.d.ts +12 -7
- package/dist/services/line-item.js +22 -10
- package/dist/services/line-item.js.map +1 -1
- package/dist/services/notification.js +3 -2
- package/dist/services/notification.js.map +1 -1
- package/dist/services/order.js +214 -115
- package/dist/services/order.js.map +1 -1
- package/dist/services/price-list.d.ts +7 -4
- package/dist/services/price-list.js +25 -11
- package/dist/services/price-list.js.map +1 -1
- package/dist/services/pricing.d.ts +7 -4
- package/dist/services/pricing.js +39 -12
- 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 +10 -7
- package/dist/services/region.js +22 -6
- package/dist/services/region.js.map +1 -1
- package/dist/services/return.js +23 -19
- package/dist/services/return.js.map +1 -1
- package/dist/services/shipping-option.d.ts +12 -8
- package/dist/services/shipping-option.js +23 -2
- package/dist/services/shipping-option.js.map +1 -1
- package/dist/services/store.d.ts +1 -2
- package/dist/services/store.js.map +1 -1
- package/dist/services/totals.d.ts +18 -20
- package/dist/services/totals.js +614 -358
- package/dist/services/totals.js.map +1 -1
- package/dist/strategies/__fixtures__/product-export-data.js +6 -2
- package/dist/strategies/__fixtures__/product-export-data.js.map +1 -1
- package/dist/strategies/batch-jobs/product/export.d.ts +6 -0
- package/dist/strategies/batch-jobs/product/export.js +11 -2
- package/dist/strategies/batch-jobs/product/export.js.map +1 -1
- package/dist/strategies/batch-jobs/product/import.d.ts +6 -5
- package/dist/strategies/batch-jobs/product/import.js +293 -197
- 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 +8 -0
- 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 +10 -1
- package/dist/strategies/batch-jobs/product/utils.js.map +1 -1
- package/dist/strategies/price-selection.d.ts +6 -2
- package/dist/strategies/price-selection.js +124 -10
- package/dist/strategies/price-selection.js.map +1 -1
- package/dist/strategies/tax-calculation.d.ts +7 -5
- package/dist/strategies/tax-calculation.js +47 -17
- package/dist/strategies/tax-calculation.js.map +1 -1
- package/dist/subscribers/batch-job.d.ts +4 -1
- package/dist/subscribers/batch-job.js +71 -44
- package/dist/subscribers/batch-job.js.map +1 -1
- package/dist/types/price-list.d.ts +2 -1
- package/dist/types/pricing.d.ts +5 -2
- package/dist/types/region.d.ts +2 -0
- package/dist/types/shipping-options.d.ts +2 -0
- package/dist/utils/feature-flag-decorators.js +4 -16
- 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 +2 -0
- package/dist/utils/index.js +2 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +1 -3
|
@@ -1,15 +1,16 @@
|
|
|
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";
|
|
4
8
|
import { LineItemRepository } from "../repositories/line-item";
|
|
5
9
|
import { LineItemTaxLineRepository } from "../repositories/line-item-tax-line";
|
|
6
|
-
import { PricingService, ProductService, RegionService, ProductVariantService } from "./index";
|
|
7
|
-
import { CartRepository } from "../repositories/cart";
|
|
8
|
-
import { LineItem } from "../models/line-item";
|
|
9
|
-
import LineItemAdjustmentService from "./line-item-adjustment";
|
|
10
|
-
import { Cart } from "../models/cart";
|
|
11
10
|
import { FindConfig } from "../types/common";
|
|
12
|
-
import {
|
|
11
|
+
import { FlagRouter } from "../utils/flag-router";
|
|
12
|
+
import { PricingService, ProductService, ProductVariantService, RegionService } from "./index";
|
|
13
|
+
import LineItemAdjustmentService from "./line-item-adjustment";
|
|
13
14
|
declare type InjectedDependencies = {
|
|
14
15
|
manager: EntityManager;
|
|
15
16
|
lineItemRepository: typeof LineItemRepository;
|
|
@@ -20,6 +21,7 @@ declare type InjectedDependencies = {
|
|
|
20
21
|
pricingService: PricingService;
|
|
21
22
|
regionService: RegionService;
|
|
22
23
|
lineItemAdjustmentService: LineItemAdjustmentService;
|
|
24
|
+
featureFlagRouter: FlagRouter;
|
|
23
25
|
};
|
|
24
26
|
/**
|
|
25
27
|
* Provides layer to manipulate line items.
|
|
@@ -32,9 +34,11 @@ declare class LineItemService extends BaseService {
|
|
|
32
34
|
protected readonly cartRepository_: typeof CartRepository;
|
|
33
35
|
protected readonly productVariantService_: ProductVariantService;
|
|
34
36
|
protected readonly productService_: ProductService;
|
|
37
|
+
protected readonly pricingService_: PricingService;
|
|
35
38
|
protected readonly regionService_: RegionService;
|
|
39
|
+
protected readonly featureFlagRouter_: FlagRouter;
|
|
36
40
|
protected readonly lineItemAdjustmentService_: LineItemAdjustmentService;
|
|
37
|
-
constructor({ manager, lineItemRepository, lineItemTaxLineRepository, productVariantService, productService, pricingService, regionService, cartRepository, lineItemAdjustmentService, }: InjectedDependencies);
|
|
41
|
+
constructor({ manager, lineItemRepository, lineItemTaxLineRepository, productVariantService, productService, pricingService, regionService, cartRepository, lineItemAdjustmentService, featureFlagRouter, }: InjectedDependencies);
|
|
38
42
|
withTransaction(transactionManager: EntityManager): LineItemService;
|
|
39
43
|
list(selector: any, config?: FindConfig<LineItem>): Promise<LineItem[]>;
|
|
40
44
|
/**
|
|
@@ -54,6 +58,7 @@ declare class LineItemService extends BaseService {
|
|
|
54
58
|
createReturnLines(returnId: string, cartId: string): Promise<LineItem[]>;
|
|
55
59
|
generate(variantId: string, regionId: string, quantity: number, context?: {
|
|
56
60
|
unit_price?: number;
|
|
61
|
+
includes_tax?: boolean;
|
|
57
62
|
metadata?: Record<string, unknown>;
|
|
58
63
|
customer_id?: string;
|
|
59
64
|
cart?: Cart;
|
|
@@ -88,9 +88,13 @@ 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
|
+
};
|
|
91
94
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
92
95
|
var medusa_core_utils_1 = require("medusa-core-utils");
|
|
93
96
|
var medusa_interfaces_1 = require("medusa-interfaces");
|
|
97
|
+
var tax_inclusive_pricing_1 = __importDefault(require("../loaders/feature-flags/tax-inclusive-pricing"));
|
|
94
98
|
/**
|
|
95
99
|
* Provides layer to manipulate line items.
|
|
96
100
|
* @extends BaseService
|
|
@@ -98,7 +102,7 @@ var medusa_interfaces_1 = require("medusa-interfaces");
|
|
|
98
102
|
var LineItemService = /** @class */ (function (_super) {
|
|
99
103
|
__extends(LineItemService, _super);
|
|
100
104
|
function LineItemService(_a) {
|
|
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;
|
|
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, featureFlagRouter = _a.featureFlagRouter;
|
|
102
106
|
var _this = _super.call(this) || this;
|
|
103
107
|
_this.manager_ = manager;
|
|
104
108
|
_this.lineItemRepository_ = lineItemRepository;
|
|
@@ -109,6 +113,7 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
109
113
|
_this.regionService_ = regionService;
|
|
110
114
|
_this.cartRepository_ = cartRepository;
|
|
111
115
|
_this.lineItemAdjustmentService_ = lineItemAdjustmentService;
|
|
116
|
+
_this.featureFlagRouter_ = featureFlagRouter;
|
|
112
117
|
return _this;
|
|
113
118
|
}
|
|
114
119
|
LineItemService.prototype.withTransaction = function (transactionManager) {
|
|
@@ -125,6 +130,7 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
125
130
|
regionService: this.regionService_,
|
|
126
131
|
cartRepository: this.cartRepository_,
|
|
127
132
|
lineItemAdjustmentService: this.lineItemAdjustmentService_,
|
|
133
|
+
featureFlagRouter: this.featureFlagRouter_,
|
|
128
134
|
});
|
|
129
135
|
cloned.transactionManager_ = transactionManager;
|
|
130
136
|
return cloned;
|
|
@@ -248,9 +254,10 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
248
254
|
return __generator(this, function (_a) {
|
|
249
255
|
switch (_a.label) {
|
|
250
256
|
case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
|
|
251
|
-
var _a, variant, region, unit_price, shouldMerge, variantPricing, rawLineItem, lineItemRepo, lineItem, adjustments;
|
|
252
|
-
|
|
253
|
-
|
|
257
|
+
var _a, variant, region, unit_price, unitPriceIncludesTax, shouldMerge, variantPricing, rawLineItem, lineItemRepo, lineItem, adjustments;
|
|
258
|
+
var _b;
|
|
259
|
+
return __generator(this, function (_c) {
|
|
260
|
+
switch (_c.label) {
|
|
254
261
|
case 0: return [4 /*yield*/, Promise.all([
|
|
255
262
|
this.productVariantService_
|
|
256
263
|
.withTransaction(transactionManager)
|
|
@@ -262,8 +269,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
262
269
|
.retrieve(regionId),
|
|
263
270
|
])];
|
|
264
271
|
case 1:
|
|
265
|
-
_a = __read.apply(void 0, [
|
|
272
|
+
_a = __read.apply(void 0, [_c.sent(), 2]), variant = _a[0], region = _a[1];
|
|
266
273
|
unit_price = Number(context.unit_price) < 0 ? 0 : context.unit_price;
|
|
274
|
+
unitPriceIncludesTax = false;
|
|
267
275
|
shouldMerge = false;
|
|
268
276
|
if (!(context.unit_price === undefined || context.unit_price === null)) return [3 /*break*/, 3];
|
|
269
277
|
shouldMerge = true;
|
|
@@ -276,9 +284,10 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
276
284
|
include_discount_prices: true,
|
|
277
285
|
})];
|
|
278
286
|
case 2:
|
|
279
|
-
variantPricing =
|
|
280
|
-
|
|
281
|
-
_b
|
|
287
|
+
variantPricing = _c.sent();
|
|
288
|
+
unitPriceIncludesTax = !!variantPricing.calculated_price_includes_tax;
|
|
289
|
+
unit_price = (_b = variantPricing.calculated_price) !== null && _b !== void 0 ? _b : undefined;
|
|
290
|
+
_c.label = 3;
|
|
282
291
|
case 3:
|
|
283
292
|
rawLineItem = {
|
|
284
293
|
unit_price: unit_price,
|
|
@@ -292,6 +301,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
292
301
|
metadata: (context === null || context === void 0 ? void 0 : context.metadata) || {},
|
|
293
302
|
should_merge: shouldMerge,
|
|
294
303
|
};
|
|
304
|
+
if (this.featureFlagRouter_.isFeatureEnabled(tax_inclusive_pricing_1.default.key)) {
|
|
305
|
+
rawLineItem.includes_tax = unitPriceIncludesTax;
|
|
306
|
+
}
|
|
295
307
|
lineItemRepo = transactionManager.getCustomRepository(this.lineItemRepository_);
|
|
296
308
|
lineItem = lineItemRepo.create(rawLineItem);
|
|
297
309
|
if (!context.cart) return [3 /*break*/, 5];
|
|
@@ -299,9 +311,9 @@ var LineItemService = /** @class */ (function (_super) {
|
|
|
299
311
|
.withTransaction(transactionManager)
|
|
300
312
|
.generateAdjustments(context.cart, lineItem, { variant: variant })];
|
|
301
313
|
case 4:
|
|
302
|
-
adjustments =
|
|
314
|
+
adjustments = _c.sent();
|
|
303
315
|
lineItem.adjustments = adjustments;
|
|
304
|
-
|
|
316
|
+
_c.label = 5;
|
|
305
317
|
case 5: return [2 /*return*/, lineItem];
|
|
306
318
|
}
|
|
307
319
|
});
|
|
@@ -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, created;
|
|
339
|
+
var notification, provider, _a, to, data, notiRepo, resendNoti, created;
|
|
340
340
|
return __generator(this, function (_b) {
|
|
341
341
|
switch (_b.label) {
|
|
342
342
|
case 0: return [4 /*yield*/, this.retrieve(id)];
|
|
@@ -347,7 +347,8 @@ 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
|
-
|
|
350
|
+
resendNoti = __assign(__assign({}, notification), { id: null });
|
|
351
|
+
created = notiRepo.create(__assign(__assign({}, resendNoti), { to: to, data: data, parent_id: id }));
|
|
351
352
|
return [2 /*return*/, notiRepo.save(created)];
|
|
352
353
|
}
|
|
353
354
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notification.js","sourceRoot":"","sources":["../../src/services/notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA+C;AAC/C,4CAGsB;AAMtB,kCAAqC;AAWrC;IAAkC,uCAAsB;IAatD,6BAAY,SAA+B;QAA3C,YACE,kBAAM,SAAS,CAAC,SAkBjB;QA5BS,kBAAY,GAAG,EAAE,CAAA;QACjB,0BAAoB,GAAY,IAAI,CAAA;QAY1C,IAAA,OAAO,GAIL,SAAS,QAJJ,EACP,8BAA8B,GAG5B,SAAS,+BAHmB,EAC9B,sBAAsB,GAEpB,SAAS,uBAFW,EACtB,MAAM,GACJ,SAAS,OADL,CACK;QAEb,KAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAE3B,sCAAsC;QACtC,KAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,KAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QAErB,+CAA+C;QAC/C,KAAI,CAAC,uBAAuB,GAAG,sBAAsB,CAAA;QACrD,KAAI,CAAC,+BAA+B,GAAG,8BAA8B,CAAA;;IACvE,CAAC;IAED;;;;OAIG;IACH,yDAA2B,GAA3B,UAA4B,OAAgB;QAC1C,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAA;IACrC,CAAC;IAED;;;OAGG;IACG,wDAA0B,GAAhC,UAAiC,WAAqB;;;;;;;wBAC9C,KAA8C,IAAI,CAAC,UAAU,EAA3D,OAAO,aAAA,EAAE,8BAA8B,oCAAA,CAAoB;wBAC7D,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC,8BAA8B,CAAC,CAAA;wBACzE,qBAAM,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAA;;wBAA/C,SAA+C,CAAA;;;;wBAC9B,gBAAA,SAAA,WAAW,CAAA;;;;wBAAjB,EAAE;wBACL,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,IAAA,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;wBAClD,qBAAM,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAA;;wBAAnB,SAAmB,CAAA;;;;;;;;;;;;;;;;;;;;KAEtB;IAED;;;;;OAKG;IACG,kCAAI,GAAV,UACE,QAAgC,EAChC,MAIC;QAJD,uBAAA,EAAA;YACE,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,EAAE;YACR,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;SAC9B;;;;;;wBAEK,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAChD,IAAI,CAAC,uBAAuB,CAC7B,CAAA;wBACK,KAAK,GAAG,IAAA,kBAAU,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;wBACnC,qBAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAA;4BAAjC,sBAAO,SAA0B,EAAA;;;;KAClC;IAED;;;;;OAKG;IACG,sCAAQ,GAAd,UACE,EAAU,EACV,MAAqC;QAArC,uBAAA,EAAA,WAAqC;;;;;;wBAE/B,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACtD,IAAI,CAAC,uBAAuB,CAC7B,CAAA;wBAEK,KAAK,GAAG,IAAA,kBAAU,EAAC,EAAE,EAAE,IAAA,EAAE,EAAE,MAAM,CAAC,CAAA;wBAEnB,qBAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAA;;wBAAlD,YAAY,GAAG,SAAmC;wBAExD,IAAI,CAAC,YAAY,EAAE;4BACjB,MAAM,IAAI,+BAAW,CACnB,+BAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,gCAAyB,EAAE,oBAAiB,CAC7C,CAAA;yBACF;wBAED,sBAAO,YAAY,EAAA;;;;KACpB;IAED;;;;OAIG;IACH,uCAAS,GAAT,UAAU,SAAiB,EAAE,UAAkB;QAC7C,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,MAAM,IAAI,+BAAW,CACnB,+BAAW,CAAC,KAAK,CAAC,WAAW,EAC7B,6BAA6B,CAC9B,CAAA;SACF;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;SAC9C;aAAM;YACL,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SAC5C;IACH,CAAC;IAED;;;;;OAKG;IACO,+CAAiB,GAA3B,UAA4B,EAAU;QACpC,IAAI;YACF,OAAO,IAAI,CAAC,UAAU,CAAC,eAAQ,EAAE,CAAE,CAAC,CAAA;SACrC;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,+BAAW,CACnB,+BAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,0DAAmD,EAAE,MAAG,CACzD,CAAA;SACF;IACH,CAAC;IAED;;;;;;;OAOG;IACH,yCAAW,GAAX,UACE,SAAiB,EACjB,IAA6B;QAF/B,iBAsBC;QAlBC,IAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;QACzC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;SACzB;QACD,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE;YACpC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;SACzB;QAED,OAAO,OAAO,CAAC,GAAG,CAChB,IAAI,CAAC,GAAG,CAAC,UAAO,UAAU;;;gBACxB,sBAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,UAAC,GAAG;wBACtD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;wBAChB,KAAI,CAAC,OAAO,CAAC,IAAI,CACf,iCAA0B,UAAU,gDAAsC,SAAS,eAAK,GAAG,CAAC,OAAO,CAAE,CACtG,CAAA;oBACH,CAAC,CAAC,EAAA;;aACH,CAAC,CACH,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACG,kCAAI,GAAV,UACE,KAAa,EACb,SAAkC,EAClC,UAAkB;;;;;4BAEX,qBAAM,IAAI,CAAC,YAAY,CAAC,UAAO,kBAAkB;;;;;wCAChD,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;wCACpC,qBAAM,QAAQ,CAAC,gBAAgB,CAC5C,KAAK,EACL,SAAS,EACT,IAAI,CAAC,oBAAoB,CAC1B,EAAA;;wCAJK,MAAM,GAAG,SAId;wCAED,IAAI,CAAC,MAAM,EAAE;4CACX,sBAAM;yCACP;wCAEO,EAAE,GAAW,MAAM,GAAjB,EAAE,IAAI,GAAK,MAAM,KAAX,CAAW;wCACrB,QAAQ,GAAG,kBAAkB,CAAC,mBAAmB,CACrD,IAAI,CAAC,uBAAuB,CAC7B,CAAA;wCAEK,KAAA,OAAkB,KAAK,CAAC,KAAK,CAAC,GAAG,CAAa,IAAA,EAA7C,aAAa,QAAA,CAAgC;wCAC9C,WAAW,GAAG,SAAS,CAAC,EAAY,CAAA;wCACpC,WAAW,GAAI,SAAS,CAAC,WAAsB,IAAI,IAAI,CAAA;wCAEvD,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;4CAC9B,aAAa,eAAA;4CACb,WAAW,aAAA;4CACX,WAAW,aAAA;4CACX,EAAE,IAAA;4CACF,IAAI,MAAA;4CACJ,UAAU,EAAE,KAAK;4CACjB,WAAW,EAAE,UAAU;yCACxB,CAAC,CAAA;wCAEK,qBAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAA;4CAAnC,sBAAO,SAA4B,EAAA;;;6BACpC,CAAC,EAAA;4BAhCF,sBAAO,SAgCL,EAAA;;;;KACH;IAED;;;;;;;OAOG;IACG,oCAAM,GAAZ,UACE,EAAU,EACV,MAAqC;QAArC,uBAAA,EAAA,WAAqC;;;;;4BAE9B,qBAAM,IAAI,CAAC,YAAY,CAAC,UAAO,kBAAkB;;;;4CACjC,qBAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAA;;wCAAtC,YAAY,GAAG,SAAuB;wCAEtC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;wCAC5C,qBAAM,QAAQ,CAAC,kBAAkB,CACpD,YAAY,EACZ,MAAM,EACN,IAAI,CAAC,oBAAoB,CAC1B,EAAA;;wCAJK,KAAe,SAIpB,EAJO,EAAE,QAAA,EAAE,IAAI,UAAA;wCAMV,QAAQ,GAAG,kBAAkB,CAAC,mBAAmB,CACrD,IAAI,CAAC,uBAAuB,CAC7B,CAAA;wCACK,OAAO,GAAG,QAAQ,CAAC,MAAM,uBAC1B,
|
|
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,156 +1806,255 @@ 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 e_16,
|
|
1811
|
-
|
|
1812
|
-
|
|
1813
|
-
switch (_l.label) {
|
|
1809
|
+
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;
|
|
1810
|
+
var e_21, _1, e_16, _2, _3, e_18, _4, e_17, _5, _6, e_20, _7, e_19, _8, _9;
|
|
1811
|
+
return __generator(this, function (_10) {
|
|
1812
|
+
switch (_10.label) {
|
|
1814
1813
|
case 0:
|
|
1815
|
-
|
|
1814
|
+
_10.trys.push([0, 59, 60, 61]);
|
|
1816
1815
|
totalsFields_1 = __values(totalsFields), totalsFields_1_1 = totalsFields_1.next();
|
|
1817
|
-
|
|
1816
|
+
_10.label = 1;
|
|
1818
1817
|
case 1:
|
|
1819
|
-
if (!!totalsFields_1_1.done) return [3 /*break*/,
|
|
1818
|
+
if (!!totalsFields_1_1.done) return [3 /*break*/, 58];
|
|
1820
1819
|
totalField = totalsFields_1_1.value;
|
|
1821
1820
|
_a = totalField;
|
|
1822
1821
|
switch (_a) {
|
|
1823
1822
|
case "shipping_total": return [3 /*break*/, 2];
|
|
1824
|
-
case "gift_card_total": return [3 /*break*/,
|
|
1825
|
-
case "discount_total": return [3 /*break*/,
|
|
1826
|
-
case "tax_total": return [3 /*break*/,
|
|
1827
|
-
case "subtotal": return [3 /*break*/,
|
|
1828
|
-
case "total": return [3 /*break*/,
|
|
1829
|
-
case "refunded_total": return [3 /*break*/,
|
|
1830
|
-
case "paid_total": return [3 /*break*/,
|
|
1831
|
-
case "refundable_amount": return [3 /*break*/,
|
|
1832
|
-
case "items.refundable": return [3 /*break*/,
|
|
1833
|
-
case "swaps.additional_items.refundable": return [3 /*break*/,
|
|
1834
|
-
case "claims.additional_items.refundable": return [3 /*break*/,
|
|
1823
|
+
case "gift_card_total": return [3 /*break*/, 4];
|
|
1824
|
+
case "discount_total": return [3 /*break*/, 6];
|
|
1825
|
+
case "tax_total": return [3 /*break*/, 8];
|
|
1826
|
+
case "subtotal": return [3 /*break*/, 10];
|
|
1827
|
+
case "total": return [3 /*break*/, 12];
|
|
1828
|
+
case "refunded_total": return [3 /*break*/, 14];
|
|
1829
|
+
case "paid_total": return [3 /*break*/, 15];
|
|
1830
|
+
case "refundable_amount": return [3 /*break*/, 16];
|
|
1831
|
+
case "items.refundable": return [3 /*break*/, 17];
|
|
1832
|
+
case "swaps.additional_items.refundable": return [3 /*break*/, 26];
|
|
1833
|
+
case "claims.additional_items.refundable": return [3 /*break*/, 41];
|
|
1835
1834
|
}
|
|
1836
|
-
return [3 /*break*/,
|
|
1835
|
+
return [3 /*break*/, 56];
|
|
1837
1836
|
case 2:
|
|
1838
|
-
|
|
1839
|
-
|
|
1840
|
-
return [3 /*break*/, 17];
|
|
1841
|
-
}
|
|
1842
|
-
_l.label = 3;
|
|
1837
|
+
_b = order;
|
|
1838
|
+
return [4 /*yield*/, this.totalsService_.getShippingTotal(order)];
|
|
1843
1839
|
case 3:
|
|
1844
|
-
|
|
1845
|
-
|
|
1846
|
-
|
|
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;
|
|
1840
|
+
_b.shipping_total = _10.sent();
|
|
1841
|
+
return [3 /*break*/, 57];
|
|
1842
|
+
case 4: return [4 /*yield*/, this.totalsService_.getGiftCardTotal(order)];
|
|
1857
1843
|
case 5:
|
|
1858
|
-
|
|
1859
|
-
|
|
1844
|
+
giftCardBreakdown = _10.sent();
|
|
1845
|
+
order.gift_card_total = giftCardBreakdown.total;
|
|
1846
|
+
order.gift_card_tax_total = giftCardBreakdown.tax_total;
|
|
1847
|
+
return [3 /*break*/, 57];
|
|
1860
1848
|
case 6:
|
|
1861
|
-
|
|
1862
|
-
return [
|
|
1849
|
+
_c = order;
|
|
1850
|
+
return [4 /*yield*/, this.totalsService_.getDiscountTotal(order)];
|
|
1863
1851
|
case 7:
|
|
1864
|
-
|
|
1865
|
-
|
|
1866
|
-
return [3 /*break*/, 17];
|
|
1867
|
-
}
|
|
1868
|
-
_l.label = 8;
|
|
1852
|
+
_c.discount_total = _10.sent();
|
|
1853
|
+
return [3 /*break*/, 57];
|
|
1869
1854
|
case 8:
|
|
1870
|
-
|
|
1855
|
+
_d = order;
|
|
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;
|
|
1871
1868
|
return [4 /*yield*/, this.totalsService_
|
|
1872
1869
|
.withTransaction(this.manager_)
|
|
1873
1870
|
.getTotal(order)];
|
|
1874
|
-
case
|
|
1875
|
-
|
|
1876
|
-
return [3 /*break*/,
|
|
1877
|
-
case
|
|
1871
|
+
case 13:
|
|
1872
|
+
_f.total = _10.sent();
|
|
1873
|
+
return [3 /*break*/, 57];
|
|
1874
|
+
case 14:
|
|
1878
1875
|
{
|
|
1879
1876
|
order.refunded_total = this.totalsService_.getRefundedTotal(order);
|
|
1880
|
-
return [3 /*break*/,
|
|
1877
|
+
return [3 /*break*/, 57];
|
|
1881
1878
|
}
|
|
1882
|
-
|
|
1883
|
-
case
|
|
1879
|
+
_10.label = 15;
|
|
1880
|
+
case 15:
|
|
1884
1881
|
{
|
|
1885
1882
|
order.paid_total = this.totalsService_.getPaidTotal(order);
|
|
1886
|
-
return [3 /*break*/,
|
|
1883
|
+
return [3 /*break*/, 57];
|
|
1887
1884
|
}
|
|
1888
|
-
|
|
1889
|
-
case
|
|
1885
|
+
_10.label = 16;
|
|
1886
|
+
case 16:
|
|
1890
1887
|
{
|
|
1891
1888
|
paid_total = this.totalsService_.getPaidTotal(order);
|
|
1892
1889
|
refunded_total = this.totalsService_.getRefundedTotal(order);
|
|
1893
1890
|
order.refundable_amount = paid_total - refunded_total;
|
|
1894
|
-
return [3 /*break*/,
|
|
1891
|
+
return [3 /*break*/, 57];
|
|
1895
1892
|
}
|
|
1896
|
-
|
|
1897
|
-
case
|
|
1898
|
-
|
|
1899
|
-
|
|
1900
|
-
|
|
1893
|
+
_10.label = 17;
|
|
1894
|
+
case 17:
|
|
1895
|
+
items = [];
|
|
1896
|
+
_10.label = 18;
|
|
1897
|
+
case 18:
|
|
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);
|
|
1901
1922
|
}
|
|
1902
|
-
|
|
1903
|
-
|
|
1904
|
-
|
|
1905
|
-
|
|
1906
|
-
|
|
1907
|
-
|
|
1908
|
-
|
|
1909
|
-
|
|
1910
|
-
|
|
1911
|
-
|
|
1912
|
-
|
|
1913
|
-
|
|
1914
|
-
|
|
1915
|
-
|
|
1916
|
-
|
|
1917
|
-
|
|
1918
|
-
|
|
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);
|
|
1919
1962
|
}
|
|
1920
|
-
|
|
1921
|
-
|
|
1922
|
-
|
|
1923
|
-
|
|
1924
|
-
|
|
1925
|
-
|
|
1926
|
-
|
|
1927
|
-
|
|
1928
|
-
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
|
|
1933
|
-
|
|
1934
|
-
|
|
1935
|
-
|
|
1936
|
-
return [3 /*break*/, 17];
|
|
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);
|
|
1937
1979
|
}
|
|
1938
|
-
|
|
1939
|
-
|
|
1980
|
+
finally { if (e_18) throw e_18.error; }
|
|
1981
|
+
return [7 /*endfinally*/];
|
|
1982
|
+
case 40: return [3 /*break*/, 57];
|
|
1983
|
+
case 41:
|
|
1984
|
+
_10.trys.push([41, 53, 54, 55]);
|
|
1985
|
+
_u = (e_20 = void 0, __values(order.claims)), _v = _u.next();
|
|
1986
|
+
_10.label = 42;
|
|
1987
|
+
case 42:
|
|
1988
|
+
if (!!_v.done) return [3 /*break*/, 52];
|
|
1989
|
+
c = _v.value;
|
|
1990
|
+
items = [];
|
|
1991
|
+
_10.label = 43;
|
|
1992
|
+
case 43:
|
|
1993
|
+
_10.trys.push([43, 48, 49, 50]);
|
|
1994
|
+
_w = (e_19 = void 0, __values(c.additional_items)), _x = _w.next();
|
|
1995
|
+
_10.label = 44;
|
|
1996
|
+
case 44:
|
|
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);
|
|
2017
|
+
}
|
|
2018
|
+
finally { if (e_19) throw e_19.error; }
|
|
2019
|
+
return [7 /*endfinally*/];
|
|
2020
|
+
case 50:
|
|
2021
|
+
c.additional_items = items;
|
|
2022
|
+
_10.label = 51;
|
|
2023
|
+
case 51:
|
|
2024
|
+
_v = _u.next();
|
|
2025
|
+
return [3 /*break*/, 42];
|
|
2026
|
+
case 52: return [3 /*break*/, 55];
|
|
2027
|
+
case 53:
|
|
2028
|
+
e_20_1 = _10.sent();
|
|
2029
|
+
e_20 = { error: e_20_1 };
|
|
2030
|
+
return [3 /*break*/, 55];
|
|
2031
|
+
case 54:
|
|
2032
|
+
try {
|
|
2033
|
+
if (_v && !_v.done && (_7 = _u.return)) _7.call(_u);
|
|
2034
|
+
}
|
|
2035
|
+
finally { if (e_20) throw e_20.error; }
|
|
2036
|
+
return [7 /*endfinally*/];
|
|
2037
|
+
case 55: return [3 /*break*/, 57];
|
|
2038
|
+
case 56:
|
|
1940
2039
|
{
|
|
1941
|
-
return [3 /*break*/,
|
|
2040
|
+
return [3 /*break*/, 57];
|
|
1942
2041
|
}
|
|
1943
|
-
|
|
1944
|
-
case
|
|
2042
|
+
_10.label = 57;
|
|
2043
|
+
case 57:
|
|
1945
2044
|
totalsFields_1_1 = totalsFields_1.next();
|
|
1946
2045
|
return [3 /*break*/, 1];
|
|
1947
|
-
case
|
|
1948
|
-
case
|
|
1949
|
-
|
|
1950
|
-
|
|
1951
|
-
return [3 /*break*/,
|
|
1952
|
-
case
|
|
2046
|
+
case 58: return [3 /*break*/, 61];
|
|
2047
|
+
case 59:
|
|
2048
|
+
e_21_1 = _10.sent();
|
|
2049
|
+
e_21 = { error: e_21_1 };
|
|
2050
|
+
return [3 /*break*/, 61];
|
|
2051
|
+
case 60:
|
|
1953
2052
|
try {
|
|
1954
|
-
if (totalsFields_1_1 && !totalsFields_1_1.done && (
|
|
2053
|
+
if (totalsFields_1_1 && !totalsFields_1_1.done && (_1 = totalsFields_1.return)) _1.call(totalsFields_1);
|
|
1955
2054
|
}
|
|
1956
|
-
finally { if (
|
|
2055
|
+
finally { if (e_21) throw e_21.error; }
|
|
1957
2056
|
return [7 /*endfinally*/];
|
|
1958
|
-
case
|
|
2057
|
+
case 61: return [2 /*return*/, order];
|
|
1959
2058
|
}
|
|
1960
2059
|
});
|
|
1961
2060
|
});
|
|
@@ -1980,7 +2079,7 @@ var OrderService = /** @class */ (function (_super) {
|
|
|
1980
2079
|
switch (_a.label) {
|
|
1981
2080
|
case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
|
|
1982
2081
|
var order, refundAmount, orderRepo, result_2, isFullReturn, _a, _b, i, refund, result;
|
|
1983
|
-
var
|
|
2082
|
+
var e_22, _c;
|
|
1984
2083
|
return __generator(this, function (_d) {
|
|
1985
2084
|
switch (_d.label) {
|
|
1986
2085
|
case 0: return [4 /*yield*/, this.retrieve(orderId, {
|
|
@@ -2020,12 +2119,12 @@ var OrderService = /** @class */ (function (_super) {
|
|
|
2020
2119
|
}
|
|
2021
2120
|
}
|
|
2022
2121
|
}
|
|
2023
|
-
catch (
|
|
2122
|
+
catch (e_22_1) { e_22 = { error: e_22_1 }; }
|
|
2024
2123
|
finally {
|
|
2025
2124
|
try {
|
|
2026
2125
|
if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
|
|
2027
2126
|
}
|
|
2028
|
-
finally { if (
|
|
2127
|
+
finally { if (e_22) throw e_22.error; }
|
|
2029
2128
|
}
|
|
2030
2129
|
if (!(receivedReturn.refund_amount > 0)) return [3 /*break*/, 5];
|
|
2031
2130
|
return [4 /*yield*/, this.paymentProviderService_
|