Merge branch '252-add-columns-to-popapp-report' into 'master'
Resolve "Add columns to popapp report" Closes #252 See merge request jankstudio/resq!299
This commit is contained in:
commit
15f2764ae8
1 changed files with 15 additions and 3 deletions
|
|
@ -464,12 +464,15 @@ class ReportController extends Controller
|
|||
'Customer ID',
|
||||
'Customer Last Name',
|
||||
'Customer First Name',
|
||||
'Customer Mobile Number',
|
||||
'Warranty Last Name',
|
||||
'Warranty First Name',
|
||||
'Plate Number',
|
||||
'Warranty Create Date',
|
||||
'Activation Status',
|
||||
'Has Mobile App?',
|
||||
'Date Mobile App Downloaded',
|
||||
'Mobile Number Using Mobile App',
|
||||
]);
|
||||
foreach ($data as $row)
|
||||
{
|
||||
|
|
@ -539,10 +542,16 @@ class ReportController extends Controller
|
|||
// get mobile session of customer
|
||||
//error_log($cv->getCustomer()->getLastName() . ' ' . $cv->getCustomer()->getFirstName());
|
||||
$has_mobile = false;
|
||||
$mobile_session = $em->getRepository(MobileSession::class)->findBy(['customer' => $cv->getCustomer()->getID()]);
|
||||
foreach ($mobile_session as $mobile)
|
||||
$mobile_date = '';
|
||||
$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;
|
||||
$mobile_date = $mobile_session->getDateGenerated()->format("d M Y");
|
||||
$mobile_number = $mobile_session->getPhoneNumber();
|
||||
}
|
||||
$has_warranty = true;
|
||||
$results[] = [
|
||||
|
|
@ -555,13 +564,16 @@ class ReportController extends Controller
|
|||
'cust_id' => $cv->getCustomer()->getID(),
|
||||
'cust_lastname' => $cv->getCustomer()->getLastName(),
|
||||
'cust_firstname' => $cv->getCustomer()->getFirstName(),
|
||||
'cust_mobile_number' => $cv->getCustomer()->getPhoneMobile(),
|
||||
'warr_lastname' => $warranty->getLastName(),
|
||||
'warr_firstname' => $warranty->getFirstName(),
|
||||
'plate_num' => $cv->getPlateNumber(),
|
||||
'warr_date_create' => $warranty->getDateCreate()->format("d M Y"),
|
||||
'warr_activation_status' => ($warranty->isActivated() ? 'Active' : 'Inactive'),
|
||||
'has_mobile' => ($has_mobile ? 'Yes' : 'No'),
|
||||
];
|
||||
'date_mobile' => $mobile_date,
|
||||
'mobile_number' => $mobile_number,
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue