@bytebrand/fe-ui-core 4.2.207 → 4.2.208
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -30,6 +30,7 @@ interface IOrderStatusCar {
|
|
|
30
30
|
additionalOrderInfoProps?: any;
|
|
31
31
|
wonStatus?: string;
|
|
32
32
|
transformedDeliveryDate?: string | null;
|
|
33
|
+
delivery?: boolean;
|
|
33
34
|
}
|
|
34
35
|
|
|
35
36
|
const OrderStatusCar = ({
|
|
@@ -49,7 +50,8 @@ const OrderStatusCar = ({
|
|
|
49
50
|
onClick,
|
|
50
51
|
additionalOrderInfoProps,
|
|
51
52
|
wonStatus,
|
|
52
|
-
transformedDeliveryDate
|
|
53
|
+
transformedDeliveryDate,
|
|
54
|
+
delivery
|
|
53
55
|
}: IOrderStatusCar) => {
|
|
54
56
|
const ref = useRef(null);
|
|
55
57
|
const [activeStep, setActiveStep] = useState(0); // 0 - when we have no active steps
|
|
@@ -58,7 +60,7 @@ const OrderStatusCar = ({
|
|
|
58
60
|
{ icon: 'orderReceivedDashboard', selector: 'selector_status_order_received' },
|
|
59
61
|
{ icon: 'preparaionDashboard', selector: 'selector_status_preparation' },
|
|
60
62
|
{ icon: 'registrationDashboard', selector: 'selector_status_registration' },
|
|
61
|
-
selfPickup ? { icon: 'pickupDashboard', selector: 'selector_status_pick_up' }
|
|
63
|
+
selfPickup || !delivery ? { icon: 'pickupDashboard', selector: 'selector_status_pick_up' }
|
|
62
64
|
: { icon: 'deliveryDashboard', selector: 'selector_status_delivery' },
|
|
63
65
|
{ icon: 'handingOverDashboard', selector: 'selector_status_handing_over' }
|
|
64
66
|
];
|
package/source/components/UserDashboardPage/sections/OrderStatusSection/OrderStatusSection.tsx
CHANGED
|
@@ -155,7 +155,10 @@ const OrderStatusSection = ({
|
|
|
155
155
|
paymentProtectionInsuranceCost,
|
|
156
156
|
wonStatus,
|
|
157
157
|
warranty,
|
|
158
|
-
deliveryDate
|
|
158
|
+
deliveryDate,
|
|
159
|
+
isLicensePlateFee,
|
|
160
|
+
delivery,
|
|
161
|
+
extrasSumCost
|
|
159
162
|
} = orderedCar;
|
|
160
163
|
|
|
161
164
|
const transformedDeliveryDate = !!deliveryDate ? `${t('MyOrderPage:deliveredOn')} ${fromUTCToDateString(deliveryDate)}` : null;
|
|
@@ -170,9 +173,10 @@ const OrderStatusSection = ({
|
|
|
170
173
|
carPriceData: [
|
|
171
174
|
...currentSalesPrice ? [getDataPriceItem(currentSalesPriceWithWarranty, carPriceWithWarrantyTitle(warranty))] : [],
|
|
172
175
|
...preparationCost ? [getDataPriceItem(preparationCost, t('MyOrderPage:preparationCost'))] : [],
|
|
173
|
-
...
|
|
174
|
-
...
|
|
175
|
-
...
|
|
176
|
+
...extrasSumCost ? [getDataPriceItem(extrasSumCost, t('MyOrderPage:extrasSumCost'))] : [],
|
|
177
|
+
...registrationCost && registration ? [getDataPriceItem(registrationCost, t('MyOrderPage:vehicleRegistration'))] : [],
|
|
178
|
+
...licensePlateCost && isLicensePlateFee ? [getDataPriceItem(licensePlateCost, t('MyOrderPage:licensePlates'))] : [],
|
|
179
|
+
...transportationCost && delivery ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
|
|
176
180
|
...paymentProtectionInsuranceCost ? [getDataPriceItem(paymentProtectionInsuranceCost, t('MyOrderPage:paymentProtectionInsuranceCost'))]: [],
|
|
177
181
|
...firstRate ? [getDataPriceItem(firstRate, t('MyOrderPage:firstRate'))] : [],
|
|
178
182
|
...buyingType !== 'buy' ? [
|
|
@@ -217,7 +221,8 @@ const OrderStatusSection = ({
|
|
|
217
221
|
onClick: () => onDetailsClick(_id),
|
|
218
222
|
additionalOrderInfoProps,
|
|
219
223
|
wonStatus,
|
|
220
|
-
transformedDeliveryDate
|
|
224
|
+
transformedDeliveryDate,
|
|
225
|
+
delivery
|
|
221
226
|
};
|
|
222
227
|
|
|
223
228
|
const title = <span>
|