From f2ca829b3666402ca72a6ef46293311254491b86 Mon Sep 17 00:00:00 2001 From: Nino Date: Mon, 12 May 2025 16:01:39 +0200 Subject: [PATCH] OMS Api Update --- generated/swagger/oms-api/src/models.ts | 2 +- .../src/models/return-receipt-values-dto.ts | 5 +++ .../oms-api/src/services/receipt.service.ts | 35 +++++-------------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/generated/swagger/oms-api/src/models.ts b/generated/swagger/oms-api/src/models.ts index e4e76920e..56d6d9f20 100644 --- a/generated/swagger/oms-api/src/models.ts +++ b/generated/swagger/oms-api/src/models.ts @@ -237,6 +237,7 @@ export { OrderItemStatusValuesDTO } from './models/order-item-status-values-dto' export { ResponseArgsOfPayerDTO } from './models/response-args-of-payer-dto'; export { ResponseArgsOfShippingAddressDTO } from './models/response-args-of-shipping-address-dto'; export { ResponseArgsOfReceiptDTO } from './models/response-args-of-receipt-dto'; +export { ReturnReceiptValuesDTO } from './models/return-receipt-values-dto'; export { ResponseArgsOfReceiptItemTaskListItemDTO } from './models/response-args-of-receipt-item-task-list-item-dto'; export { ReceiptItemTaskListItemDTO } from './models/receipt-item-task-list-item-dto'; export { ResponseArgsOfIEnumerableOfReceiptDTO } from './models/response-args-of-ienumerable-of-receipt-dto'; @@ -249,7 +250,6 @@ export { ReceiptListItemDTO } from './models/receipt-list-item-dto'; export { ListResponseArgsOfReceiptItemListItemDTO } from './models/list-response-args-of-receipt-item-list-item-dto'; export { ResponseArgsOfIEnumerableOfReceiptItemListItemDTO } from './models/response-args-of-ienumerable-of-receipt-item-list-item-dto'; export { ReceiptItemListItemDTO } from './models/receipt-item-list-item-dto'; -export { ReturnReceiptValuesDTO } from './models/return-receipt-values-dto'; export { ListResponseArgsOfReceiptItemTaskListItemDTO } from './models/list-response-args-of-receipt-item-task-list-item-dto'; export { ResponseArgsOfIEnumerableOfReceiptItemTaskListItemDTO } from './models/response-args-of-ienumerable-of-receipt-item-task-list-item-dto'; export { ResponseArgsOfIEnumerableOfValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO } from './models/response-args-of-ienumerable-of-value-tuple-of-long-and-receipt-type-and-entity-dtocontainer-of-receipt-dto'; diff --git a/generated/swagger/oms-api/src/models/return-receipt-values-dto.ts b/generated/swagger/oms-api/src/models/return-receipt-values-dto.ts index 9c240b7ee..c3c7df003 100644 --- a/generated/swagger/oms-api/src/models/return-receipt-values-dto.ts +++ b/generated/swagger/oms-api/src/models/return-receipt-values-dto.ts @@ -7,6 +7,11 @@ import { EntityDTOContainerOfReceiptItemDTO } from './entity-dtocontainer-of-rec */ export interface ReturnReceiptValuesDTO { + /** + * Category / Artikelkategorie + */ + category?: string; + /** * Comment / Anmerkung */ diff --git a/generated/swagger/oms-api/src/services/receipt.service.ts b/generated/swagger/oms-api/src/services/receipt.service.ts index 88c20d8d1..f7d79bf28 100644 --- a/generated/swagger/oms-api/src/services/receipt.service.ts +++ b/generated/swagger/oms-api/src/services/receipt.service.ts @@ -10,6 +10,7 @@ import { map as __map, filter as __filter } from 'rxjs/operators'; import { ResponseArgsOfQuerySettingsDTO } from '../models/response-args-of-query-settings-dto'; import { ResponseArgsOfReceiptDTO } from '../models/response-args-of-receipt-dto'; import { ResponseArgsOfBoolean } from '../models/response-args-of-boolean'; +import { ReturnReceiptValuesDTO } from '../models/return-receipt-values-dto'; import { ResponseArgsOfReceiptItemTaskListItemDTO } from '../models/response-args-of-receipt-item-task-list-item-dto'; import { ResponseArgsOfIEnumerableOfReceiptDTO } from '../models/response-args-of-ienumerable-of-receipt-dto'; import { GenerateCollectiveReceiptsArgs } from '../models/generate-collective-receipts-args'; @@ -18,7 +19,6 @@ import { DateRange } from '../models/date-range'; import { ListResponseArgsOfReceiptListItemDTO } from '../models/list-response-args-of-receipt-list-item-dto'; import { QueryTokenDTO } from '../models/query-token-dto'; import { ListResponseArgsOfReceiptItemListItemDTO } from '../models/list-response-args-of-receipt-item-list-item-dto'; -import { ReturnReceiptValuesDTO } from '../models/return-receipt-values-dto'; import { ListResponseArgsOfReceiptItemTaskListItemDTO } from '../models/list-response-args-of-receipt-item-task-list-item-dto'; import { ResponseArgsOfIEnumerableOfValueTupleOfLongAndReceiptTypeAndEntityDTOContainerOfReceiptDTO } from '../models/response-args-of-ienumerable-of-value-tuple-of-long-and-receipt-type-and-entity-dtocontainer-of-receipt-dto'; import { ReceiptOrderItemSubsetReferenceValues } from '../models/receipt-order-item-subset-reference-values'; @@ -28,7 +28,7 @@ import { ReceiptOrderItemSubsetReferenceValues } from '../models/receipt-order-i class ReceiptService extends __BaseService { static readonly ReceiptQueryReceiptSettingsPath = '/receipt/s/settings'; static readonly ReceiptGetReceiptPath = '/receipt/{receiptId}'; - static readonly ReceiptCanReturnPath = '/receipt/{receiptId}/item/{receiptItemId}/can-return'; + static readonly ReceiptCanReturnPath = '/receipt/item/can-return'; static readonly ReceiptSetReceiptItemTaskToOKPath = '/receipt/item/task/{taskId}/ok'; static readonly ReceiptSetReceiptItemTaskToNOKPath = '/receipt/item/task/{taskId}/nok'; static readonly ReceiptGenerateCollectiveReceiptsPath = '/receipt/collectivereceipts'; @@ -129,21 +129,16 @@ class ReceiptService extends __BaseService { /** * Prüfen, ob eine Rückgabe möglich ist - * @param params The `ReceiptService.ReceiptCanReturnParams` containing the following parameters: - * - * - `receiptItemId`: - * - * - `receiptId`: + * @param item undefined */ - ReceiptCanReturnResponse(params: ReceiptService.ReceiptCanReturnParams): __Observable<__StrictHttpResponse> { + ReceiptCanReturnResponse(item: ReturnReceiptValuesDTO): __Observable<__StrictHttpResponse> { let __params = this.newParams(); let __headers = new HttpHeaders(); let __body: any = null; - - + __body = item; let req = new HttpRequest( 'POST', - this.rootUrl + `/receipt/${encodeURIComponent(String(params.receiptId))}/item/${encodeURIComponent(String(params.receiptItemId))}/can-return`, + this.rootUrl + `/receipt/item/can-return`, __body, { headers: __headers, @@ -160,14 +155,10 @@ class ReceiptService extends __BaseService { } /** * Prüfen, ob eine Rückgabe möglich ist - * @param params The `ReceiptService.ReceiptCanReturnParams` containing the following parameters: - * - * - `receiptItemId`: - * - * - `receiptId`: + * @param item undefined */ - ReceiptCanReturn(params: ReceiptService.ReceiptCanReturnParams): __Observable { - return this.ReceiptCanReturnResponse(params).pipe( + ReceiptCanReturn(item: ReturnReceiptValuesDTO): __Observable { + return this.ReceiptCanReturnResponse(item).pipe( __map(_r => _r.body as ResponseArgsOfBoolean) ); } @@ -784,14 +775,6 @@ module ReceiptService { eagerLoading?: number; } - /** - * Parameters for ReceiptCanReturn - */ - export interface ReceiptCanReturnParams { - receiptItemId: number; - receiptId: number; - } - /** * Parameters for ReceiptQueryReceipt */