diff --git a/src/pages/nearle/dispatch/Dispatch.js b/src/pages/nearle/dispatch/Dispatch.js index 43563a4..3787672 100644 --- a/src/pages/nearle/dispatch/Dispatch.js +++ b/src/pages/nearle/dispatch/Dispatch.js @@ -3064,27 +3064,20 @@ const Dispatch = ({ )} - {(o.kms != null || o.actualkms != null || (!isDelivered && o.riderkms != null) || estMeters !== null) && ( + {(o.kms != null || o.riderkms != null || estMeters !== null) && (
{o.kms != null && o.kms !== '' && (
Planned - {o.kms} km + {parseFloat(o.kms).toFixed(1)} km
)} - {o.actualkms != null && o.actualkms !== '' && ( + {o.riderkms != null && o.riderkms !== '' && (
Actual - {o.actualkms} km -
- )} - {!isDelivered && o.riderkms != null && o.riderkms !== '' && ( -
- - Rider - {parseFloat(o.riderkms).toFixed(2)} km + {parseFloat(o.riderkms).toFixed(1)} km
)} {estMeters !== null && ( @@ -3526,10 +3519,10 @@ const Dispatch = ({ return ( {isLoss ? : } - {isLoss ? 'Loss' : 'Profit'} + {isLoss ? 'Loss' : 'Revenue'} {isLoss ? '-' : ''}₹{amount.toFixed(0)} ); @@ -4324,7 +4317,7 @@ const Dispatch = ({
{isLoss ? '-' : ''}₹{Math.abs(totalProfit).toFixed(0)}
-
{isLoss ? 'Loss' : 'Profit'}
+
{isLoss ? 'Loss' : 'Revenue'}
);