fix(medusa): Fix order service linting issues (#5071)
* style(medusa): Fix order service linting issues * Create short-ligers-pull.md
This commit is contained in:
1 parent
dc94f053d3
commit
60360d2fd2
2 files changed
+56
-50
No files matched your search
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"@medusajs/medusa": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
style(medusa): Fix order service linting issues
|
||||||
@@ -1,63 +1,63 @@
|
|||||||
import { IInventoryService } from "@medusajs/types"
|
import { IInventoryService } from "@medusajs/types"
|
||||||
import {
|
import {
|
||||||
buildRelations,
|
buildRelations,
|
||||||
buildSelects,
|
buildSelects,
|
||||||
FlagRouter,
|
FlagRouter,
|
||||||
isDefined,
|
isDefined,
|
||||||
MedusaError,
|
MedusaError,
|
||||||
} from "@medusajs/utils"
|
} from "@medusajs/utils"
|
||||||
import {
|
import {
|
||||||
EntityManager,
|
EntityManager,
|
||||||
FindManyOptions,
|
FindManyOptions,
|
||||||
FindOptionsWhere,
|
FindOptionsWhere,
|
||||||
ILike,
|
ILike,
|
||||||
IsNull,
|
IsNull,
|
||||||
Not,
|
Not,
|
||||||
Raw,
|
Raw,
|
||||||
} from "typeorm"
|
} from "typeorm"
|
||||||
import {
|
import {
|
||||||
CartService,
|
CartService,
|
||||||
CustomerService,
|
CustomerService,
|
||||||
DiscountService,
|
DiscountService,
|
||||||
DraftOrderService,
|
DraftOrderService,
|
||||||
FulfillmentProviderService,
|
FulfillmentProviderService,
|
||||||
FulfillmentService,
|
FulfillmentService,
|
||||||
GiftCardService,
|
GiftCardService,
|
||||||
LineItemService,
|
LineItemService,
|
||||||
NewTotalsService,
|
NewTotalsService,
|
||||||
PaymentProviderService,
|
PaymentProviderService,
|
||||||
ProductVariantInventoryService,
|
ProductVariantInventoryService,
|
||||||
RegionService,
|
RegionService,
|
||||||
ShippingOptionService,
|
ShippingOptionService,
|
||||||
ShippingProfileService,
|
ShippingProfileService,
|
||||||
TaxProviderService,
|
TaxProviderService,
|
||||||
TotalsService,
|
TotalsService,
|
||||||
} from "."
|
} from "."
|
||||||
import { TransactionBaseService } from "../interfaces"
|
import { TransactionBaseService } from "../interfaces"
|
||||||
import SalesChannelFeatureFlag from "../loaders/feature-flags/sales-channels"
|
import SalesChannelFeatureFlag from "../loaders/feature-flags/sales-channels"
|
||||||
import {
|
import {
|
||||||
Address,
|
Address,
|
||||||
Cart,
|
Cart,
|
||||||
ClaimOrder,
|
ClaimOrder,
|
||||||
Fulfillment,
|
Fulfillment,
|
||||||
FulfillmentItem,
|
FulfillmentItem,
|
||||||
FulfillmentStatus,
|
FulfillmentStatus,
|
||||||
GiftCard,
|
GiftCard,
|
||||||
LineItem,
|
LineItem,
|
||||||
Order,
|
Order,
|
||||||
OrderStatus,
|
OrderStatus,
|
||||||
Payment,
|
Payment,
|
||||||
PaymentStatus,
|
PaymentStatus,
|
||||||
Return,
|
Return,
|
||||||
Swap,
|
Swap,
|
||||||
TrackingLink,
|
TrackingLink,
|
||||||
} from "../models"
|
} from "../models"
|
||||||
import { AddressRepository } from "../repositories/address"
|
import { AddressRepository } from "../repositories/address"
|
||||||
import { OrderRepository } from "../repositories/order"
|
import { OrderRepository } from "../repositories/order"
|
||||||
import { FindConfig, QuerySelector, Selector } from "../types/common"
|
import { FindConfig, QuerySelector, Selector } from "../types/common"
|
||||||
import {
|
import {
|
||||||
CreateFulfillmentOrder,
|
CreateFulfillmentOrder,
|
||||||
FulFillmentItemType,
|
FulFillmentItemType,
|
||||||
} from "../types/fulfillment"
|
} from "../types/fulfillment"
|
||||||
import { TotalsContext, UpdateOrderInput } from "../types/orders"
|
import { TotalsContext, UpdateOrderInput } from "../types/orders"
|
||||||
import { CreateShippingMethodDto } from "../types/shipping-options"
|
import { CreateShippingMethodDto } from "../types/shipping-options"
|
||||||
@@ -733,10 +733,10 @@ class OrderService extends TransactionBaseService {
|
|||||||
let giftCardableAmountBalance = giftCardableAmount
|
let giftCardableAmountBalance = giftCardableAmount
|
||||||
const giftCardService = this.giftCardService_.withTransaction(manager)
|
const giftCardService = this.giftCardService_.withTransaction(manager)
|
||||||
|
|
||||||
//Order the gift cards by first ends_at date, then remaining amount. To ensure largest possible amount left, for longest possible time.
|
// Order the gift cards by first ends_at date, then remaining amount. To ensure largest possible amount left, for longest possible time.
|
||||||
const orderedGiftCards = cart.gift_cards.sort((a, b) => {
|
const orderedGiftCards = cart.gift_cards.sort((a, b) => {
|
||||||
let aEnd = a.ends_at ?? new Date(2100, 1, 1)
|
const aEnd = a.ends_at ?? new Date(2100, 1, 1)
|
||||||
let bEnd = b.ends_at ?? new Date(2100, 1, 1)
|
const bEnd = b.ends_at ?? new Date(2100, 1, 1)
|
||||||
return aEnd.getTime() - bEnd.getTime() || a.balance - b.balance
|
return aEnd.getTime() - bEnd.getTime() || a.balance - b.balance
|
||||||
})
|
})
|
||||||
for (const giftCard of orderedGiftCards) {
|
for (const giftCard of orderedGiftCards) {
|
||||||
@@ -762,8 +762,9 @@ class OrderService extends TransactionBaseService {
|
|||||||
giftCardableAmountBalance =
|
giftCardableAmountBalance =
|
||||||
giftCardableAmountBalance - giftCardBalanceUsed
|
giftCardableAmountBalance - giftCardBalanceUsed
|
||||||
|
|
||||||
if (giftCardableAmountBalance == 0)
|
if (giftCardableAmountBalance == 0) {
|
||||||
break;
|
break
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const shippingOptionServiceTx =
|
const shippingOptionServiceTx =
|
||||||
|
|||||||
Reference in new issue
Block a user