feat(model): add SalesReturn and SalesReturnPosition

src/model/AbstractReturn.ts

@@ -0,0 +1,21 @@
+import type {
+  DocumentWithPositions,
+  DocumentWithPositionsPatch,
+  EntityRef,
+  HasVat
+} from '.'
+import type { PartialNullable } from '../tools'
+
+export type ReturnMetaType = 'salesreturn' | 'retailsalesreturn'
+
+export type AbstractReturnFields = {
+  demand: EntityRef<'demand'>
+}
+
+export type AbstractReturn<T extends ReturnMetaType> =
+  DocumentWithPositions<T> & HasVat
+
+export type AbstractReturnPatch<T extends ReturnMetaType> =
+  DocumentWithPositionsPatch<T> &
+    PartialNullable<Pick<AbstractReturnFields, 'demand'>> &
+    Partial<HasVat>

src/model/MetaType.ts

@@ -30,7 +30,10 @@ import type {
   ProductFolder,
   RetailDemand,
   SelectKeysByType,
-  State
+  State,
+  SalesReturn,
+  RetailSalesReturn,
+  SalesReturnPosition
 } from '.'
 
 export type MetaType =
@@ -202,11 +205,11 @@ export type EntityByMetaType = {
   retaildemand: RetailDemand
   retaildrawercashin: Entity<'retaildrawercashin'>
   retaildrawercashout: Entity<'retaildrawercashout'>
-  retailsalesreturn: Entity<'retailsalesreturn'>
+  retailsalesreturn: RetailSalesReturn
   retailshift: Entity<'retailshift'>
   retailstore: Entity<'retailstore'>
-  salesreturn: Entity<'salesreturn'>
-  salesreturnposition: Position<'salesreturnposition'>
+  salesreturn: SalesReturn
+  salesreturnposition: SalesReturnPosition
   service: Entity<'service'>
   specialpricediscount: Entity<'specialpricediscount'>
   state: State

src/model/Position.ts

@@ -37,6 +37,7 @@ export type DocumentPositionType = {
   purchasereturn: 'purchasereturnposition'
   retaildemand: 'demandposition'
   salesreturn: 'salesreturnposition'
+  retailsalesreturn: 'salesreturnposition'
   supply: 'supplyposition'
 }
 

src/model/RetailSalesReturn.ts

@@ -0,0 +1,26 @@
+import type {
+  AbstractReturn,
+  AbstractReturnPatch,
+  EntityRef,
+  TaxSystem
+} from '.'
+import type { PartialNullable } from '../tools'
+
+export type RetailSalesReturnFields = {
+  retailStore: EntityRef<'retailstore'>
+
+  retailShift: EntityRef<'retailshift'>
+
+  taxSystem: TaxSystem
+
+  readonly cashSum: number
+  readonly noCashSum: number
+  readonly qrSum: number
+}
+
+export type RetailSalesReturn = AbstractReturn<'retailsalesreturn'>
+
+export type RetailSalesReturnPatch = AbstractReturnPatch<'retailsalesreturn'> &
+  PartialNullable<
+    Pick<RetailSalesReturnFields, 'retailStore' | 'retailShift' | 'taxSystem'>
+  >

src/model/SalesReturn.ts

@@ -0,0 +1,10 @@
+import type { AbstractReturn, AbstractReturnPatch, EntityRef } from '.'
+
+export type SalesReturnFields = {
+  readonly payedSum: number
+}
+
+export type SalesReturn = AbstractReturn<'salesreturn'>
+
+export type SalesReturnPatch = AbstractReturnPatch<'salesreturn'>
+// & PartialNullable<Pick<SalesReturnFields, 'demand'>>

src/model/SalesReturnPosition.ts

@@ -0,0 +1,28 @@
+import type { EntityRef, Position, PositionPatch } from '.'
+import type { PartialNullable } from '../tools'
+
+export type SalesReturnPositionFields = {
+  /**
+   * НДС
+   */
+  vat: number
+
+  // TODO vatEnabled: разобраться с где и как отмечается в позициях
+  vatEnabled: boolean
+
+  /** ГТД (только для salesreturn) */
+  gtd?: {
+    name: string
+  }
+
+  /** Страна (только для salesreturn) */
+  country?: EntityRef<'country'>
+}
+
+export type SalesReturnPosition = Position<'salesreturnposition'> &
+  SalesReturnPositionFields
+
+export type SalesReturnPositionPatch = PositionPatch<'demandposition'> &
+  PartialNullable<
+    Pick<SalesReturnPositionFields, 'vat' | 'vatEnabled' | 'gtd' | 'country'>
+  >

src/model/index.ts

@@ -4,6 +4,7 @@
 export * from './AbstractDemand'
 export * from './AbstractFile'
 export * from './AbstractGood'
+export * from './AbstractReturn'
 export * from './Account'
 export * from './Address'
 export * from './Agent'
@@ -67,6 +68,9 @@ export * from './ProductFolder'
 export * from './Rate'
 export * from './RetailDemand'
 export * from './State'
+export * from './SalesReturn'
+export * from './RetailSalesReturn'
+export * from './SalesReturnPosition'
 export * from './TaxSystem'
 
 // Utility types

src/model/utils/Patch.ts

@@ -15,7 +15,9 @@ import type {
   MetaType,
   ProductFolderPatch,
   ProductPatch,
-  RetailDemand
+  RetailDemand,
+  SalesReturnPatch,
+  SalesReturnPositionPatch
 } from '..'
 
 export type PatchByMetaType = {
@@ -34,6 +36,8 @@ export type PatchByMetaType = {
   productfolder: ProductFolderPatch
   retaildemand: RetailDemand
   customentity: CustomEntityPatch
+  salesreturn: SalesReturnPatch
+  salesreturnposition: SalesReturnPositionPatch
 }
 
 export type Patch<T extends MetaType> = T extends keyof PatchByMetaType