Merged PR 1977: #5390 Reward Checkout Action Card - Collect Request

#5390 Reward Checkout Action Card - Collect Request

generated/swagger/oms-api/src/models.ts

@@ -37,6 +37,7 @@ export { Gender } from './models/gender';
 export { DateRangeDTO } from './models/date-range-dto';
 export { PaymentType } from './models/payment-type';
 export { PaymentStatus } from './models/payment-status';
+export { LoyaltyDTO } from './models/loyalty-dto';
 export { QueryTokenDTO } from './models/query-token-dto';
 export { ListResponseArgsOfOrderItemListItemDTO } from './models/list-response-args-of-order-item-list-item-dto';
 export { ResponseArgsOfIEnumerableOfOrderItemListItemDTO } from './models/response-args-of-ienumerable-of-order-item-list-item-dto';
@@ -130,7 +131,6 @@ export { Price } from './models/price';
 export { ShippingTarget } from './models/shipping-target';
 export { EntityDTOBaseOfShopItemDTOAndIShopItem } from './models/entity-dtobase-of-shop-item-dtoand-ishop-item';
 export { CampaignDTO } from './models/campaign-dto';
-export { LoyaltyDTO } from './models/loyalty-dto';
 export { EntityDTOBaseOfOrderItemDTOAndIOrderItem } from './models/entity-dtobase-of-order-item-dtoand-iorder-item';
 export { EntityDTOContainerOfSupplierDTO } from './models/entity-dtocontainer-of-supplier-dto';
 export { SupplierDTO } from './models/supplier-dto';
@@ -207,6 +207,8 @@ export { EntityDTOContainerOfOrderItemSubsetTransitionDTO } from './models/entit
 export { OrderItemSubsetTransitionDTO } from './models/order-item-subset-transition-dto';
 export { EntityDTOBaseOfOrderItemSubsetTransitionDTOAndIOrderItemStatusTransition } from './models/entity-dtobase-of-order-item-subset-transition-dtoand-iorder-item-status-transition';
 export { EntityDTOBaseOfOrderItemSubsetTaskDTOAndIOrderItemStatusTask } from './models/entity-dtobase-of-order-item-subset-task-dtoand-iorder-item-status-task';
+export { LoyaltyCollectValues } from './models/loyalty-collect-values';
+export { LoyaltyCollectType } from './models/loyalty-collect-type';
 export { ResponseArgsOfBoolean } from './models/response-args-of-boolean';
 export { ResponseArgsOfOrderItemDTO } from './models/response-args-of-order-item-dto';
 export { ResponseArgsOfIEnumerableOfOrderItemDTO } from './models/response-args-of-ienumerable-of-order-item-dto';

generated/swagger/oms-api/src/models/display-order-item-dto.ts

@@ -1,5 +1,6 @@
 /* tslint:disable */
 import { EntityDTOBaseOfDisplayOrderItemDTOAndIOrderItem } from './entity-dtobase-of-display-order-item-dtoand-iorder-item';
+import { LoyaltyDTO } from './loyalty-dto';
 import { DisplayOrderDTO } from './display-order-dto';
 import { PriceDTO } from './price-dto';
 import { ProductDTO } from './product-dto';
@@ -23,6 +24,11 @@ export interface DisplayOrderItemDTO extends EntityDTOBaseOfDisplayOrderItemDTOA
    */
   features?: {[key: string]: string};
 
+  /**
+   * Loylty
+   */
+  loyalty?: LoyaltyDTO;
+
   /**
    * Bestellung
    */

generated/swagger/oms-api/src/models/loyalty-collect-type.ts

@@ -0,0 +1,2 @@
+/* tslint:disable */
+export type LoyaltyCollectType = 0 | 1 | 2;

generated/swagger/oms-api/src/models/loyalty-collect-values.ts

@@ -0,0 +1,18 @@
+/* tslint:disable */
+import { LoyaltyCollectType } from './loyalty-collect-type';
+
+/**
+ * Loyalty collect values
+ */
+export interface LoyaltyCollectValues {
+
+  /**
+   * Collect Type
+   */
+  collectType: LoyaltyCollectType;
+
+  /**
+   * Quantity (optional, default null)
+   */
+  quantity?: number;
+}

generated/swagger/oms-api/src/models/order-item-list-item-dto.ts

@@ -4,6 +4,7 @@ import { EnvironmentChannel } from './environment-channel';
 import { CRUDA } from './cruda';
 import { DateRangeDTO } from './date-range-dto';
 import { Gender } from './gender';
+import { LoyaltyDTO } from './loyalty-dto';
 import { OrderType } from './order-type';
 import { PaymentStatus } from './payment-status';
 import { PaymentType } from './payment-type';
@@ -102,6 +103,11 @@ export interface OrderItemListItemDTO {
    */
   lastName?: string;
 
+  /**
+   * Loylty
+   */
+  loyalty?: LoyaltyDTO;
+
   /**
    * Bestellfiliale
    */

generated/swagger/oms-api/src/models/receipt-item-list-item-dto.ts

@@ -1,12 +1,19 @@
 /* tslint:disable */
 import { EntityReferenceDTO } from './entity-reference-dto';
+import { KeyValueDTOOfStringAndString } from './key-value-dtoof-string-and-string';
 import { CRUDA } from './cruda';
 import { PriceDTO } from './price-dto';
+import { LoyaltyDTO } from './loyalty-dto';
 import { ProductDTO } from './product-dto';
 import { PromotionDTO } from './promotion-dto';
 import { QuantityDTO } from './quantity-dto';
 import { ReceiptListItemDTO } from './receipt-list-item-dto';
 export interface ReceiptItemListItemDTO extends EntityReferenceDTO{
+
+  /**
+   * Mögliche Aktionen
+   */
+  actions?: Array<KeyValueDTOOfStringAndString>;
   buyerComment?: string;
 
   /**
@@ -19,6 +26,11 @@ export interface ReceiptItemListItemDTO extends EntityReferenceDTO{
    */
   discountedPrice?: PriceDTO;
 
+  /**
+   * Zusätzliche Markierungen
+   */
+  features?: {[key: string]: string};
+
   /**
    * PK
    */
@@ -35,6 +47,11 @@ export interface ReceiptItemListItemDTO extends EntityReferenceDTO{
    */
   lineNumber?: number;
 
+  /**
+   * Loyalty
+   */
+  loyalty?: LoyaltyDTO;
+
   /**
    * Bestellnummer
    */

generated/swagger/oms-api/src/services/order.service.ts

@@ -21,6 +21,8 @@ import { ResponseArgsOfQuerySettingsDTO } from '../models/response-args-of-query
 import { ResponseArgsOfIEnumerableOfAutocompleteDTO } from '../models/response-args-of-ienumerable-of-autocomplete-dto';
 import { AutocompleteTokenDTO } from '../models/autocomplete-token-dto';
 import { ListResponseArgsOfDBHOrderItemListItemDTO } from '../models/list-response-args-of-dbhorder-item-list-item-dto';
+import { ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO } from '../models/response-args-of-ienumerable-of-dbhorder-item-list-item-dto';
+import { LoyaltyCollectValues } from '../models/loyalty-collect-values';
 import { ListResponseArgsOfOrderItemListItemDTO } from '../models/list-response-args-of-order-item-list-item-dto';
 import { ResponseArgsOfIEnumerableOfOrderItemDTO } from '../models/response-args-of-ienumerable-of-order-item-dto';
 import { OrderItemDTO } from '../models/order-item-dto';
@@ -54,6 +56,7 @@ class OrderService extends __BaseService {
   static readonly OrderKundenbestellungenSettingsPath = '/kundenbestellungen/s/settings';
   static readonly OrderKundenbestellungenAutocompletePath = '/kundenbestellungen/s/complete';
   static readonly OrderKundenbestellungenPath = '/kundenbestellungen/s';
+  static readonly OrderLoyaltyCollectPath = '/order/{orderId}/orderitem/{orderItemId}/orderitemsubset/{orderItemSubsetId}/loyaltycollect';
   static readonly OrderQueryOrderItemPath = '/order/item/s';
   static readonly OrderQueryOrderItemAutocompletePath = '/order/item/s/complete';
   static readonly OrderGetOrderItemPath = '/order/orderitem/{orderItemId}';
@@ -636,6 +639,63 @@ class OrderService extends __BaseService {
     );
   }
 
+  /**
+   * Ausgabe order Storno von Prämienbestellposten
+   * Falls die Menge/Stückzahl kleiner der ursprünglichen Menge/Stückzahl ist, wird eine neue Bestellpostenteilmenge erzeugt.
+   * @param params The `OrderService.OrderLoyaltyCollectParams` containing the following parameters:
+   *
+   * - `orderItemSubsetId`: PK Bestellpostenteilmenge
+   *
+   * - `orderItemId`: PK Bestellposten
+   *
+   * - `orderId`: PK Bestellung
+   *
+   * - `data`: Daten zur Änderung des Bearbeitungsstatus
+   */
+  OrderLoyaltyCollectResponse(params: OrderService.OrderLoyaltyCollectParams): __Observable<__StrictHttpResponse<ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO>> {
+    let __params = this.newParams();
+    let __headers = new HttpHeaders();
+    let __body: any = null;
+
+
+
+    __body = params.data;
+    let req = new HttpRequest<any>(
+      'POST',
+      this.rootUrl + `/order/${encodeURIComponent(String(params.orderId))}/orderitem/${encodeURIComponent(String(params.orderItemId))}/orderitemsubset/${encodeURIComponent(String(params.orderItemSubsetId))}/loyaltycollect`,
+      __body,
+      {
+        headers: __headers,
+        params: __params,
+        responseType: 'json'
+      });
+
+    return this.http.request<any>(req).pipe(
+      __filter(_r => _r instanceof HttpResponse),
+      __map((_r) => {
+        return _r as __StrictHttpResponse<ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO>;
+      })
+    );
+  }
+  /**
+   * Ausgabe order Storno von Prämienbestellposten
+   * Falls die Menge/Stückzahl kleiner der ursprünglichen Menge/Stückzahl ist, wird eine neue Bestellpostenteilmenge erzeugt.
+   * @param params The `OrderService.OrderLoyaltyCollectParams` containing the following parameters:
+   *
+   * - `orderItemSubsetId`: PK Bestellpostenteilmenge
+   *
+   * - `orderItemId`: PK Bestellposten
+   *
+   * - `orderId`: PK Bestellung
+   *
+   * - `data`: Daten zur Änderung des Bearbeitungsstatus
+   */
+  OrderLoyaltyCollect(params: OrderService.OrderLoyaltyCollectParams): __Observable<ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO> {
+    return this.OrderLoyaltyCollectResponse(params).pipe(
+      __map(_r => _r.body as ResponseArgsOfIEnumerableOfDBHOrderItemListItemDTO)
+    );
+  }
+
   /**
    * Suche nach Bestellposten
    * @param queryToken Suchkriterien
@@ -1671,6 +1731,32 @@ module OrderService {
     buyerNumber?: null | string;
   }
 
+  /**
+   * Parameters for OrderLoyaltyCollect
+   */
+  export interface OrderLoyaltyCollectParams {
+
+    /**
+     * PK Bestellpostenteilmenge
+     */
+    orderItemSubsetId: number;
+
+    /**
+     * PK Bestellposten
+     */
+    orderItemId: number;
+
+    /**
+     * PK Bestellung
+     */
+    orderId: number;
+
+    /**
+     * Daten zur Änderung des Bearbeitungsstatus
+     */
+    data: LoyaltyCollectValues;
+  }
+
   /**
    * Parameters for OrderUpdateOrderItem
    */

generated/swagger/oms-api/src/services/receipt.service.ts

@@ -236,6 +236,7 @@ class ReceiptService extends __BaseService {
   }
 
   /**
+   * Aufgabe auf erledigt setzen
    * @param taskId undefined
    */
   ReceiptReceiptItemTaskCompletedResponse(taskId: number): __Observable<__StrictHttpResponse<ResponseArgsOfReceiptItemTaskListItemDTO>> {
@@ -261,6 +262,7 @@ class ReceiptService extends __BaseService {
     );
   }
   /**
+   * Aufgabe auf erledigt setzen
    * @param taskId undefined
    */
   ReceiptReceiptItemTaskCompleted(taskId: number): __Observable<ResponseArgsOfReceiptItemTaskListItemDTO> {