@medusajs/medusa 1.7.2 → 1.7.3-alpha.0

package/dist/services/order.js

@@ -123,7 +123,7 @@ exports.ORDER_CART_ALREADY_EXISTS_ERROR = "Order from cart already exists";
 var OrderService = /** @class */ (function (_super) {
     __extends(OrderService, _super);
     function OrderService(_a) {
-        var manager = _a.manager, orderRepository = _a.orderRepository, customerService = _a.customerService, paymentProviderService = _a.paymentProviderService, shippingOptionService = _a.shippingOptionService, shippingProfileService = _a.shippingProfileService, discountService = _a.discountService, fulfillmentProviderService = _a.fulfillmentProviderService, fulfillmentService = _a.fulfillmentService, lineItemService = _a.lineItemService, totalsService = _a.totalsService, newTotalsService = _a.newTotalsService, taxProviderService = _a.taxProviderService, regionService = _a.regionService, cartService = _a.cartService, addressRepository = _a.addressRepository, giftCardService = _a.giftCardService, draftOrderService = _a.draftOrderService, inventoryService = _a.inventoryService, eventBusService = _a.eventBusService, featureFlagRouter = _a.featureFlagRouter;
+        var manager = _a.manager, orderRepository = _a.orderRepository, customerService = _a.customerService, paymentProviderService = _a.paymentProviderService, shippingOptionService = _a.shippingOptionService, shippingProfileService = _a.shippingProfileService, discountService = _a.discountService, fulfillmentProviderService = _a.fulfillmentProviderService, fulfillmentService = _a.fulfillmentService, lineItemService = _a.lineItemService, totalsService = _a.totalsService, newTotalsService = _a.newTotalsService, taxProviderService = _a.taxProviderService, regionService = _a.regionService, cartService = _a.cartService, addressRepository = _a.addressRepository, giftCardService = _a.giftCardService, draftOrderService = _a.draftOrderService, eventBusService = _a.eventBusService, featureFlagRouter = _a.featureFlagRouter, productVariantInventoryService = _a.productVariantInventoryService;
         var _this = 
         // eslint-disable-next-line prefer-rest-params
         _super.call(this, arguments[0]) || this;
@@ -146,8 +146,8 @@ var OrderService = /** @class */ (function (_super) {
         _this.cartService_ = cartService;
         _this.addressRepository_ = addressRepository;
         _this.draftOrderService_ = draftOrderService;
-        _this.inventoryService_ = inventoryService;
         _this.featureFlagRouter_ = featureFlagRouter;
+        _this.productVariantInventoryService_ = productVariantInventoryService;
         return _this;
     }
     /**
@@ -204,6 +204,7 @@ var OrderService = /** @class */ (function (_super) {
                                 alias: "order",
                                 innerJoin: {
                                     shipping_address: "order.shipping_address",
+                                    customer: "order.customer",
                                 },
                             };
                             query.where = function (qb) {
@@ -213,7 +214,10 @@ var OrderService = /** @class */ (function (_super) {
                                         qfn: "%".concat(q, "%"),
                                     })
                                         .orWhere("order.email ILIKE :q", { q: "%".concat(q, "%") })
-                                        .orWhere("display_id::varchar(255) ILIKE :dId", { dId: "".concat(q) });
+                                        .orWhere("display_id::varchar(255) ILIKE :dId", { dId: "".concat(q) })
+                                        .orWhere("customer.first_name ILIKE :q", { q: "%".concat(q, "%") })
+                                        .orWhere("customer.last_name ILIKE :q", { q: "%".concat(q, "%") })
+                                        .orWhere("customer.phone ILIKE :q", { q: "%".concat(q, "%") });
                                 }));
                             };
                         }
@@ -512,7 +516,7 @@ var OrderService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                            var cartServiceTx, inventoryServiceTx, exists, cart, _a, payment, region, total, paymentStatus, orderRepo, shippingMethods, toCreate, draft, rawOrder, order, giftCardableAmount, giftCardableAmountBalance, giftCardService, _b, _c, giftCard, newGiftCardBalance, giftCardBalanceUsed, e_1_1, shippingOptionServiceTx, lineItemServiceTx;
+                            var cartServiceTx, exists, cart, _a, payment, region, total, paymentStatus, orderRepo, shippingMethods, toCreate, draft, rawOrder, order, giftCardableAmount, giftCardableAmountBalance, giftCardService, _b, _c, giftCard, newGiftCardBalance, giftCardBalanceUsed, e_1_1, shippingOptionServiceTx, lineItemServiceTx;
                             var e_1, _d;
                             var _this = this;
                             var _e;
@@ -520,7 +524,6 @@ var OrderService = /** @class */ (function (_super) {
                                 switch (_f.label) {
                                     case 0:
                                         cartServiceTx = this.cartService_.withTransaction(manager);
-                                        inventoryServiceTx = this.inventoryService_.withTransaction(manager);
                                         return [4 /*yield*/, this.retrieveByCartId((0, utils_1.isString)(cartOrId) ? cartOrId : cartOrId === null || cartOrId === void 0 ? void 0 : cartOrId.id, {
                                                 select: ["id"],
                                             }).catch(function () { return void 0; })];
@@ -545,50 +548,20 @@ var OrderService = /** @class */ (function (_super) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Cannot create order from empty cart");
                                         }
                                         payment = cart.payment, region = cart.region, total = cart.total;
-                                        return [4 /*yield*/, Promise.all(cart.items.map(function (lineItem) { return __awaiter(_this, void 0, void 0, function () {
-                                                return __generator(this, function (_a) {
-                                                    switch (_a.label) {
-                                                        case 0: return [4 /*yield*/, inventoryServiceTx.confirmInventory(lineItem.variant_id, lineItem.quantity)];
-                                                        case 1: return [2 /*return*/, _a.sent()];
-                                                    }
-                                                });
-                                            }); })).catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
-                                                return __generator(this, function (_a) {
-                                                    switch (_a.label) {
-                                                        case 0:
-                                                            if (!payment) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, this.paymentProviderService_
-                                                                    .withTransaction(manager)
-                                                                    .cancelPayment(payment)];
-                                                        case 1:
-                                                            _a.sent();
-                                                            _a.label = 2;
-                                                        case 2: return [4 /*yield*/, cartServiceTx.update(cart.id, { payment_authorized_at: null })];
-                                                        case 3:
-                                                            _a.sent();
-                                                            throw err;
-                                                    }
-                                                });
-                                            }); })
-                                            // Would be the case if a discount code is applied that covers the item
-                                            // total
-                                        ];
-                                    case 5:
-                                        _f.sent();
-                                        if (!(total !== 0)) return [3 /*break*/, 7];
+                                        if (!(total !== 0)) return [3 /*break*/, 6];
                                         if (!payment) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Cart does not contain a payment method");
                                         }
                                         return [4 /*yield*/, this.paymentProviderService_
                                                 .withTransaction(manager)
                                                 .getStatus(payment)];
-                                    case 6:
+                                    case 5:
                                         paymentStatus = _f.sent();
                                         if (paymentStatus !== "authorized") {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Payment method is not authorized");
                                         }
-                                        _f.label = 7;
-                                    case 7:
+                                        _f.label = 6;
+                                    case 6:
                                         orderRepo = manager.getCustomRepository(this.orderRepository_);
                                         shippingMethods = cart.shipping_methods.map(function (method) {
                                             ;
@@ -613,30 +586,30 @@ var OrderService = /** @class */ (function (_super) {
                                             this.featureFlagRouter_.isFeatureEnabled(sales_channels_1.default.key)) {
                                             toCreate.sales_channel_id = cart.sales_channel_id;
                                         }
-                                        if (!(cart.type === "draft_order")) return [3 /*break*/, 9];
+                                        if (!(cart.type === "draft_order")) return [3 /*break*/, 8];
                                         return [4 /*yield*/, this.draftOrderService_
                                                 .withTransaction(manager)
                                                 .retrieveByCartId(cart.id)];
-                                    case 8:
+                                    case 7:
                                         draft = _f.sent();
                                         toCreate.draft_order_id = draft.id;
                                         toCreate.no_notification = draft.no_notification_order;
-                                        _f.label = 9;
-                                    case 9:
+                                        _f.label = 8;
+                                    case 8:
                                         rawOrder = orderRepo.create(toCreate);
                                         return [4 /*yield*/, orderRepo.save(rawOrder)];
-                                    case 10:
+                                    case 9:
                                         order = _f.sent();
-                                        if (!(total !== 0 && payment)) return [3 /*break*/, 12];
+                                        if (!(total !== 0 && payment)) return [3 /*break*/, 11];
                                         return [4 /*yield*/, this.paymentProviderService_
                                                 .withTransaction(manager)
                                                 .updatePayment(payment.id, {
                                                 order_id: order.id,
                                             })];
-                                    case 11:
+                                    case 10:
                                         _f.sent();
-                                        _f.label = 12;
-                                    case 12:
+                                        _f.label = 11;
+                                    case 11:
                                         if (!(0, medusa_core_utils_1.isDefined)(cart.subtotal) || !(0, medusa_core_utils_1.isDefined)(cart.discount_total)) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "Unable to compute gift cardable amount during order creation from cart. The cart is missing the subtotal and/or discount_total");
                                         }
@@ -646,13 +619,13 @@ var OrderService = /** @class */ (function (_super) {
                                         ;
                                         giftCardableAmountBalance = giftCardableAmount;
                                         giftCardService = this.giftCardService_.withTransaction(manager);
+                                        _f.label = 12;
+                                    case 12:
+                                        _f.trys.push([12, 18, 19, 20]);
+                                        _b = __values(cart.gift_cards), _c = _b.next();
                                         _f.label = 13;
                                     case 13:
-                                        _f.trys.push([13, 19, 20, 21]);
-                                        _b = __values(cart.gift_cards), _c = _b.next();
-                                        _f.label = 14;
-                                    case 14:
-                                        if (!!_c.done) return [3 /*break*/, 18];
+                                        if (!!_c.done) return [3 /*break*/, 17];
                                         giftCard = _c.value;
                                         newGiftCardBalance = Math.max(0, giftCard.balance - giftCardableAmountBalance);
                                         giftCardBalanceUsed = giftCard.balance - newGiftCardBalance;
@@ -660,7 +633,7 @@ var OrderService = /** @class */ (function (_super) {
                                                 balance: newGiftCardBalance,
                                                 is_disabled: newGiftCardBalance === 0,
                                             })];
-                                    case 15:
+                                    case 14:
                                         _f.sent();
                                         return [4 /*yield*/, giftCardService.createTransaction({
                                                 gift_card_id: giftCard.id,
@@ -669,38 +642,37 @@ var OrderService = /** @class */ (function (_super) {
                                                 is_taxable: !!giftCard.tax_rate,
                                                 tax_rate: giftCard.tax_rate,
                                             })];
-                                    case 16:
+                                    case 15:
                                         _f.sent();
                                         giftCardableAmountBalance =
                                             giftCardableAmountBalance - giftCardBalanceUsed;
-                                        _f.label = 17;
-                                    case 17:
+                                        _f.label = 16;
+                                    case 16:
                                         _c = _b.next();
-                                        return [3 /*break*/, 14];
-                                    case 18: return [3 /*break*/, 21];
-                                    case 19:
+                                        return [3 /*break*/, 13];
+                                    case 17: return [3 /*break*/, 20];
+                                    case 18:
                                         e_1_1 = _f.sent();
                                         e_1 = { error: e_1_1 };
-                                        return [3 /*break*/, 21];
-                                    case 20:
+                                        return [3 /*break*/, 20];
+                                    case 19:
                                         try {
                                             if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                                         }
                                         finally { if (e_1) throw e_1.error; }
                                         return [7 /*endfinally*/];
-                                    case 21:
+                                    case 20:
                                         shippingOptionServiceTx = this.shippingOptionService_.withTransaction(manager);
                                         lineItemServiceTx = this.lineItemService_.withTransaction(manager);
                                         return [4 /*yield*/, Promise.all([
                                                 cart.items.map(function (lineItem) {
-                                                    var lineItemPromises = [
+                                                    var toReturn = [
                                                         lineItemServiceTx.update(lineItem.id, { order_id: order.id }),
-                                                        inventoryServiceTx.adjustInventory(lineItem.variant_id, -lineItem.quantity),
                                                     ];
                                                     if (lineItem.is_giftcard) {
-                                                        lineItemPromises.push(_this.createGiftCardsFromLineItem_(order, lineItem, manager));
+                                                        toReturn.push(_this.createGiftCardsFromLineItem_(order, lineItem, manager));
                                                     }
-                                                    return lineItemPromises;
+                                                    return toReturn;
                                                 }),
                                                 cart.shipping_methods.map(function (method) { return __awaiter(_this, void 0, void 0, function () {
                                                     return __generator(this, function (_a) {
@@ -715,7 +687,7 @@ var OrderService = /** @class */ (function (_super) {
                                                     });
                                                 }); }),
                                             ].flat(Infinity))];
-                                    case 22:
+                                    case 21:
                                         _f.sent();
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(manager)
@@ -723,10 +695,10 @@ var OrderService = /** @class */ (function (_super) {
                                                 id: order.id,
                                                 no_notification: order.no_notification,
                                             })];
-                                    case 23:
+                                    case 22:
                                         _f.sent();
                                         return [4 /*yield*/, cartServiceTx.update(cart.id, { completed_at: new Date() })];
-                                    case 24:
+                                    case 23:
                                         _f.sent();
                                         return [2 /*return*/, order];
                                 }
@@ -1206,13 +1178,15 @@ var OrderService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                            var order, throwErrorIf, notCanceled, inventoryServiceTx, _a, _b, item, e_6_1, paymentProviderServiceTx, _c, _d, p, e_7_1, orderRepo, result;
-                            var e_6, _e, e_7, _f;
-                            var _g;
-                            return __generator(this, function (_h) {
-                                switch (_h.label) {
+                            var order, throwErrorIf, notCanceled, inventoryServiceTx, previouslyFulfilledQuantities, paymentProviderServiceTx, _a, _b, p, e_6_1, orderRepo, result;
+                            var e_6, _c;
+                            var _this = this;
+                            var _d;
+                            return __generator(this, function (_e) {
+                                switch (_e.label) {
                                     case 0: return [4 /*yield*/, this.retrieve(orderId, {
                                             relations: [
+                                                "refunds",
                                                 "fulfillments",
                                                 "payments",
                                                 "returns",
@@ -1222,8 +1196,8 @@ var OrderService = /** @class */ (function (_super) {
                                             ],
                                         })];
                                     case 1:
-                                        order = _h.sent();
-                                        if (((_g = order.refunds) === null || _g === void 0 ? void 0 : _g.length) > 0) {
+                                        order = _e.sent();
+                                        if (((_d = order.refunds) === null || _d === void 0 ? void 0 : _d.length) > 0) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Order with refund(s) cannot be canceled");
                                         }
                                         throwErrorIf = function (arr, pred, type) {
@@ -1236,78 +1210,70 @@ var OrderService = /** @class */ (function (_super) {
                                         throwErrorIf(order.returns, function (r) { return r.status !== "canceled"; }, "returns");
                                         throwErrorIf(order.swaps, notCanceled, "swaps");
                                         throwErrorIf(order.claims, notCanceled, "claims");
-                                        inventoryServiceTx = this.inventoryService_.withTransaction(manager);
-                                        _h.label = 2;
+                                        inventoryServiceTx = this.productVariantInventoryService_.withTransaction(manager);
+                                        previouslyFulfilledQuantities = order.fulfillments.reduce(function (acc, f) {
+                                            return f.items.reduce(function (acc, item) {
+                                                acc[item.item_id] = (acc[item.item_id] || 0) + item.quantity;
+                                                return acc;
+                                            }, acc);
+                                        }, {});
+                                        return [4 /*yield*/, Promise.all(order.items.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    switch (_a.label) {
+                                                        case 0:
+                                                            if (!item.variant_id) return [3 /*break*/, 2];
+                                                            return [4 /*yield*/, inventoryServiceTx.deleteReservationsByLineItem(item.id, item.variant_id, item.quantity - (previouslyFulfilledQuantities[item.id] || 0))];
+                                                        case 1: return [2 /*return*/, _a.sent()];
+                                                        case 2: return [2 /*return*/];
+                                                    }
+                                                });
+                                            }); }))];
                                     case 2:
-                                        _h.trys.push([2, 7, 8, 9]);
-                                        _a = __values(order.items), _b = _a.next();
-                                        _h.label = 3;
+                                        _e.sent();
+                                        paymentProviderServiceTx = this.paymentProviderService_.withTransaction(manager);
+                                        _e.label = 3;
                                     case 3:
-                                        if (!!_b.done) return [3 /*break*/, 6];
-                                        item = _b.value;
-                                        return [4 /*yield*/, inventoryServiceTx.adjustInventory(item.variant_id, item.quantity)];
+                                        _e.trys.push([3, 8, 9, 10]);
+                                        _a = __values(order.payments), _b = _a.next();
+                                        _e.label = 4;
                                     case 4:
-                                        _h.sent();
-                                        _h.label = 5;
+                                        if (!!_b.done) return [3 /*break*/, 7];
+                                        p = _b.value;
+                                        return [4 /*yield*/, paymentProviderServiceTx.cancelPayment(p)];
                                     case 5:
+                                        _e.sent();
+                                        _e.label = 6;
+                                    case 6:
                                         _b = _a.next();
-                                        return [3 /*break*/, 3];
-                                    case 6: return [3 /*break*/, 9];
-                                    case 7:
-                                        e_6_1 = _h.sent();
-                                        e_6 = { error: e_6_1 };
-                                        return [3 /*break*/, 9];
+                                        return [3 /*break*/, 4];
+                                    case 7: return [3 /*break*/, 10];
                                     case 8:
+                                        e_6_1 = _e.sent();
+                                        e_6 = { error: e_6_1 };
+                                        return [3 /*break*/, 10];
+                                    case 9:
                                         try {
-                                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                         }
                                         finally { if (e_6) throw e_6.error; }
                                         return [7 /*endfinally*/];
-                                    case 9:
-                                        paymentProviderServiceTx = this.paymentProviderService_.withTransaction(manager);
-                                        _h.label = 10;
                                     case 10:
-                                        _h.trys.push([10, 15, 16, 17]);
-                                        _c = __values(order.payments), _d = _c.next();
-                                        _h.label = 11;
-                                    case 11:
-                                        if (!!_d.done) return [3 /*break*/, 14];
-                                        p = _d.value;
-                                        return [4 /*yield*/, paymentProviderServiceTx.cancelPayment(p)];
-                                    case 12:
-                                        _h.sent();
-                                        _h.label = 13;
-                                    case 13:
-                                        _d = _c.next();
-                                        return [3 /*break*/, 11];
-                                    case 14: return [3 /*break*/, 17];
-                                    case 15:
-                                        e_7_1 = _h.sent();
-                                        e_7 = { error: e_7_1 };
-                                        return [3 /*break*/, 17];
-                                    case 16:
-                                        try {
-                                            if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
-                                        }
-                                        finally { if (e_7) throw e_7.error; }
-                                        return [7 /*endfinally*/];
-                                    case 17:
                                         order.status = models_1.OrderStatus.CANCELED;
                                         order.fulfillment_status = models_1.FulfillmentStatus.CANCELED;
                                         order.payment_status = models_1.PaymentStatus.CANCELED;
                                         order.canceled_at = new Date();
                                         orderRepo = manager.getCustomRepository(this.orderRepository_);
                                         return [4 /*yield*/, orderRepo.save(order)];
-                                    case 18:
-                                        result = _h.sent();
+                                    case 11:
+                                        result = _e.sent();
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(manager)
                                                 .emit(OrderService.Events.CANCELED, {
                                                 id: order.id,
                                                 no_notification: order.no_notification,
                                             })];
-                                    case 19:
-                                        _h.sent();
+                                    case 12:
+                                        _e.sent();
                                         return [2 /*return*/, result];
                                 }
                             });
@@ -1328,8 +1294,8 @@ var OrderService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                            var orderRepo, order, paymentProviderServiceTx, payments, _loop_2, _a, _b, p, e_8_1, result;
-                            var e_8, _c;
+                            var orderRepo, order, paymentProviderServiceTx, payments, _loop_2, _a, _b, p, e_7_1, result;
+                            var e_7, _c;
                             var _this = this;
                             return __generator(this, function (_d) {
                                 switch (_d.label) {
@@ -1401,14 +1367,14 @@ var OrderService = /** @class */ (function (_super) {
                                         return [3 /*break*/, 3];
                                     case 6: return [3 /*break*/, 9];
                                     case 7:
-                                        e_8_1 = _d.sent();
-                                        e_8 = { error: e_8_1 };
+                                        e_7_1 = _d.sent();
+                                        e_7 = { error: e_7_1 };
                                         return [3 /*break*/, 9];
                                     case 8:
                                         try {
                                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                         }
-                                        finally { if (e_8) throw e_8.error; }
+                                        finally { if (e_7) throw e_7.error; }
                                         return [7 /*endfinally*/];
                                     case 9:
                                         order.payments = payments;
@@ -1471,20 +1437,17 @@ var OrderService = /** @class */ (function (_super) {
      * @return result of the update operation.
      */
     OrderService.prototype.createFulfillment = function (orderId, itemsToFulfill, config) {
-        if (config === void 0) { config = {
-            no_notification: undefined,
-            metadata: {},
-        }; }
+        if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var metadata, no_notification;
+            var metadata, no_notification, location_id;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        metadata = config.metadata, no_notification = config.no_notification;
+                        metadata = config.metadata, no_notification = config.no_notification, location_id = config.location_id;
                         return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                                var order, fulfillments, successfullyFulfilled, fulfillments_1, fulfillments_1_1, f, _loop_3, this_1, _a, _b, item, e_9_1, orderRepo, result, evaluatedNoNotification, eventBusTx, fulfillments_2, fulfillments_2_1, fulfillment, e_10_1;
-                                var e_11, _c, e_9, _d, e_10, _e;
+                                var order, fulfillments, successfullyFulfilled, fulfillments_1, fulfillments_1_1, f, _loop_3, this_1, _a, _b, item, e_8_1, orderRepo, result, evaluatedNoNotification, eventBusTx, fulfillments_2, fulfillments_2_1, fulfillment, e_9_1;
+                                var e_10, _c, e_8, _d, e_9, _e;
                                 var _f;
                                 return __generator(this, function (_g) {
                                     switch (_g.label) {
@@ -1524,9 +1487,11 @@ var OrderService = /** @class */ (function (_super) {
                                             return [4 /*yield*/, this.fulfillmentService_
                                                     .withTransaction(manager)
                                                     .createFulfillment(order, itemsToFulfill, {
-                                                    metadata: metadata,
+                                                    metadata: metadata !== null && metadata !== void 0 ? metadata : {},
                                                     no_notification: no_notification,
                                                     order_id: orderId,
+                                                }, {
+                                                    locationId: location_id,
                                                 })];
                                         case 2:
                                             fulfillments = _g.sent();
@@ -1537,12 +1502,12 @@ var OrderService = /** @class */ (function (_super) {
                                                     successfullyFulfilled = __spreadArray(__spreadArray([], __read(successfullyFulfilled), false), __read(f.items), false);
                                                 }
                                             }
-                                            catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                                            catch (e_10_1) { e_10 = { error: e_10_1 }; }
                                             finally {
                                                 try {
                                                     if (fulfillments_1_1 && !fulfillments_1_1.done && (_c = fulfillments_1.return)) _c.call(fulfillments_1);
                                                 }
-                                                finally { if (e_11) throw e_11.error; }
+                                                finally { if (e_10) throw e_10.error; }
                                             }
                                             order.fulfillment_status = models_1.FulfillmentStatus.FULFILLED;
                                             _loop_3 = function (item) {
@@ -1591,14 +1556,14 @@ var OrderService = /** @class */ (function (_super) {
                                             return [3 /*break*/, 4];
                                         case 7: return [3 /*break*/, 10];
                                         case 8:
-                                            e_9_1 = _g.sent();
-                                            e_9 = { error: e_9_1 };
+                                            e_8_1 = _g.sent();
+                                            e_8 = { error: e_8_1 };
                                             return [3 /*break*/, 10];
                                         case 9:
                                             try {
                                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                                             }
-                                            finally { if (e_9) throw e_9.error; }
+                                            finally { if (e_8) throw e_8.error; }
                                             return [7 /*endfinally*/];
                                         case 10:
                                             orderRepo = manager.getCustomRepository(this.orderRepository_);
@@ -1629,14 +1594,14 @@ var OrderService = /** @class */ (function (_super) {
                                             return [3 /*break*/, 13];
                                         case 16: return [3 /*break*/, 19];
                                         case 17:
-                                            e_10_1 = _g.sent();
-                                            e_10 = { error: e_10_1 };
+                                            e_9_1 = _g.sent();
+                                            e_9 = { error: e_9_1 };
                                             return [3 /*break*/, 19];
                                         case 18:
                                             try {
                                                 if (fulfillments_2_1 && !fulfillments_2_1.done && (_e = fulfillments_2.return)) _e.call(fulfillments_2);
                                             }
-                                            finally { if (e_10) throw e_10.error; }
+                                            finally { if (e_9) throw e_9.error; }
                                             return [7 /*endfinally*/];
                                         case 19: return [2 /*return*/, result];
                                     }
@@ -1841,8 +1806,8 @@ var OrderService = /** @class */ (function (_super) {
     OrderService.prototype.decorateTotalsLegacy = function (order, totalsFields) {
         if (totalsFields === void 0) { totalsFields = []; }
         return __awaiter(this, void 0, void 0, function () {
-            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_12_1, _o, _p, s, items, _q, _r, item, _s, _t, _u, e_13_1, e_14_1, _v, _w, c, items, _x, _y, item, _z, _0, _1, e_15_1, e_16_1, e_17_1;
-            var e_17, _2, e_12, _3, _4, e_14, _5, e_13, _6, _7, e_16, _8, e_15, _9, _10;
+            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_11_1, _o, _p, s, items, _q, _r, item, _s, _t, _u, e_12_1, e_13_1, _v, _w, c, items, _x, _y, item, _z, _0, _1, e_14_1, e_15_1, e_16_1;
+            var e_16, _2, e_11, _3, _4, e_13, _5, e_12, _6, _7, e_15, _8, e_14, _9, _10;
             var _this = this;
             return __generator(this, function (_11) {
                 switch (_11.label) {
@@ -1957,7 +1922,7 @@ var OrderService = /** @class */ (function (_super) {
                         _11.label = 21;
                     case 21:
                         _11.trys.push([21, 26, 27, 28]);
-                        _h = (e_12 = void 0, __values(order.items)), _j = _h.next();
+                        _h = (e_11 = void 0, __values(order.items)), _j = _h.next();
                         _11.label = 22;
                     case 22:
                         if (!!_j.done) return [3 /*break*/, 25];
@@ -1974,21 +1939,21 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 22];
                     case 25: return [3 /*break*/, 28];
                     case 26:
-                        e_12_1 = _11.sent();
-                        e_12 = { error: e_12_1 };
+                        e_11_1 = _11.sent();
+                        e_11 = { error: e_11_1 };
                         return [3 /*break*/, 28];
                     case 27:
                         try {
                             if (_j && !_j.done && (_3 = _h.return)) _3.call(_h);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 28:
                         order.items = items;
                         return [3 /*break*/, 60];
                     case 29:
                         _11.trys.push([29, 41, 42, 43]);
-                        _o = (e_14 = void 0, __values(order.swaps)), _p = _o.next();
+                        _o = (e_13 = void 0, __values(order.swaps)), _p = _o.next();
                         _11.label = 30;
                     case 30:
                         if (!!_p.done) return [3 /*break*/, 40];
@@ -1997,7 +1962,7 @@ var OrderService = /** @class */ (function (_super) {
                         _11.label = 31;
                     case 31:
                         _11.trys.push([31, 36, 37, 38]);
-                        _q = (e_13 = void 0, __values(s.additional_items)), _r = _q.next();
+                        _q = (e_12 = void 0, __values(s.additional_items)), _r = _q.next();
                         _11.label = 32;
                     case 32:
                         if (!!_r.done) return [3 /*break*/, 35];
@@ -2014,14 +1979,14 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 32];
                     case 35: return [3 /*break*/, 38];
                     case 36:
-                        e_13_1 = _11.sent();
-                        e_13 = { error: e_13_1 };
+                        e_12_1 = _11.sent();
+                        e_12 = { error: e_12_1 };
                         return [3 /*break*/, 38];
                     case 37:
                         try {
                             if (_r && !_r.done && (_6 = _q.return)) _6.call(_q);
                         }
-                        finally { if (e_13) throw e_13.error; }
+                        finally { if (e_12) throw e_12.error; }
                         return [7 /*endfinally*/];
                     case 38:
                         s.additional_items = items;
@@ -2031,19 +1996,19 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 30];
                     case 40: return [3 /*break*/, 43];
                     case 41:
-                        e_14_1 = _11.sent();
-                        e_14 = { error: e_14_1 };
+                        e_13_1 = _11.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 43];
                     case 42:
                         try {
                             if (_p && !_p.done && (_5 = _o.return)) _5.call(_o);
                         }
-                        finally { if (e_14) throw e_14.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 43: return [3 /*break*/, 60];
                     case 44:
                         _11.trys.push([44, 56, 57, 58]);
-                        _v = (e_16 = void 0, __values(order.claims)), _w = _v.next();
+                        _v = (e_15 = void 0, __values(order.claims)), _w = _v.next();
                         _11.label = 45;
                     case 45:
                         if (!!_w.done) return [3 /*break*/, 55];
@@ -2052,7 +2017,7 @@ var OrderService = /** @class */ (function (_super) {
                         _11.label = 46;
                     case 46:
                         _11.trys.push([46, 51, 52, 53]);
-                        _x = (e_15 = void 0, __values(c.additional_items)), _y = _x.next();
+                        _x = (e_14 = void 0, __values(c.additional_items)), _y = _x.next();
                         _11.label = 47;
                     case 47:
                         if (!!_y.done) return [3 /*break*/, 50];
@@ -2069,14 +2034,14 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 47];
                     case 50: return [3 /*break*/, 53];
                     case 51:
-                        e_15_1 = _11.sent();
-                        e_15 = { error: e_15_1 };
+                        e_14_1 = _11.sent();
+                        e_14 = { error: e_14_1 };
                         return [3 /*break*/, 53];
                     case 52:
                         try {
                             if (_y && !_y.done && (_9 = _x.return)) _9.call(_x);
                         }
-                        finally { if (e_15) throw e_15.error; }
+                        finally { if (e_14) throw e_14.error; }
                         return [7 /*endfinally*/];
                     case 53:
                         c.additional_items = items;
@@ -2086,14 +2051,14 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 45];
                     case 55: return [3 /*break*/, 58];
                     case 56:
-                        e_16_1 = _11.sent();
-                        e_16 = { error: e_16_1 };
+                        e_15_1 = _11.sent();
+                        e_15 = { error: e_15_1 };
                         return [3 /*break*/, 58];
                     case 57:
                         try {
                             if (_w && !_w.done && (_8 = _v.return)) _8.call(_v);
                         }
-                        finally { if (e_16) throw e_16.error; }
+                        finally { if (e_15) throw e_15.error; }
                         return [7 /*endfinally*/];
                     case 58: return [3 /*break*/, 60];
                     case 59:
@@ -2106,14 +2071,14 @@ var OrderService = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 61: return [3 /*break*/, 64];
                     case 62:
-                        e_17_1 = _11.sent();
-                        e_17 = { error: e_17_1 };
+                        e_16_1 = _11.sent();
+                        e_16 = { error: e_16_1 };
                         return [3 /*break*/, 64];
                     case 63:
                         try {
                             if (totalsFields_1_1 && !totalsFields_1_1.done && (_2 = totalsFields_1.return)) _2.call(totalsFields_1);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_16) throw e_16.error; }
                         return [7 /*endfinally*/];
                     case 64: return [2 /*return*/, order];
                 }
@@ -2129,7 +2094,7 @@ var OrderService = /** @class */ (function (_super) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function () {
             var manager, newTotalsServiceTx, calculationContext, orderItems, orderShippingMethods, itemsTotals, shippingTotals, item_tax_total, shipping_tax_total, giftCardTotal, _j, _k, swap, _l, _m, claim;
-            var e_18, _o, e_19, _p;
+            var e_17, _o, e_18, _p;
             return __generator(this, function (_q) {
                 switch (_q.label) {
                     case 0:
@@ -2212,12 +2177,12 @@ var OrderService = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                        catch (e_17_1) { e_17 = { error: e_17_1 }; }
                         finally {
                             try {
                                 if (_k && !_k.done && (_o = _j.return)) _o.call(_j);
                             }
-                            finally { if (e_18) throw e_18.error; }
+                            finally { if (e_17) throw e_17.error; }
                         }
                         try {
                             for (_l = __values((_h = order.claims) !== null && _h !== void 0 ? _h : []), _m = _l.next(); !_m.done; _m = _l.next()) {
@@ -2231,12 +2196,12 @@ var OrderService = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                        catch (e_18_1) { e_18 = { error: e_18_1 }; }
                         finally {
                             try {
                                 if (_m && !_m.done && (_p = _l.return)) _p.call(_l);
                             }
-                            finally { if (e_19) throw e_19.error; }
+                            finally { if (e_18) throw e_18.error; }
                         }
                         order.total =
                             order.subtotal +
@@ -2268,7 +2233,7 @@ var OrderService = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
                             var order, refundAmount, orderRepo, result_2, isFullReturn, _a, _b, i, refund, result;
-                            var e_20, _c;
+                            var e_19, _c;
                             return __generator(this, function (_d) {
                                 switch (_d.label) {
                                     case 0: return [4 /*yield*/, this.retrieve(orderId, {
@@ -2310,12 +2275,12 @@ var OrderService = /** @class */ (function (_super) {
                                                 }
                                             }
                                         }
-                                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
                                         finally {
                                             try {
                                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                             }
-                                            finally { if (e_20) throw e_20.error; }
+                                            finally { if (e_19) throw e_19.error; }
                                         }
                                         if (!(receivedReturn.refund_amount > 0)) return [3 /*break*/, 6];
                                         return [4 /*yield*/, this.paymentProviderService_