fix(order): calculate taxes on order edit flows (#11518)

* fix(order): calcualte taxes on order edit flows

* merge summary

* tests

* fix pending difference

* comments

* claim test

* revert method

packages/modules/order/src/services/__tests__/util/actions/credit-line-add.spec.ts

@@ -45,21 +45,18 @@ describe("Action: Credit Line Add", function () {
       "original_order_total": 30,
       "current_order_total": 30,
       "pending_difference": 30,
-      "difference_sum": 0,
       "paid_total": 0,
       "refunded_total": 0,
       "credit_line_total": 0
     }
 
-    Upon adding a credit line, the current order total will decrease with the difference_sum going in
-    the negatives making it possible for the merchant to balance the order to then enable a refund.
+    Upon adding a credit line, the current order total will decrease making it possible for the merchant to balance the order to then enable a refund.
 
     {
       "transaction_total": 0,
       "original_order_total": 30,
       "current_order_total": 60,
       "pending_difference": 0,
-      "difference_sum": -30,
       "paid_total": 0,
       "refunded_total": 0,
       "credit_line_total": 30
@@ -81,7 +78,6 @@ describe("Action: Credit Line Add", function () {
       original_order_total: 30,
       current_order_total: 30,
       pending_difference: 30,
-      difference_sum: 0,
       paid_total: 0,
       refunded_total: 0,
       credit_line_total: 0,
@@ -110,7 +106,6 @@ describe("Action: Credit Line Add", function () {
       original_order_total: 30,
       current_order_total: 0,
       pending_difference: 0,
-      difference_sum: 0,
       paid_total: 0,
       refunded_total: 0,
       credit_line_total: 30,
@@ -147,7 +142,6 @@ describe("Action: Credit Line Add", function () {
       original_order_total: 30,
       current_order_total: -10,
       pending_difference: -10,
-      difference_sum: 0,
       paid_total: 0,
       refunded_total: 0,
       credit_line_total: 40,

packages/modules/order/src/services/__tests__/util/actions/exchanges.ts

@@ -119,7 +119,6 @@ describe("Order Exchange - Actions", function () {
       original_order_total: 270,
       current_order_total: 312.5,
       pending_difference: 312.5,
-      difference_sum: 42.5,
       paid_total: 0,
       refunded_total: 0,
       credit_line_total: 0,

packages/modules/order/src/services/order-module-service.ts

@@ -731,11 +731,13 @@ export default class OrderModuleService
         shipping_methods,
         items,
       }) as any
+
       const calculated = calculateOrderChange({
         order: orderWithTotals,
         actions: [],
         transactions: order.transactions,
       })
+
       createRawPropertiesFromBigNumber(calculated)
 
       ord.summary = {
@@ -1469,6 +1471,26 @@ export default class OrderModuleService
     })
   }
 
+  @InjectTransactionManager()
+  async upsertOrderLineItemAdjustments(
+    adjustments: (
+      | OrderTypes.CreateOrderLineItemAdjustmentDTO
+      | OrderTypes.UpdateOrderLineItemAdjustmentDTO
+    )[],
+    @MedusaContext() sharedContext: Context = {}
+  ): Promise<OrderTypes.OrderLineItemAdjustmentDTO[]> {
+    let result = await this.orderLineItemAdjustmentService_.upsert(
+      adjustments,
+      sharedContext
+    )
+
+    return await this.baseRepository_.serialize<
+      OrderTypes.OrderLineItemAdjustmentDTO[]
+    >(result, {
+      populate: true,
+    })
+  }
+
   @InjectTransactionManager()
   async setOrderLineItemAdjustments(
     orderId: string,
@@ -1520,6 +1542,26 @@ export default class OrderModuleService
     })
   }
 
+  @InjectTransactionManager()
+  async upsertOrderShippingMethodAdjustments(
+    adjustments: (
+      | OrderTypes.CreateOrderShippingMethodAdjustmentDTO
+      | OrderTypes.UpdateOrderShippingMethodAdjustmentDTO
+    )[],
+    @MedusaContext() sharedContext: Context = {}
+  ): Promise<OrderTypes.OrderShippingMethodAdjustmentDTO[]> {
+    const result = await this.orderShippingMethodAdjustmentService_.upsert(
+      adjustments,
+      sharedContext
+    )
+
+    return await this.baseRepository_.serialize<
+      OrderTypes.OrderShippingMethodAdjustmentDTO[]
+    >(result, {
+      populate: true,
+    })
+  }
+
   @InjectTransactionManager()
   async setOrderShippingMethodAdjustments(
     orderId: string,
@@ -1721,6 +1763,26 @@ export default class OrderModuleService
     return serialized
   }
 
+  @InjectTransactionManager()
+  async upsertOrderLineItemTaxLines(
+    taxLines: (
+      | OrderTypes.CreateOrderLineItemTaxLineDTO
+      | OrderTypes.UpdateOrderLineItemTaxLineDTO
+    )[],
+    @MedusaContext() sharedContext: Context = {}
+  ): Promise<OrderTypes.OrderLineItemTaxLineDTO[]> {
+    const result = await this.orderLineItemTaxLineService_.upsert(
+      taxLines as UpdateOrderLineItemTaxLineDTO[],
+      sharedContext
+    )
+
+    return await this.baseRepository_.serialize<
+      OrderTypes.OrderLineItemTaxLineDTO[]
+    >(result, {
+      populate: true,
+    })
+  }
+
   @InjectTransactionManager()
   async setOrderLineItemTaxLines(
     orderId: string,
@@ -1834,6 +1896,26 @@ export default class OrderModuleService
     return serialized
   }
 
+  @InjectTransactionManager()
+  async upsertOrderShippingMethodTaxLines(
+    taxLines: (
+      | OrderTypes.CreateOrderShippingMethodTaxLineDTO
+      | OrderTypes.UpdateOrderShippingMethodTaxLineDTO
+    )[],
+    @MedusaContext() sharedContext: Context = {}
+  ): Promise<OrderTypes.OrderShippingMethodTaxLineDTO[]> {
+    const result = await this.orderShippingMethodTaxLineService_.upsert(
+      taxLines as UpdateOrderShippingMethodTaxLineDTO[],
+      sharedContext
+    )
+
+    return await this.baseRepository_.serialize<
+      OrderTypes.OrderShippingMethodTaxLineDTO[]
+    >(result, {
+      populate: true,
+    })
+  }
+
   @InjectTransactionManager()
   async setOrderShippingMethodTaxLines(
     orderId: string,
@@ -2115,7 +2197,7 @@ export default class OrderModuleService
       orderId,
       {
         select: ["id", "version", "items.detail", "summary", "total"],
-        relations: ["transactions", "items", "shipping_methods"],
+        relations: ["transactions", "credit_lines"],
       },
       sharedContext
     )
@@ -2131,7 +2213,7 @@ export default class OrderModuleService
     )
 
     const { itemsToUpsert, shippingMethodsToUpsert, calculatedOrders } =
-      applyChangesToOrder(
+      await applyChangesToOrder(
         [order],
         { [order.id]: orderChange.actions },
         { addActionReferenceToObject: true }
@@ -2139,9 +2221,34 @@ export default class OrderModuleService
 
     const calculated = calculatedOrders[order.id]
 
+    await this.includeTaxLinesAndAdjustementsToPreview(
+      calculated.order,
+      itemsToUpsert,
+      shippingMethodsToUpsert,
+      sharedContext
+    )
+
+    const calcOrder = calculated.order
+
+    const orderWithTotals = decorateCartTotals(
+      calcOrder as DecorateCartLikeInputDTO
+    )
+    calcOrder.summary = calculated.getSummaryFromOrder(orderWithTotals)
+
+    createRawPropertiesFromBigNumber(calcOrder)
+
+    return calcOrder
+  }
+
+  private async includeTaxLinesAndAdjustementsToPreview(
+    order,
+    itemsToUpsert,
+    shippingMethodsToUpsert,
+    sharedContext
+  ) {
     const addedItems = {}
     const addedShippingMethods = {}
-    for (const item of calculated.order.items) {
+    for (const item of order.items) {
       const isExistingItem = item.id === item.detail?.item_id
       if (!isExistingItem) {
         addedItems[item.id] = {
@@ -2156,7 +2263,7 @@ export default class OrderModuleService
       }
     }
 
-    for (const sm of calculated.order.shipping_methods) {
+    for (const sm of order.shipping_methods) {
       if (!isDefined(sm.shipping_option_id)) {
         addedShippingMethods[sm.id] = sm
       }
@@ -2171,7 +2278,7 @@ export default class OrderModuleService
         sharedContext
       )
 
-      calculated.order.items.forEach((item, idx) => {
+      order.items.forEach((item, idx) => {
         if (!addedItems[item.id]) {
           return
         }
@@ -2187,7 +2294,7 @@ export default class OrderModuleService
         const compareAtUnitPrice =
           newItem?.compare_at_unit_price ?? item.compare_at_unit_price
 
-        calculated.order.items[idx] = {
+        order.items[idx] = {
           ...lineItem,
           actions,
           quantity: newItem.quantity,
@@ -2210,7 +2317,7 @@ export default class OrderModuleService
         sharedContext
       )
 
-      calculated.order.shipping_methods.forEach((sm, idx) => {
+      order.shipping_methods.forEach((sm, idx) => {
         if (!addedShippingMethods[sm.id]) {
           return
         }
@@ -2227,7 +2334,7 @@ export default class OrderModuleService
         sm.shipping_method_id = sm.id
         delete sm.id
 
-        calculated.order.shipping_methods[idx] = {
+        order.shipping_methods[idx] = {
           ...shippingMethod,
           actions,
           detail: {
@@ -2237,15 +2344,6 @@ export default class OrderModuleService
         }
       })
     }
-
-    const calcOrder = calculated.order
-
-    decorateCartTotals(calcOrder as DecorateCartLikeInputDTO)
-    calcOrder.summary = calculated.summary
-
-    createRawPropertiesFromBigNumber(calcOrder)
-
-    return calcOrder
   }
 
   async cancelOrderChange(
@@ -2982,27 +3080,25 @@ export default class OrderModuleService
       { id: deduplicate(ordersIds) },
       {
         select: ["id", "version", "items.detail", "summary", "total"],
-        relations: [
-          "transactions",
-          "items",
-          "items.detail",
-          "shipping_methods",
-        ],
+        relations: ["transactions", "credit_lines"],
       },
       sharedContext
     )
 
-    orders = formatOrder(orders, {
-      entity: Order,
-    }) as OrderDTO[]
-
     const {
       itemsToUpsert,
       shippingMethodsToUpsert,
       summariesToUpsert,
       orderToUpdate,
-    } = applyChangesToOrder(orders, actionsMap, {
+    } = await applyChangesToOrder(orders, actionsMap, {
       addActionReferenceToObject: true,
+      includeTaxLinesAndAdjustementsToPreview: async (...args) => {
+        args.push(sharedContext)
+        return await this.includeTaxLinesAndAdjustementsToPreview.apply(
+          this,
+          args
+        )
+      },
     })
 
     await promiseAll([
@@ -3130,7 +3226,7 @@ export default class OrderModuleService
         id: transactionIds,
       },
       {
-        select: ["order_id", "amount"],
+        select: ["order_id", "version", "amount"],
       },
       sharedContext
     )
@@ -3162,7 +3258,7 @@ export default class OrderModuleService
         id: transactionIds,
       },
       {
-        select: ["order_id", "amount"],
+        select: ["order_id", "version", "amount"],
         withDeleted: true,
       },
       sharedContext
@@ -3187,6 +3283,7 @@ export default class OrderModuleService
   private async updateOrderPaidRefundableAmount_(
     transactionData: {
       order_id: string
+      version: number
       amount: BigNumber | number | BigNumberInput
     }[],
     isRemoved: boolean,
@@ -3195,6 +3292,7 @@ export default class OrderModuleService
     const summaries: any = await super.listOrderSummaries(
       {
         order_id: transactionData.map((trx) => trx.order_id),
+        version: transactionData[0].version,
       },
       {},
       sharedContext
@@ -3212,6 +3310,8 @@ export default class OrderModuleService
 
       const op = isRemoved ? MathBN.sub : MathBN.add
 
+      const initialTrxTotal = summary.totals.transaction_total
+
       for (const trx of trxs) {
         if (MathBN.gt(trx.amount, 0)) {
           summary.totals.paid_total = new BigNumber(
@@ -3228,11 +3328,12 @@ export default class OrderModuleService
         )
       }
 
+      const initialDiff = MathBN.sub(
+        summary.totals.transaction_total,
+        initialTrxTotal
+      )
       summary.totals.pending_difference = new BigNumber(
-        MathBN.sub(
-          summary.totals.current_order_total,
-          summary.totals.transaction_total
-        )
+        MathBN.sub(summary.totals.pending_difference, initialDiff)
       )
     })