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

Resolve "Remove 0-0 years from car model" #920

Merged
jankstudio merged 1 commit from 128-remove-0-0-years-from-car-model into master 2018-05-23 11:07:59 +00:00
Conversation 2 Commits 1 Files changed 2 +9 -3
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Controller/APIController.php
View file

@ -423,7 +423,8 @@ class APIController extends Controller
{ {
$vlist[] = [ $vlist[] = [
'id' => $v->getID(), 'id' => $v->getID(),
'make' => $v->getMake() . ' ' . $v->getModelYearFrom() . '-' . $v->getModelYearTo(), 'make' => trim($v->getMake() . ' ' . $v->getModelYearFormatted(false)),
// 'make' => $v->getMake() . ' ' . $v->getModelYearFrom() . '-' . $v->getModelYearTo(),
]; ];
} }

9
src/Entity/Vehicle.php
View file

@ -114,12 +114,17 @@ class Vehicle
return $this->model_year_to; return $this->model_year_to;
} }
public function getModelYearFormatted() public function getModelYearFormatted($has_dash = true)
{ {
if ($this->model_year_from == 0) if ($this->model_year_from == 0)
{ {
if ($this->model_year_to == 0) if ($this->model_year_to == 0)
return '-'; {
if ($has_dash)
return '-';
return '';
}
return $this->model_year_to; return $this->model_year_to;
} }