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

Fix Customer bug when no vehicle or mobile number is selected

Browse source
This commit is contained in:
Kendrick Chan 2018-02-01 23:11:57 +08:00
parent ec68b7a787
commit 85a0f972c7
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Controller/CustomerController.php
View file

@ -101,7 +101,6 @@ class CustomerController extends BaseController
->getQuery() ->getQuery()
->getResult(); ->getResult();
$classifications = CustomerClassification::getCollection();
// process rows // process rows
$rows = []; $rows = [];
@ -110,7 +109,7 @@ class CustomerController extends BaseController
$row['id'] = $orow->getID(); $row['id'] = $orow->getID();
$row['first_name'] = $orow->getFirstName(); $row['first_name'] = $orow->getFirstName();
$row['last_name'] = $orow->getLastName(); $row['last_name'] = $orow->getLastName();
$row['customer_classification'] = $classifications[$orow->getCustomerClassification()]; $row['customer_classification'] = CustomerClassification::getName($orow->getCustomerClassification());
$row['flag_mobile_app'] = $orow->hasMobileApp(); $row['flag_mobile_app'] = $orow->hasMobileApp();
$row['app_mobile_number'] = $orow->hasMobileApp() && !empty($orow->getMobileSessions()) ? $orow->getMobileSessions()[0]->getPhoneNumber() : ''; $row['app_mobile_number'] = $orow->hasMobileApp() && !empty($orow->getMobileSessions()) ? $orow->getMobileSessions()[0]->getPhoneNumber() : '';
@ -410,6 +409,8 @@ class CustomerController extends BaseController
} }
// delete all numbers not in list // delete all numbers not in list
if (count($number_ids) > 0)
{
$qb = $em->createQueryBuilder(); $qb = $em->createQueryBuilder();
$del_numbers = $qb->select('m') $del_numbers = $qb->select('m')
->from(MobileNumber::class, 'm') ->from(MobileNumber::class, 'm')
@ -422,6 +423,7 @@ class CustomerController extends BaseController
$em->remove($dn); $em->remove($dn);
} }
} }
}
// custom validation for vehicles // custom validation for vehicles
$vehicles = json_decode($req->request->get('vehicles')); $vehicles = json_decode($req->request->get('vehicles'));
@ -500,6 +502,8 @@ class CustomerController extends BaseController
} }
} }
if (count($vehicle_ids) > 0)
{
// delete all vehicles not in list // delete all vehicles not in list
$qb = $em->createQueryBuilder(); $qb = $em->createQueryBuilder();
$del_vehicles = $qb->select('cv') $del_vehicles = $qb->select('cv')
@ -513,6 +517,7 @@ class CustomerController extends BaseController
$em->remove($dv); $em->remove($dv);
} }
} }
}
// validate // validate
$errors = $validator->validate($row); $errors = $validator->validate($row);