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

Merge branch '252-add-columns-to-popapp-report' into 'master'

Browse source 
Resolve "Add columns to popapp report"

Closes #252

See merge request jankstudio/resq!299
This commit is contained in:
Kendrick Chan 2019-08-19 05:28:51 +00:00
commit 15f2764ae8
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Controller/ReportController.php
View file

@ -464,12 +464,15 @@ class ReportController extends Controller
'Customer ID', 'Customer ID',
'Customer Last Name', 'Customer Last Name',
'Customer First Name', 'Customer First Name',
'Customer Mobile Number',
'Warranty Last Name', 'Warranty Last Name',
'Warranty First Name', 'Warranty First Name',
'Plate Number', 'Plate Number',
'Warranty Create Date', 'Warranty Create Date',
'Activation Status', 'Activation Status',
'Has Mobile App?', 'Has Mobile App?',
'Date Mobile App Downloaded',
'Mobile Number Using Mobile App',
]); ]);
foreach ($data as $row) foreach ($data as $row)
{ {
@ -539,10 +542,16 @@ class ReportController extends Controller
// get mobile session of customer // get mobile session of customer
//error_log($cv->getCustomer()->getLastName() . ' ' . $cv->getCustomer()->getFirstName()); //error_log($cv->getCustomer()->getLastName() . ' ' . $cv->getCustomer()->getFirstName());
$has_mobile = false; $has_mobile = false;
$mobile_session = $em->getRepository(MobileSession::class)->findBy(['customer' => $cv->getCustomer()->getID()]); $mobile_date = '';
foreach ($mobile_session as $mobile) $mobile_number = '';
$mobile_session = $em->getRepository(MobileSession::class)
->findOneBy(['customer' => $cv->getCustomer()->getID()], ['date_generated' => 'ASC']);
if ($mobile_session != null)
{ {
// get mobile data
$has_mobile = true; $has_mobile = true;
$mobile_date = $mobile_session->getDateGenerated()->format("d M Y");
$mobile_number = $mobile_session->getPhoneNumber();
} }
$has_warranty = true; $has_warranty = true;
$results[] = [ $results[] = [
@ -555,12 +564,15 @@ class ReportController extends Controller
'cust_id' => $cv->getCustomer()->getID(), 'cust_id' => $cv->getCustomer()->getID(),
'cust_lastname' => $cv->getCustomer()->getLastName(), 'cust_lastname' => $cv->getCustomer()->getLastName(),
'cust_firstname' => $cv->getCustomer()->getFirstName(), 'cust_firstname' => $cv->getCustomer()->getFirstName(),
'cust_mobile_number' => $cv->getCustomer()->getPhoneMobile(),
'warr_lastname' => $warranty->getLastName(), 'warr_lastname' => $warranty->getLastName(),
'warr_firstname' => $warranty->getFirstName(), 'warr_firstname' => $warranty->getFirstName(),
'plate_num' => $cv->getPlateNumber(), 'plate_num' => $cv->getPlateNumber(),
'warr_date_create' => $warranty->getDateCreate()->format("d M Y"), 'warr_date_create' => $warranty->getDateCreate()->format("d M Y"),
'warr_activation_status' => ($warranty->isActivated() ? 'Active' : 'Inactive'), 'warr_activation_status' => ($warranty->isActivated() ? 'Active' : 'Inactive'),
'has_mobile' => ($has_mobile ? 'Yes' : 'No'), 'has_mobile' => ($has_mobile ? 'Yes' : 'No'),
'date_mobile' => $mobile_date,
'mobile_number' => $mobile_number,
]; ];
} }
} }