rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Only display km values for distance

Browse source
This commit is contained in:
Ramon Gutierrez 2018-01-18 01:39:50 +08:00
parent 86f69e8056
commit 798dd5e599
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Controller/JobOrderController.php
View file

@ -274,7 +274,7 @@ class JobOrderController extends BaseController
$hours = floor($seconds / 3600); $hours = floor($seconds / 3600);
$minutes = ceil(($seconds / 60) % 60); $minutes = ceil(($seconds / 60) % 60);
$outlet['duration'] = ($hours > 0 ? number_format($hours) . "hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : ''); $outlet['duration'] = ($hours > 0 ? number_format($hours) . " hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : '');
} else { } else {
$outlet['duration'] = false; $outlet['duration'] = false;
} }
@ -283,10 +283,7 @@ class JobOrderController extends BaseController
$meters = $outlet['distance']; $meters = $outlet['distance'];
if (!empty($meters) && $meters > 0) { if (!empty($meters) && $meters > 0) {
$kms = floor($meters / 1000); $outlet['distance'] = round($meters / 1000) . " km";
$meters = ceil($meters % 1000);
$outlet['distance'] = ($kms > 0 ? number_format($kms) . "km" . ($meters > 0 ? ", " : '') : '') . ($meters > 0 ? number_format($meters) . " m" : '');
} else { } else {
$outlet['distance'] = false; $outlet['distance'] = false;
} }