@open-mercato/core 0.4.8-develop-d16e2f51dc → 0.4.8-develop-4b58cde65d

package/src/modules/sales/i18n/de.json

@@ -28,6 +28,7 @@
   "sales.audit.quotes.lines.delete": "Angebotsposition löschen",
   "sales.audit.quotes.lines.upsert": "Angebotsposition aktualisieren",
   "sales.audit.quotes.update": "Angebot aktualisieren",
+  "sales.audit.returns.create": "Rückgabe erstellen",
   "sales.audit.shipments.create": "Sendung erstellen",
   "sales.audit.shipments.delete": "Sendung löschen",
   "sales.audit.shipments.update": "Sendung aktualisieren",
@@ -439,6 +440,7 @@
   "sales.documents.adjustments.kindLabel": "Typ",
   "sales.documents.adjustments.kindLabels.custom": "Benutzerdefiniert",
   "sales.documents.adjustments.kindLabels.discount": "Rabatt",
+  "sales.documents.adjustments.kindLabels.return": "Rückgabe",
   "sales.documents.adjustments.kindLabels.shipping": "Versand",
   "sales.documents.adjustments.kindLabels.surcharge": "Zuschlag",
   "sales.documents.adjustments.kindLabels.tax": "Steuer",
@@ -506,6 +508,7 @@
   "sales.documents.detail.adjustments.kindLabel": "Typ",
   "sales.documents.detail.adjustments.kindLabels.custom": "Benutzerdefiniert",
   "sales.documents.detail.adjustments.kindLabels.discount": "Rabatt",
+  "sales.documents.detail.adjustments.kindLabels.return": "Rückgabe",
   "sales.documents.detail.adjustments.kindLabels.shipping": "Versand",
   "sales.documents.detail.adjustments.kindLabels.surcharge": "Zuschlag",
   "sales.documents.detail.adjustments.kindLabels.tax": "Steuer",
@@ -759,6 +762,7 @@
   "sales.documents.detail.tabs.comments": "Kommentare",
   "sales.documents.detail.tabs.items": "Positionen",
   "sales.documents.detail.tabs.payments": "Zahlungen",
+  "sales.documents.detail.tabs.returns": "Rückgaben",
   "sales.documents.detail.tabs.shipments": "Sendungen",
   "sales.documents.detail.tags": "Tags",
   "sales.documents.detail.tags.cancelShortcut": "Abbrechen (Esc)",
@@ -1247,6 +1251,34 @@
   "sales.quotes.send.title": "Angebot an Kunden senden",
   "sales.quotes.send.validForDays": "Gültig für (Tage)",
   "sales.quotes.update": "Angebot aktualisieren",
+  "sales.returns.available": "Verfügbar",
+  "sales.returns.create": "Rückgabe erstellen",
+  "sales.returns.create.lines": "Positionen",
+  "sales.returns.create.submit": "Rückgabe erstellen",
+  "sales.returns.create.title": "Rückgabe erstellen",
+  "sales.returns.created": "Rückgabe erstellt.",
+  "sales.returns.empty.available": "Keine Artikel zur Rückgabe verfügbar.",
+  "sales.returns.empty.description": "Erstelle eine Rückgabe, um Gutschriften für zurückgesendete Artikel zu erzeugen.",
+  "sales.returns.empty.title": "Noch keine Rückgaben.",
+  "sales.returns.error": "Rückgabe konnte nicht geladen werden.",
+  "sales.returns.errors.create": "Rückgabe konnte nicht erstellt werden.",
+  "sales.returns.errors.linesRequired": "Wähle mindestens eine Position zur Rückgabe aus.",
+  "sales.returns.errors.load": "Rückgaben konnten nicht geladen werden.",
+  "sales.returns.errors.quantityExceeded": "Es kann nicht mehr als die verfügbare Menge zurückgegeben werden.",
+  "sales.returns.lineMissing": "Bestellposition nicht gefunden.",
+  "sales.returns.linesRequired": "Wähle mindestens eine Position zur Rückgabe aus.",
+  "sales.returns.notFound": "Rückgabe nicht gefunden.",
+  "sales.returns.notSet": "Nicht festgelegt",
+  "sales.returns.notes": "Notizen",
+  "sales.returns.notes.placeholder": "Optional",
+  "sales.returns.orderMissing": "Bestellung nicht gefunden.",
+  "sales.returns.quantity": "Menge",
+  "sales.returns.quantityExceeded": "Es kann nicht mehr als die verbleibende Menge zurückgegeben werden.",
+  "sales.returns.reason": "Grund",
+  "sales.returns.reason.placeholder": "Optional",
+  "sales.returns.returnNumber": "Rückgabe",
+  "sales.returns.returnedAt": "Rückgabedatum",
+  "sales.returns.total": "Summe",
   "sales.search.badge.address": "Adresse",
   "sales.search.badge.channel": "Kanal",
   "sales.search.badge.creditMemo": "Gutschrift",

package/src/modules/sales/i18n/en.json

@@ -28,6 +28,7 @@
   "sales.audit.quotes.lines.delete": "Delete quote line",
   "sales.audit.quotes.lines.upsert": "Update quote line",
   "sales.audit.quotes.update": "Update sales quote",
+  "sales.audit.returns.create": "Create return",
   "sales.audit.shipments.create": "Create shipment",
   "sales.audit.shipments.delete": "Delete shipment",
   "sales.audit.shipments.update": "Update shipment",
@@ -439,6 +440,7 @@
   "sales.documents.adjustments.kindLabel": "Kind",
   "sales.documents.adjustments.kindLabels.custom": "Custom",
   "sales.documents.adjustments.kindLabels.discount": "Discount",
+  "sales.documents.adjustments.kindLabels.return": "Return",
   "sales.documents.adjustments.kindLabels.shipping": "Shipping",
   "sales.documents.adjustments.kindLabels.surcharge": "Surcharge",
   "sales.documents.adjustments.kindLabels.tax": "Tax",
@@ -506,6 +508,7 @@
   "sales.documents.detail.adjustments.kindLabel": "Kind",
   "sales.documents.detail.adjustments.kindLabels.custom": "Custom",
   "sales.documents.detail.adjustments.kindLabels.discount": "Discount",
+  "sales.documents.detail.adjustments.kindLabels.return": "Return",
   "sales.documents.detail.adjustments.kindLabels.shipping": "Shipping",
   "sales.documents.detail.adjustments.kindLabels.surcharge": "Surcharge",
   "sales.documents.detail.adjustments.kindLabels.tax": "Tax",
@@ -759,6 +762,7 @@
   "sales.documents.detail.tabs.comments": "Comments",
   "sales.documents.detail.tabs.items": "Items",
   "sales.documents.detail.tabs.payments": "Payments",
+  "sales.documents.detail.tabs.returns": "Returns",
   "sales.documents.detail.tabs.shipments": "Shipments",
   "sales.documents.detail.tags": "Tags",
   "sales.documents.detail.tags.cancelShortcut": "Cancel (Esc)",
@@ -1247,6 +1251,34 @@
   "sales.quotes.send.title": "Send quote to customer",
   "sales.quotes.send.validForDays": "Valid for (days)",
   "sales.quotes.update": "Update sales quote",
+  "sales.returns.available": "Available",
+  "sales.returns.create": "Create return",
+  "sales.returns.create.lines": "Lines",
+  "sales.returns.create.submit": "Create return",
+  "sales.returns.create.title": "Create return",
+  "sales.returns.created": "Return created.",
+  "sales.returns.empty.available": "No items available to return.",
+  "sales.returns.empty.description": "Create a return to generate credit adjustments for returned items.",
+  "sales.returns.empty.title": "No returns yet.",
+  "sales.returns.error": "Failed to load return.",
+  "sales.returns.errors.create": "Failed to create return.",
+  "sales.returns.errors.linesRequired": "Select at least one line to return.",
+  "sales.returns.errors.load": "Failed to load returns.",
+  "sales.returns.errors.quantityExceeded": "Cannot return more than available quantity.",
+  "sales.returns.lineMissing": "Order line not found.",
+  "sales.returns.linesRequired": "Select at least one line to return.",
+  "sales.returns.notFound": "Return not found.",
+  "sales.returns.notSet": "Not set",
+  "sales.returns.notes": "Notes",
+  "sales.returns.notes.placeholder": "Optional",
+  "sales.returns.orderMissing": "Order not found.",
+  "sales.returns.quantity": "Quantity",
+  "sales.returns.quantityExceeded": "Cannot return more than the remaining quantity.",
+  "sales.returns.reason": "Reason",
+  "sales.returns.reason.placeholder": "Optional",
+  "sales.returns.returnNumber": "Return",
+  "sales.returns.returnedAt": "Returned at",
+  "sales.returns.total": "Total",
   "sales.search.badge.address": "Address",
   "sales.search.badge.channel": "Channel",
   "sales.search.badge.creditMemo": "Credit memo",

package/src/modules/sales/i18n/es.json

@@ -28,6 +28,7 @@
   "sales.audit.quotes.lines.delete": "Eliminar línea de cotización",
   "sales.audit.quotes.lines.upsert": "Actualizar línea de cotización",
   "sales.audit.quotes.update": "Actualizar cotización",
+  "sales.audit.returns.create": "Crear devolución",
   "sales.audit.shipments.create": "Crear envío",
   "sales.audit.shipments.delete": "Eliminar envío",
   "sales.audit.shipments.update": "Actualizar envío",
@@ -439,6 +440,7 @@
   "sales.documents.adjustments.kindLabel": "Tipo",
   "sales.documents.adjustments.kindLabels.custom": "Personalizado",
   "sales.documents.adjustments.kindLabels.discount": "Descuento",
+  "sales.documents.adjustments.kindLabels.return": "Devolución",
   "sales.documents.adjustments.kindLabels.shipping": "Envío",
   "sales.documents.adjustments.kindLabels.surcharge": "Recargo",
   "sales.documents.adjustments.kindLabels.tax": "Impuesto",
@@ -506,6 +508,7 @@
   "sales.documents.detail.adjustments.kindLabel": "Tipo",
   "sales.documents.detail.adjustments.kindLabels.custom": "Personalizado",
   "sales.documents.detail.adjustments.kindLabels.discount": "Descuento",
+  "sales.documents.detail.adjustments.kindLabels.return": "Devolución",
   "sales.documents.detail.adjustments.kindLabels.shipping": "Envío",
   "sales.documents.detail.adjustments.kindLabels.surcharge": "Recargo",
   "sales.documents.detail.adjustments.kindLabels.tax": "Impuesto",
@@ -759,6 +762,7 @@
   "sales.documents.detail.tabs.comments": "Comentarios",
   "sales.documents.detail.tabs.items": "Artículos",
   "sales.documents.detail.tabs.payments": "Pagos",
+  "sales.documents.detail.tabs.returns": "Devoluciones",
   "sales.documents.detail.tabs.shipments": "Envíos",
   "sales.documents.detail.tags": "Etiquetas",
   "sales.documents.detail.tags.cancelShortcut": "Cancelar (Esc)",
@@ -1247,6 +1251,34 @@
   "sales.quotes.send.title": "Enviar cotización al cliente",
   "sales.quotes.send.validForDays": "Válida por (días)",
   "sales.quotes.update": "Actualizar cotización",
+  "sales.returns.available": "Disponible",
+  "sales.returns.create": "Crear devolución",
+  "sales.returns.create.lines": "Líneas",
+  "sales.returns.create.submit": "Crear devolución",
+  "sales.returns.create.title": "Crear devolución",
+  "sales.returns.created": "Devolución creada.",
+  "sales.returns.empty.available": "No hay artículos disponibles para devolver.",
+  "sales.returns.empty.description": "Crea una devolución para generar ajustes de crédito por artículos devueltos.",
+  "sales.returns.empty.title": "Aún no hay devoluciones.",
+  "sales.returns.error": "No se pudo cargar la devolución.",
+  "sales.returns.errors.create": "No se pudo crear la devolución.",
+  "sales.returns.errors.linesRequired": "Selecciona al menos una línea para devolver.",
+  "sales.returns.errors.load": "No se pudieron cargar las devoluciones.",
+  "sales.returns.errors.quantityExceeded": "No se puede devolver más que la cantidad disponible.",
+  "sales.returns.lineMissing": "No se encontró la línea del pedido.",
+  "sales.returns.linesRequired": "Selecciona al menos una línea para devolver.",
+  "sales.returns.notFound": "Devolución no encontrada.",
+  "sales.returns.notSet": "No establecido",
+  "sales.returns.notes": "Notas",
+  "sales.returns.notes.placeholder": "Opcional",
+  "sales.returns.orderMissing": "Pedido no encontrado.",
+  "sales.returns.quantity": "Cantidad",
+  "sales.returns.quantityExceeded": "No se puede devolver más que la cantidad restante.",
+  "sales.returns.reason": "Motivo",
+  "sales.returns.reason.placeholder": "Opcional",
+  "sales.returns.returnNumber": "Devolución",
+  "sales.returns.returnedAt": "Devuelto el",
+  "sales.returns.total": "Total",
   "sales.search.badge.address": "Dirección",
   "sales.search.badge.channel": "Canal",
   "sales.search.badge.creditMemo": "Nota de crédito",

package/src/modules/sales/i18n/pl.json

@@ -28,6 +28,7 @@
   "sales.audit.quotes.lines.delete": "Usuń pozycję oferty",
   "sales.audit.quotes.lines.upsert": "Zaktualizuj pozycję oferty",
   "sales.audit.quotes.update": "Aktualizuj ofertę",
+  "sales.audit.returns.create": "Utwórz zwrot",
   "sales.audit.shipments.create": "Utwórz wysyłkę",
   "sales.audit.shipments.delete": "Usuń wysyłkę",
   "sales.audit.shipments.update": "Aktualizuj wysyłkę",
@@ -439,6 +440,7 @@
   "sales.documents.adjustments.kindLabel": "Typ",
   "sales.documents.adjustments.kindLabels.custom": "Niestandardowe",
   "sales.documents.adjustments.kindLabels.discount": "Rabat",
+  "sales.documents.adjustments.kindLabels.return": "Zwrot",
   "sales.documents.adjustments.kindLabels.shipping": "Wysyłka",
   "sales.documents.adjustments.kindLabels.surcharge": "Dopłata",
   "sales.documents.adjustments.kindLabels.tax": "Podatek",
@@ -506,6 +508,7 @@
   "sales.documents.detail.adjustments.kindLabel": "Typ",
   "sales.documents.detail.adjustments.kindLabels.custom": "Niestandardowe",
   "sales.documents.detail.adjustments.kindLabels.discount": "Rabat",
+  "sales.documents.detail.adjustments.kindLabels.return": "Zwrot",
   "sales.documents.detail.adjustments.kindLabels.shipping": "Wysyłka",
   "sales.documents.detail.adjustments.kindLabels.surcharge": "Dopłata",
   "sales.documents.detail.adjustments.kindLabels.tax": "Podatek",
@@ -759,6 +762,7 @@
   "sales.documents.detail.tabs.comments": "Komentarze",
   "sales.documents.detail.tabs.items": "Pozycje",
   "sales.documents.detail.tabs.payments": "Płatności",
+  "sales.documents.detail.tabs.returns": "Zwroty",
   "sales.documents.detail.tabs.shipments": "Wysyłki",
   "sales.documents.detail.tags": "Tagi",
   "sales.documents.detail.tags.cancelShortcut": "Anuluj (Esc)",
@@ -1247,6 +1251,34 @@
   "sales.quotes.send.title": "Wyślij ofertę do klienta",
   "sales.quotes.send.validForDays": "Ważne przez (dni)",
   "sales.quotes.update": "Aktualizuj ofertę",
+  "sales.returns.available": "Dostępne",
+  "sales.returns.create": "Utwórz zwrot",
+  "sales.returns.create.lines": "Pozycje",
+  "sales.returns.create.submit": "Utwórz zwrot",
+  "sales.returns.create.title": "Utwórz zwrot",
+  "sales.returns.created": "Zwrot utworzony.",
+  "sales.returns.empty.available": "Brak pozycji dostępnych do zwrotu.",
+  "sales.returns.empty.description": "Utwórz zwrot, aby wygenerować korekty kredytowe dla zwróconych pozycji.",
+  "sales.returns.empty.title": "Brak zwrotów.",
+  "sales.returns.error": "Nie udało się załadować zwrotu.",
+  "sales.returns.errors.create": "Nie udało się utworzyć zwrotu.",
+  "sales.returns.errors.linesRequired": "Wybierz co najmniej jedną pozycję do zwrotu.",
+  "sales.returns.errors.load": "Nie udało się załadować zwrotów.",
+  "sales.returns.errors.quantityExceeded": "Nie można zwrócić więcej niż dostępna ilość.",
+  "sales.returns.lineMissing": "Nie znaleziono pozycji zamówienia.",
+  "sales.returns.linesRequired": "Wybierz co najmniej jedną pozycję do zwrotu.",
+  "sales.returns.notFound": "Nie znaleziono zwrotu.",
+  "sales.returns.notSet": "Nie ustawiono",
+  "sales.returns.notes": "Notatki",
+  "sales.returns.notes.placeholder": "Opcjonalne",
+  "sales.returns.orderMissing": "Nie znaleziono zamówienia.",
+  "sales.returns.quantity": "Ilość",
+  "sales.returns.quantityExceeded": "Nie można zwrócić więcej niż pozostała ilość.",
+  "sales.returns.reason": "Powód",
+  "sales.returns.reason.placeholder": "Opcjonalny",
+  "sales.returns.returnNumber": "Zwrot",
+  "sales.returns.returnedAt": "Data zwrotu",
+  "sales.returns.total": "Suma",
   "sales.search.badge.address": "Adres",
   "sales.search.badge.channel": "Kanał",
   "sales.search.badge.creditMemo": "Nota kredytowa",

package/src/modules/sales/lib/calculations.ts

@@ -190,6 +190,15 @@ function buildBaseDocumentResult(params: {
     }
   }
 
+  // Line-scoped and any other return (credit) adjustments reduce grand total
+  for (const adj of resolvedAdjustments) {
+    if (adj.kind !== 'return') continue
+    const net = toNumber(adj.amountNet, toNumber(adj.amountGross))
+    const gross = toNumber(adj.amountGross, net)
+    subtotalNet = Math.max(subtotalNet + net, 0)
+    subtotalGross = Math.max(subtotalGross + gross, 0)
+  }
+
   const grandTotalNet = round(subtotalNet)
   const grandTotalGross = round(subtotalGross)
   const paidTotalAmount = Math.max(toNumber(params.existingTotals?.paidTotalAmount, 0), 0)

package/src/modules/sales/lib/dictionaries.ts

@@ -173,6 +173,7 @@ const ADJUSTMENT_KIND_DEFAULTS: SalesDictionarySeed[] = [
   { value: 'tax', label: 'Tax' },
   { value: 'shipping', label: 'Shipping' },
   { value: 'surcharge', label: 'Surcharge' },
+  { value: 'return', label: 'Return' },
   { value: 'custom', label: 'Custom' },
 ]
 

package/src/modules/sales/lib/documentNumberTokens.ts

@@ -1,7 +1,8 @@
-export type SalesDocumentNumberKind = 'quote' | 'order'
+export type SalesDocumentNumberKind = 'quote' | 'order' | 'return'
 
 export const DEFAULT_ORDER_NUMBER_FORMAT = 'ORDER-{yyyy}{mm}{dd}-{seq:5}'
 export const DEFAULT_QUOTE_NUMBER_FORMAT = 'QUOTE-{yyyy}{mm}{dd}-{seq:5}'
+export const DEFAULT_RETURN_NUMBER_FORMAT = 'RET-{yyyy}{mm}{dd}-{seq:5}'
 
 export const DOCUMENT_NUMBER_TOKENS: Array<{ token: string; description: string }> = [
   { token: '{yyyy}', description: '4-digit year, e.g. 2025' },

package/src/modules/sales/lib/historyHelpers.ts

@@ -21,10 +21,13 @@ function extractStatusFromSnapshot(snapshot: unknown): string | null {
   const s = snapshot as Record<string, unknown>
   // Dedicated logStatusChange entries: { status: "value" }
   if (typeof s.status === 'string') return s.status
-  // Regular update snapshots: { order: { status: "value", ... } }
+  // Regular update snapshots: { order: { status, fulfillment_status, payment_status, ... } }
   if (s.order && typeof s.order === 'object') {
     const order = s.order as Record<string, unknown>
-    if (typeof order.status === 'string') return order.status
+    const orderStatus = typeof order.status === 'string' ? order.status : null
+    const fulfillmentStatus = typeof order.fulfillment_status === 'string' ? order.fulfillment_status : null
+    const paymentStatus = typeof order.payment_status === 'string' ? order.payment_status : null
+    return orderStatus ?? fulfillmentStatus ?? paymentStatus ?? null
   }
   // Regular update snapshots: { quote: { status: "value", ... } }
   if (s.quote && typeof s.quote === 'object') {
@@ -38,12 +41,16 @@ export function detectStatusChange(log: ActionLog): {
   statusFrom: string | null
   statusTo: string | null
 } | null {
-  // Skip creations — no previous state means no transition
-  if (!log.snapshotBefore) return null
-  const before = extractStatusFromSnapshot(log.snapshotBefore)
   const after = extractStatusFromSnapshot(log.snapshotAfter)
+  const before = log.snapshotBefore
+    ? extractStatusFromSnapshot(log.snapshotBefore)
+    : null
+  // Creation (no snapshotBefore): always one status entry (initial value or "created")
+  if (!log.snapshotBefore) {
+    return { statusFrom: null, statusTo: after ?? null }
+  }
   if (before !== after && (before !== null || after !== null)) {
-    return { statusFrom: before, statusTo: after }
+    return { statusFrom: before, statusTo: after ?? null }
   }
   return null
 }
@@ -61,9 +68,13 @@ export function normalizeActionLogToHistoryEntry(
   let action = log.actionLabel || log.commandId
   let metadata: HistoryEntry['metadata'] = { documentKind: kind, commandId: log.commandId }
   if (statusChange) {
-    entryKind = 'status'
-    action = statusChange.statusTo ?? 'unknown'
-    metadata = { ...metadata, statusFrom: statusChange.statusFrom, statusTo: statusChange.statusTo }
+    const hasStatusValues = statusChange.statusFrom != null || statusChange.statusTo != null
+    if (hasStatusValues) {
+      entryKind = 'status'
+      action = statusChange.statusTo ?? 'unknown'
+      metadata = { ...metadata, statusFrom: statusChange.statusFrom, statusTo: statusChange.statusTo }
+    }
+    // When both are null (e.g. Create return/shipment/payment with non-document snapshot), keep as action and use actionLabel
   }
   const actorLabel = log.actorUserId
     ? (displayUsers?.[log.actorUserId] ?? log.actorUserId)

package/src/modules/sales/lib/makeSalesLineRoute.ts

@@ -158,43 +158,48 @@ export function makeSalesLineRoute(config: SalesLineRouteConfig) {
     list: {
       schema: listSchema,
       entityId,
-      fields: [
-        F.id,
-        parentFkColumn,
-        F.line_number,
-        F.kind,
-        F.status_entry_id,
-        F.status,
-        F.product_id,
-        F.product_variant_id,
-        F.catalog_snapshot,
-        F.name,
-        F.description,
-        F.comment,
-        F.organization_id,
-        F.tenant_id,
-        F.quantity,
-        F.quantity_unit,
-        F.normalized_quantity,
-        F.normalized_unit,
-        F.uom_snapshot,
-        F.currency_code,
-        F.unit_price_net,
-        F.unit_price_gross,
-        F.discount_amount,
-        F.discount_percent,
-        F.tax_rate,
-        F.tax_amount,
-        F.total_net_amount,
-        F.total_gross_amount,
-        F.configuration,
-        F.promotion_code,
-        F.promotion_snapshot,
-        F.metadata,
-        F.custom_field_set_id,
-        F.created_at,
-        F.updated_at,
-      ],
+      fields: (() => {
+        const fields: string[] = [
+          F.id,
+          parentFkColumn,
+          F.line_number,
+          F.kind,
+          F.status_entry_id,
+          F.status,
+          F.product_id,
+          F.product_variant_id,
+          F.catalog_snapshot,
+          F.name,
+          F.description,
+          F.comment,
+          F.organization_id,
+          F.tenant_id,
+          F.quantity,
+          F.quantity_unit,
+          F.normalized_quantity,
+          F.normalized_unit,
+          F.uom_snapshot,
+          F.currency_code,
+          F.unit_price_net,
+          F.unit_price_gross,
+          F.discount_amount,
+          F.discount_percent,
+          F.tax_rate,
+          F.tax_amount,
+          F.total_net_amount,
+          F.total_gross_amount,
+          F.configuration,
+          F.promotion_code,
+          F.promotion_snapshot,
+          F.metadata,
+          F.custom_field_set_id,
+          F.created_at,
+          F.updated_at,
+        ]
+        const returnedQuantity = F['returned_quantity']
+        if (typeof returnedQuantity === 'string') fields.push(returnedQuantity)
+        return fields
+      })(),
       sortFieldMap: {
         createdAt: F.created_at,
         updatedAt: F.updated_at,