|
|
@@ -29,8 +29,8 @@ class DeliveryAppointmentEvent implements ShouldBroadcast
|
|
|
}]);
|
|
|
$count = $delivery->deliveryAppointment->cars_count ?? 0;
|
|
|
$delivery->warehouse = $delivery->deliveryAppointment->warehouse_id ?? "";
|
|
|
- $delivery->cubic_meter = isset($delivery->deliveryAppointment->cubic_meter) ? ($count>1 ? $delivery->deliveryAppointment->cubic_meter."/".$count : $delivery->deliveryAppointment->cubic_meter) : "";
|
|
|
- $delivery->tonne = isset($delivery->deliveryAppointment->tonne) ? ($count>1 ? $delivery->deliveryAppointment->tonne."/".$count : $delivery->deliveryAppointment->tonne) : "";
|
|
|
+ $delivery->cubic_meter = isset($delivery->deliveryAppointment->cubic_meter) && $delivery->deliveryAppointment->cubic_meter>0 ? ($count>1 ? $delivery->deliveryAppointment->cubic_meter."/".$count : $delivery->deliveryAppointment->cubic_meter) : "";
|
|
|
+ $delivery->tonne = isset($delivery->deliveryAppointment->tonne) && $delivery->deliveryAppointment->tonne>0 ? ($count>1 ? $delivery->deliveryAppointment->tonne."/".$count : $delivery->deliveryAppointment->tonne) : "";
|
|
|
$this->delivery = $delivery->withoutRelations();
|
|
|
}
|
|
|
|