diff --git a/SwiftParcel.Web/frontend/src/components/details/offer.tsx b/SwiftParcel.Web/frontend/src/components/details/offer.tsx index 5e06750..7aa147e 100644 --- a/SwiftParcel.Web/frontend/src/components/details/offer.tsx +++ b/SwiftParcel.Web/frontend/src/components/details/offer.tsx @@ -49,9 +49,7 @@ export function OfferDetails({ show={showUserDetailsModal} setShow={setShowUserDetailsModal} userId={getUserIdFromStorage()} - parcelId={offer.parcelId} - priceBreakDown={offer.priceBreakDown} - company={offer.companyName} + offer={offer} userData={userData} /> diff --git a/SwiftParcel.Web/frontend/src/components/modals/offers/userDetailsModal.tsx b/SwiftParcel.Web/frontend/src/components/modals/offers/userDetailsModal.tsx index 8387a99..895d2d9 100644 --- a/SwiftParcel.Web/frontend/src/components/modals/offers/userDetailsModal.tsx +++ b/SwiftParcel.Web/frontend/src/components/modals/offers/userDetailsModal.tsx @@ -15,9 +15,7 @@ import { show: boolean; setShow: (show: boolean) => void; userId: any; - parcelId : any; - priceBreakDown: string; - company: string; + offer: any; userData: any; } @@ -73,6 +71,19 @@ import { ); + const PriceBreakDownElement = ({ element }) => ( +
+
+ ); + const BasicInfoSection = ({ userData, handleStringChange, errors }) => (
(field: T) => (event: React.ChangeEvent) => { @@ -248,7 +259,7 @@ import { createOrder( props.userId, - props.parcelId, + props.offer.parcelId, userInfo.name, userInfo.email, userInfo.addressStreet, @@ -257,7 +268,7 @@ import { userInfo.addressCity, userInfo.addressZipCode, userInfo.addressCountry, - props.company) + props.offer.company) .then((response) => { setSuccess("Offer submitted successfully!"); setUserInfo( @@ -295,6 +306,17 @@ import {
+ + + {props.offer.priceBreakDown != null && props.offer.priceBreakDown?.length > 0 ? ( + props.offer.priceBreakDown?.map((element: any) => element != null ? ( + + ) : null) + ) : null} +