feat(dashboard): refactor dismissed quantity (#8842)

**What**
- refactor Receive return flow to use dismissed quantity instead of written off quantity 
- fix a few more edge cases

---

FIXES CC-392

packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/constants.ts

@@ -4,7 +4,7 @@ export const ReceiveReturnSchema = z.object({
   items: z.array(
     z.object({
       quantity: z.number().nullable(),
-      written_off_quantity: z.number().nullable(),
+      dismissed_quantity: z.number().nullable(),
       item_id: z.string(),
     })
   ),

packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/dismissed-quantity.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react"
+import { useMemo, useState } from "react"
 import { HeartBroken } from "@medusajs/icons"
 import { UseFormReturn } from "react-hook-form"
 import { useTranslation } from "react-i18next"
@@ -14,7 +14,7 @@ import {
   useUpdateDismissItem,
 } from "../../../../../hooks/api/returns"
 
-type WriteOffQuantityProps = {
+type DismissedQuantityProps = {
   returnId: string
   orderId: string
   index: number
@@ -22,13 +22,13 @@ type WriteOffQuantityProps = {
   form: UseFormReturn<typeof ReceiveReturnSchema>
 }
 
-function WrittenOffQuantity({
+function DismissedQuantity({
   form,
   item,
   index,
   returnId,
   orderId,
-}: WriteOffQuantityProps) {
+}: DismissedQuantityProps) {
   const { t } = useTranslation()
   const [isOpen, setIsOpen] = useState(false)
 
@@ -47,6 +47,18 @@ function WrittenOffQuantity({
     orderId
   )
 
+  // quantities only for this return
+  const [receivedQuantity, dismissedQuantity] = useMemo(() => {
+    const receivedAction = item.actions?.find(
+      (a) => a.action === "RECEIVE_RETURN_ITEM"
+    )
+    const dismissedAction = item.actions?.find(
+      (a) => a.action === "RECEIVE_DAMAGED_RETURN_ITEM"
+    )
+
+    return [receivedAction?.details.quantity, dismissedAction?.details.quantity]
+  }, [item])
+
   const onDismissedQuantityChanged = async (value: number | null) => {
     // TODO: if out of bounds prevent sending and notify user
 
@@ -55,11 +67,10 @@ function WrittenOffQuantity({
     )
 
     if (typeof value === "number" && value < 0) {
-      form.setValue(
+      form.setValue(`items.${index}.dismissed_quantity`, dismissedQuantity, {
-        `items.${index}.written_off_quantity`,
+        shouldTouch: true,
-        item.detail.written_off_quantity,
+        shouldDirty: true,
-        { shouldTouch: true, shouldDirty: true }
+      })
-      )
 
       toast.error(t("orders.returns.receive.toast.errorNegativeValue"))
 
@@ -68,13 +79,12 @@ function WrittenOffQuantity({
 
     if (
       typeof value === "number" &&
-      value > item.quantity - item.detail.return_received_quantity
+      value > item.quantity - item.detail.return_received_quantity // total received quantity across multiple returns
     ) {
-      form.setValue(
+      form.setValue(`items.${index}.dismissed_quantity`, dismissedQuantity, {
-        `items.${index}.written_off_quantity`,
+        shouldTouch: true,
-        item.detail.written_off_quantity,
+        shouldDirty: true,
-        { shouldTouch: true, shouldDirty: true }
+      })
-      )
 
       toast.error(t("orders.returns.receive.toast.errorLargeDamagedValue"))
 
@@ -108,9 +118,7 @@ function WrittenOffQuantity({
           <div>
             <HeartBroken />
           </div>
-          {!!item.detail.written_off_quantity && (
+          {!!dismissedQuantity && <span>{dismissedQuantity}</span>}
-            <span>{item.detail.written_off_quantity}</span>
-          )}
         </Button>
       </Popover.Trigger>
       <Popover.Content align="center">
@@ -120,7 +128,7 @@ function WrittenOffQuantity({
           </span>
           <Form.Field
             control={form.control}
-            name={`items.${index}.written_off_quantity`}
+            name={`items.${index}.dismissed_quantity`}
             render={({ field: { onChange, value, ...field } }) => {
               return (
                 <Form.Item className="w-full">
@@ -156,4 +164,4 @@ function WrittenOffQuantity({
   )
 }
 
-export default WrittenOffQuantity
+export default DismissedQuantity

packages/admin-next/dashboard/src/routes/orders/order-receive-return/components/order-receive-return-form/order-receive-return-form.tsx

@@ -20,7 +20,7 @@ import {
 } from "../../../../../hooks/api/returns"
 import { getStylizedAmount } from "../../../../../lib/money-amount-helpers"
 import { ReceiveReturnSchema } from "./constants"
-import WrittenOffQuantity from "./written-off-quantity"
+import DismissedQuantity from "./dismissed-quantity"
 
 type OrderAllocateItemsFormProps = {
   order: AdminOrder
@@ -90,8 +90,6 @@ export function OrderReceiveReturnForm({
         ?.sort((i1, i2) => i1.id.localeCompare(i2.id))
         .map((i) => ({
           item_id: i.id,
-          quantity: i.detail.return_received_quantity,
-          written_off_quantity: i.detail.written_off_quantity,
         })),
       send_notification: false,
     },
@@ -102,14 +100,21 @@ export function OrderReceiveReturnForm({
     previewItems
       ?.sort((i1, i2) => i1.id.localeCompare(i2.id))
       .forEach((item, index) => {
+        const receivedAction = item.actions?.find(
+          (a) => a.action === "RECEIVE_RETURN_ITEM"
+        )
+        const dismissedAction = item.actions?.find(
+          (a) => a.action === "RECEIVE_DAMAGED_RETURN_ITEM"
+        )
+
         form.setValue(
           `items.${index}.quantity`,
-          item.detail.return_received_quantity,
+          receivedAction?.details.quantity,
           { shouldTouch: true, shouldDirty: true }
         )
         form.setValue(
-          `items.${index}.written_off_quantity`,
+          `items.${index}.dismissed_quantity`,
-          item.detail.written_off_quantity,
+          dismissedAction?.details.quantity,
           { shouldTouch: true, shouldDirty: true }
         )
       })
@@ -255,7 +260,7 @@ export function OrderReceiveReturnForm({
                   </div>
 
                   <div className="flex flex-1 flex-row items-center gap-2">
-                    <WrittenOffQuantity
+                    <DismissedQuantity
                       form={form}
                       item={item}
                       index={ind}