Merge branch '397-resq-sms-sent-report' into 'master'

Resolve "Resq - SMS sent report"

Closes #397

See merge request jankstudio/resq!445
This commit is contained in:
Kendrick Chan 2020-05-04 08:12:44 +00:00
commit 9018d1a294
7 changed files with 303 additions and 0 deletions

View file

@ -330,6 +330,8 @@ access_keys:
label: Job Order Details Report
- id: report.jo_events
label: Job Order Events Report
- id: report.sms_messages
label: SMS Messages Report
- id: service
label: Other Services

View file

@ -97,3 +97,13 @@ rep_jo_events_submit:
path: /report/jo_events_report
controller: App\Controller\ReportController::jobOrderEventsSubmit
methods: [POST]
rep_sms_messages_form:
path: /report/sms_messages_report
controller: App\Controller\ReportController::smsMessagesForm
methods: [GET]
rep_sms_messages_submit:
path: /report/sms_messages_report
controller: App\Controller\ReportController::smsMessagesSubmit
methods: [POST]

View file

@ -0,0 +1,85 @@
<?php
namespace App\Command;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\EntityManagerInterface;
use App\Service\RisingTideGateway;
use App\Entity\Warranty;
use DateTime;
class WarrantySMSCommand extends Command
{
protected $gateway;
protected $em;
protected function configure()
{
$this->setName('warranty:sms')
->setDescription('Sends an SMS message to users whose warranty expired one month ago.')
->setHelp('Sends warranty SMS.')
->addArgument('date', InputArgument::OPTIONAL, 'Date to use as basis of expiration. Defaults to current date.');
}
public function __construct(EntityManagerInterface $em, RisingTideGateway $gateway)
{
$this->em = $em;
$this->gateway = $gateway;
parent::__construct();
}
protected function execute(InputInterface $input, OutputInterface $output)
{
$date_string = $input->getArgument('date');
// if date is specified
if (!empty($date_string))
$date = DateTime::createFromFormat('Ymd', $date_string);
else
$date = new DateTime();
// -1 month
$date->modify('-1 month');
$warrs = $this->em->getRepository(Warranty::class)->findBy(['date_expire' => $date]);
foreach ($warrs as $w)
{
error_log($w->getID() . ' - ' . $w->getMobileNumber());
// check valid number
$num = trim($w->getMobileNumber());
// should start with '9'
if ($num[0] != '9')
continue;
// should be 10 digits
if (strlen($num) != 10)
continue;
// should be numeric
if (!is_numeric($num))
continue;
error_log('valid!');
// add 63 prefix
$num = '63' . $num;
}
/*
error_log('sending sms to ' . $number);
$msg = 'This is a test.';
$this->gateway->sendSMS($number, 'MOTOLITE', $msg);
return 0;
*/
}
}

View file

@ -7,6 +7,7 @@ use App\Ramcar\ServiceType;
use App\Ramcar\JOStatus;
use App\Ramcar\InvalidPlateNumber;
use App\Ramcar\JOEventType;
use App\Ramcar\SMSStatus;
use App\Entity\JORejection;
use App\Entity\Battery;
@ -18,6 +19,7 @@ use App\Entity\MobileSession;
use App\Entity\Customer;
use App\Entity\BatteryModel;
use App\Entity\BatterySize;
use App\Entity\SMSMessage;
use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder;
@ -855,6 +857,52 @@ class ReportController extends Controller
return $resp;
}
/**
* @Menu(selected="outlet_list")
*/
public function smsMessagesForm()
{
$this->denyAccessUnlessGranted('report.sms_messages', null, 'No access.');
return $this->render('report/sms-messages/form.html.twig');
}
public function smsMessagesSubmit(Request $req, EntityManagerInterface $em)
{
$data = $this->getSMSMessagesDetails($req, $em);
$resp = new StreamedResponse();
$resp->setCallback(function() use ($data) {
// csv output
$csv_handle = fopen('php://output', 'w+');
fputcsv($csv_handle, [
'Date Create',
'Source',
'Source Alias',
'Destination',
'Message',
'Status',
'Reason Code',
]);
// write sms messages data
foreach ($data as $row)
{
fputcsv($csv_handle, $row);
}
fclose($csv_handle);
});
$filename = 'sms_messages_report' . '.csv';
$resp->setStatusCode(200);
$resp->headers->set('Content-Type', 'text/csv; charset=utf-8');
$resp->headers->set('Content-Disposition', 'attachment; filename="' . $filename . '"');
return $resp;
}
protected function processPopappFile(UploadedFile $csv_file, EntityManagerInterface $em)
{
// attempt to open file
@ -1619,4 +1667,48 @@ class ReportController extends Controller
return $result;
}
protected function getSMSMessagesDetails(Request $req, EntityManagerInterface $em)
{
// get query builder
$qb = $this->getDoctrine()
->getRepository(SMSMessage::class)
->createQueryBuilder('r');
// get dates
$raw_date_start = $req->request->get('date_start');
$raw_date_end = $req->request->get('date_end');
$date_start = DateTime::createFromFormat('m/d/Y', $raw_date_start);
$date_end = DateTime::createFromFormat('m/d/Y', $raw_date_end);
// build query
$query = $qb->where('r.date_create >= :start')
->andWhere('r.date_create <= :end')
->setParameter('start', $date_start->format('Y-m-d') . ' 00:00:00')
->setParameter('end', $date_end->format('Y-m-d') . ' 23:59:59')
->getQuery();
// run query
$sms_messages = $query->getResult();
$result = [];
foreach($sms_messages as $sms_message)
{
$datetime_create = $sms_message->getDateCreate();
$date_create = $datetime_create->format('M-d-Y H:i');
$result[] = [
$date_create,
$sms_message->getFrom(),
$sms_message->getFromAlias(),
$sms_message->getTo(),
$sms_message->getMessage(),
$sms_message->getStatus(),
$sms_message->getReasonCode(),
];
}
return $result;
}
}

24
src/Ramcar/SMSStatus.php Normal file
View file

@ -0,0 +1,24 @@
<?php
namespace App\Ramcar;
class SMSStatus extends NameValue
{
// status are:
// created
// sent
// delivered
// not_delivered
const CREATED = 'created';
const SENT = 'sent';
const DELIVERED = 'delivered';
const NOT_DELIVERED = 'not_delivered';
const COLLECTION = [
'created' => 'Created',
'sent' => 'Sent',
'delivered' => 'Delivered',
'not_delivered' => 'Not Delivered',
];
}

View file

@ -213,6 +213,14 @@
Warranty Details Report
</span>
</a>
<a href="{{ url('rep_sms_messages_form') }}" class="m-menu__link">
<i class="m-menu__link-bullet m-menu__link-bullet--dot">
<span></span>
</i>
<span class="m-menu__link-text">
SMS Messages Report
</span>
</a>
</li>
</ul>
</li>

View file

@ -0,0 +1,82 @@
{% extends 'base.html.twig' %}
{% block body %}
<!-- BEGIN: Subheader -->
<div class="m-subheader">
<div class="d-flex align-items-center">
<div class="mr-auto">
<h3 class="m-subheader__title">SMS Messages Report</h3>
</div>
</div>
</div>
<!-- END: Subheader -->
<div class="m-content">
<!--Begin::Section-->
<div class="row">
<div class="col-xl-6">
<div class="m-portlet m-portlet--mobile">
<div class="m-portlet__head">
<div class="m-portlet__head-caption">
<div class="m-portlet__head-title">
<span class="m-portlet__head-icon">
<i class="fa fa-calendar"></i>
</span>
<h3 class="m-portlet__head-text">
Select a date range
</h3>
</div>
</div>
</div>
<form id="row-form" autocomplete="off" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ url('rep_sms_messages_submit') }}">
<div class="m-portlet__body">
<div class="form-group m-form__group row">
<div class="input-daterange input-group" id="date-range">
<input role="presentation" type="text" class="form-control m-input" name="date_start" placeholder="Start date" />
<div class="input-group-append">
<span class="input-group-text"><i class="la la-ellipsis-h"></i></span>
</div>
<input role="presentation" type="text" class="form-control" name="date_end" placeholder="End date" />
</div>
</div>
</div>
<div class="m-portlet__foot m-portlet__foot--fit">
<div class="m-form__actions m-form__actions--solid m-form__actions--right">
<div class="row">
<div class="col-lg-12">
<button type="submit" class="btn btn-success">Submit</button>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
$(function() {
$("#date-range").datepicker({
orientation: "bottom"
});
$("#row-form").submit(function(e) {
var form = $(this);
if (!$("[name='date_start']").val() || !$("[name='date_end']").val()) {
e.preventDefault();
swal({
title: 'Whoops!',
text: 'Please fill in both date fields.',
type: 'warning'
});
return false;
}
});
});
</script>
{% endblock %}