diff --git a/src/app/components/supplier-table/supplier-table.html b/src/app/components/supplier-table/supplier-table.html index b1a665d..1cb4747 100644 --- a/src/app/components/supplier-table/supplier-table.html +++ b/src/app/components/supplier-table/supplier-table.html @@ -20,27 +20,27 @@ {{ supplier.name }} {{ supplier.phone }} {{ supplier.email }} - {{ supplier.address}} - {{ supplier.zipCode}} - {{ supplier.city}} - {{ supplier.deliveryDelay}} jours + {{ supplier.address }} + {{ supplier.zipCode }} + {{ supplier.city }} + {{ supplier.deliveryDelay }} jours - + - Produits - Nom + Produit Référence Prix - @for (product of supplier.products; track product.id) { + @for (product of supplier.prices; track product.id) { - {{ product.name }} - {{ product.references }} - Price ??? + {{ product.productName }} + {{ product.productReferences }} + {{ product.sellingPrice }}€ } diff --git a/src/app/components/supplier-table/supplier-table.ts b/src/app/components/supplier-table/supplier-table.ts index 87ea541..98ae8c3 100644 --- a/src/app/components/supplier-table/supplier-table.ts +++ b/src/app/components/supplier-table/supplier-table.ts @@ -5,7 +5,7 @@ import {NzIconDirective} from "ng-zorro-antd/icon"; import {NzTableComponent} from "ng-zorro-antd/table"; import {ModalButton} from "../modal-button/modal-button"; import {SupplierForm} from "../supplier-form/supplier-form"; -import {GetSupplierDto, SuppliersService} from "../../services/api"; +import {GetPriceDto, GetSupplierDto, SuppliersService} from "../../services/api"; import {NzNotificationService} from "ng-zorro-antd/notification"; import {firstValueFrom} from "rxjs"; diff --git a/src/app/services/api/model/get-price-dto.ts b/src/app/services/api/model/get-price-dto.ts index c002abc..aecbf6e 100644 --- a/src/app/services/api/model/get-price-dto.ts +++ b/src/app/services/api/model/get-price-dto.ts @@ -17,7 +17,7 @@ export interface GetPriceDto { supplierEmail?: string | null; supplierPhone?: string | null; supplierAddress?: string | null; - supplierZipCode?: number; + supplierZipCode?: string | null; supplierCity?: string | null; supplierDeliveryDelay?: number; productId?: number; @@ -25,7 +25,7 @@ export interface GetPriceDto { productName?: string | null; productDuration?: number; productCaliber?: number; - productApprovalNumber?: number; + productApprovalNumber?: string | null; productWeight?: number; productNec?: number; productImage?: string | null; diff --git a/src/app/services/api/model/get-supplier-dto.ts b/src/app/services/api/model/get-supplier-dto.ts index 378eb06..a612c83 100644 --- a/src/app/services/api/model/get-supplier-dto.ts +++ b/src/app/services/api/model/get-supplier-dto.ts @@ -7,6 +7,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { GetPriceDto } from './get-price-dto'; import { GetProductDto } from './get-product-dto'; @@ -20,5 +21,6 @@ export interface GetSupplierDto { city?: string | null; deliveryDelay?: number; products?: Array | null; + prices?: Array | null; }