diff --git a/app/components/CalcResultContent.vue b/app/components/CalcResultContent.vue index e9e652e..b65962c 100644 --- a/app/components/CalcResultContent.vue +++ b/app/components/CalcResultContent.vue @@ -28,6 +28,7 @@ :currency="getOfferData(option.sourceUuid)?.currency" :unit="getOfferData(option.sourceUuid)?.unit" :stages="getRouteStages(option)" + :total-time-seconds="option.routes?.[0]?.totalTimeSeconds ?? null" :kyc-profile-uuid="getKycProfileUuid(option.sourceUuid)" @select="navigateToOffer(option.sourceUuid)" /> @@ -209,7 +210,9 @@ const getRouteStages = (option: ProductRouteOption) => { .filter((stage): stage is NonNullable => stage !== null) .map((stage) => ({ transportType: stage.transportType, - distanceKm: stage.distanceKm + distanceKm: stage.distanceKm, + travelTimeSeconds: stage.travelTimeSeconds, + fromName: stage.fromName })) } diff --git a/app/components/catalog/InfoPanel.vue b/app/components/catalog/InfoPanel.vue index 1122d1c..6b93732 100644 --- a/app/components/catalog/InfoPanel.vue +++ b/app/components/catalog/InfoPanel.vue @@ -160,13 +160,14 @@ v-for="(offer, index) in offersWithPrice" :key="offer.uuid ?? index" :supplier-name="offer.supplierName" - :location-name="offer.locationName || offer.locationCountry || offer.locationName" + :location-name="offer.locationName || offer.locationCountry || offer.country || offer.locationName" :product-name="offer.productName" :price-per-unit="offer.pricePerUnit ? Number(offer.pricePerUnit) : null" :quantity="offer.quantity" :currency="offer.currency" :unit="offer.unit" :stages="getOfferStages(offer)" + :total-time-seconds="offer.routes?.[0]?.totalTimeSeconds ?? null" @select="onOfferSelect(offer)" /> @@ -465,7 +466,9 @@ const getOfferStages = (offer: InfoOfferItem) => { .filter((stage): stage is NonNullable => stage !== null) .map(stage => ({ transportType: stage.transportType, - distanceKm: stage.distanceKm + distanceKm: stage.distanceKm, + travelTimeSeconds: stage.travelTimeSeconds, + fromName: stage.fromName })) } diff --git a/app/components/catalog/OfferResultCard.vue b/app/components/catalog/OfferResultCard.vue index 4280df4..027e9be 100644 --- a/app/components/catalog/OfferResultCard.vue +++ b/app/components/catalog/OfferResultCard.vue @@ -26,9 +26,14 @@ - - {{ priceDisplay }} - +
+ + {{ priceDisplay }} + + + {{ t('catalogOfferCard.labels.duration_label') }} {{ durationDisplay }} + +
@@ -45,7 +50,12 @@