@bytebrand/fe-ui-core 4.2.211 → 4.2.213

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.2.211",
+  "version": "4.2.213",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",

package/source/components/UserDashboardPage/sections/OrderStatusSection/OrderStatusCar.tsx

@@ -105,7 +105,7 @@ const OrderStatusCar = ({
             </div>
             <div className={styles.requestId}>{request}</div>
             <div className={styles.carPayment}>
-              {!!transformedDeliveryDate ? transformedDeliveryDate
+              {wonStatus === 'won' && !!transformedDeliveryDate ? transformedDeliveryDate
               : <>
                   {t(`buyingType.${buyingType}`)},&nbsp;
                   {buyingType !== 'buy' && `${t('paybackPeriod', { paybackPeriod })},`}&nbsp;

package/source/components/UserDashboardPage/sections/OrderStatusSection/OrderStatusSection.tsx

@@ -44,23 +44,21 @@ const OrderStatusSection = ({
     if (!!addressObj) {
       Object.keys(addressObj).forEach((key) => {
         switch (key) {
-          case 'customerFirstname':
-          case 'customerLastname':
+          case 'firstname':
+          case 'lastname':
             addressString = `${addressString} ${addressObj[key]}`;
             break;
-          case 'deliveryPartner':
-          case 'customerStreet':
-          case 'deliveryStreet':
-          case 'customerZip':
-          case 'deliveryZip':
+          case 'partner':
+          case 'street':
+          case 'zip':
+          case 'number':
             if (!!addressString) {
               addressString = `${addressString}, ${addressObj[key]}`;
             } else {
               addressString = `${addressString} ${addressObj[key]}`;
             }
             break;
-          case 'customerCity':
-          case 'deliveryCity':
+          case 'city':
             addressString = `${addressString} ${addressObj[key]}`;
             break;
           default: addressString = `${addressString} ${addressObj[key]}`;
@@ -144,6 +142,7 @@ const OrderStatusSection = ({
               request,
               registration,
               currentSalesPrice,
+              totalPrice,
               deposit,
               preparationCost,
               licensePlateCost,
@@ -168,7 +167,7 @@ const OrderStatusSection = ({
             const additionalOrderData = {
               addressData: [
                 ...customerAddress ? [{ label: t('MyOrderPage:billingAddress'), value: getTransformAddressToString(customerAddress) }] : [],
-                ...deliveryAddress ? [{ label: t('MyOrderPage:vehicleDelivery'), value: getTransformAddressToString(deliveryAddress) }] : []
+                ...deliveryAddress ? [{ label: t('MyOrderPage:vehicleDelivery'), value: selfPickup ? t('MyOrderPage:selfPickup') : getTransformAddressToString(deliveryAddress) }] : []
               ],
               carPriceData: [
                 ...currentSalesPrice ? [getDataPriceItem(currentSalesPriceWithWarranty, carPriceWithWarrantyTitle(warranty))] : [],
@@ -176,7 +175,7 @@ const OrderStatusSection = ({
                 ...extrasSumCost ? [getDataPriceItem(extrasSumCost, t('MyOrderPage:extrasSumCost'))] : [],
                 ...registrationCost && registration ? [getDataPriceItem(registrationCost, t('MyOrderPage:vehicleRegistration'))] : [],
                 ...licensePlateCost && isLicensePlateFee ? [getDataPriceItem(licensePlateCost, t('MyOrderPage:licensePlates'))] : [],
-                ...transportationCost && delivery ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
+                ...!!transportationCost && delivery ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
                 ...paymentProtectionInsuranceCost ? [getDataPriceItem(paymentProtectionInsuranceCost, t('MyOrderPage:paymentProtectionInsuranceCost'))]: [],
                 ...firstRate ? [getDataPriceItem(firstRate, t('MyOrderPage:firstRate'))] : [],
                 ...buyingType !== 'buy' ? [
@@ -191,7 +190,7 @@ const OrderStatusSection = ({
               ],
               overallRate: {
                 label: t('MyOrderPage:yourOverallRate'),
-                value: buyingType === 'buy' ? currentSalesPrice : monthlyInstallment
+                value: buyingType === 'buy' ? totalPrice : monthlyInstallment
               }
             };
   
@@ -225,10 +224,11 @@ const OrderStatusSection = ({
               delivery
             };
   
-            const title = <span>
-              {t('orderStatus.title')}:&nbsp;
-              <span className={styles.orderStatus}>{t(`orderStatus.${status}`)}</span>
-            </span>;
+            const title = wonStatus === 'pending' ? <span>
+                {t('orderStatus.title')}:&nbsp;
+                <span className={styles.orderStatus}>{t(`orderStatus.${status}`)}</span>
+              </span>
+              : <span>{t('orderStatus.myOrder')}</span>;
   
             return (
               <DashboardSection key={index} title={title}>

package/source/components/containers/SearchPage/FiltersContainer/FiltersContainer.tsx

@@ -314,7 +314,7 @@ class FiltersContainer extends React.Component<IFiltersContainerProps, {}> {
     if (isHistogram) {
       const histogramData = histograms[filterField].length ? histograms[filterField] : RANGE_FILTERS[filter].options;
       const actualValues = {
-        from: histogramData[0].from,
+        from: filters[filter].value.from ? filters[filter].value.from : histogramData[0].from,
         to: histogramData[histogramData.length - 1].to
       };