Merge branch '746-resq-2-0-final' into 778-add-in-app-support-for-battery-trade-ins
This commit is contained in:
Ramon Gutierrez
commit
fd0c9ede26
8 changed files with 433 additions and 12 deletions
|
|
@ -277,6 +277,8 @@ catalyst_auth:
|
|||
label: Fulfill Cancelled JO
|
||||
- id: jo_resq_proc.list
|
||||
label: RESQ Dispatch
|
||||
- id: jo_resq_all.list
|
||||
label: RESQ All
|
||||
|
||||
- id: support
|
||||
label: Customer Support Access
|
||||
|
|
|
|||
|
|
@ -168,6 +168,10 @@ catalyst_menu:
|
|||
acl: jo_hub.list
|
||||
label: '[menu.joborder.hubview]'
|
||||
parent: joborder
|
||||
- id: jo_resq_all
|
||||
acl: jo_resq_all.list
|
||||
label: '[menu.joborder.resqall]'
|
||||
parent: joborder
|
||||
|
||||
- id: support
|
||||
acl: support.menu
|
||||
|
|
|
|||
|
|
@ -7,3 +7,17 @@ jo_resq_proc_rows:
|
|||
path: /resq-job-order/processing-rows
|
||||
controller: App\Controller\ResqJobOrderController::datatableRows
|
||||
methods: [POST]
|
||||
defaults:
|
||||
tier: "proc"
|
||||
|
||||
jo_resq_all:
|
||||
path: /resq-job-order/all
|
||||
controller: App\Controller\ResqJobOrderController::listAll
|
||||
methods: [GET]
|
||||
|
||||
jo_resq_all_rows:
|
||||
path: /resq-job-orer/all
|
||||
controller: App\Controller\ResqJobOrderController::datatableRows
|
||||
methods: [POST]
|
||||
defaults:
|
||||
tier: "all"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ use Doctrine\ORM\EntityManagerInterface;
|
|||
use Catalyst\MenuBundle\Annotation\Menu;
|
||||
|
||||
use App\Entity\JobOrder;
|
||||
use App\Entity\Rider;
|
||||
|
||||
use App\Service\JobOrderHandlerInterface;
|
||||
|
||||
|
|
@ -23,6 +24,8 @@ use App\Ramcar\ServiceType;
|
|||
use App\Ramcar\WillingToWaitContent;
|
||||
use App\Ramcar\CustomerClassification;
|
||||
|
||||
use DateTime;
|
||||
|
||||
class ResqJobOrderController extends Controller
|
||||
{
|
||||
/**
|
||||
|
|
@ -39,7 +42,7 @@ class ResqJobOrderController extends Controller
|
|||
/**
|
||||
* @IsGranted("jo_resq_proc.list")
|
||||
*/
|
||||
public function datatableRows(Request $req, JobOrderHandlerInterface $jo_handler)
|
||||
public function datatableRows(EntityManagerInterface $em, Request $req, $tier, JobOrderHandlerInterface $jo_handler)
|
||||
{
|
||||
// get query builder
|
||||
$qb = $this->getDoctrine()
|
||||
|
|
@ -52,7 +55,14 @@ class ResqJobOrderController extends Controller
|
|||
// count total records
|
||||
$tquery = $qb->select('COUNT(q)');
|
||||
|
||||
$this->setQueryFilters($datatable, $tquery, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
|
||||
// right now, tier is either proc or all
|
||||
if ($tier == 'proc')
|
||||
$this->setQueryFilters($datatable, $tquery, $qb, $tier);
|
||||
else
|
||||
{
|
||||
// default to all
|
||||
$this->setQueryFilters($datatable, $tquery, $qb, $tier);
|
||||
}
|
||||
|
||||
$total = $tquery->getQuery()
|
||||
->getSingleScalarResult();
|
||||
|
|
@ -74,9 +84,17 @@ class ResqJobOrderController extends Controller
|
|||
];
|
||||
|
||||
// build query
|
||||
$qb = $em->getRepository(JobOrder::class)
|
||||
->createQueryBuilder('q');
|
||||
$query = $qb->select('q');
|
||||
|
||||
$this->setQueryFilters($datatable, $query, $qb, JOStatus::PENDING, TransactionOrigin::MOBILE_APP);
|
||||
if ($tier == 'proc')
|
||||
$this->setQueryFilters($datatable, $query, $qb, $tier);
|
||||
else
|
||||
{
|
||||
// default to all
|
||||
$this->setQueryFilters($datatable, $query, $qb, $tier);
|
||||
}
|
||||
|
||||
// check if sorting is present, otherwise use default
|
||||
if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
|
||||
|
|
@ -110,7 +128,13 @@ class ResqJobOrderController extends Controller
|
|||
// check if customer is not willing to wait
|
||||
$will_not_wait = $orow->getWillWait();
|
||||
if ($will_not_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
|
||||
$is_emergency = true;
|
||||
{
|
||||
// check if reason is emergency or rush
|
||||
$reason = $orow->getReasonNotWait();
|
||||
if (($reason == CustomerNotWaitReason::EMERGENCY) ||
|
||||
($reason == CustomerNotWaitReason::RUSH_REQUEST))
|
||||
$is_emergency = true;
|
||||
}
|
||||
|
||||
// add row data
|
||||
$row['id'] = $orow->getID();
|
||||
|
|
@ -125,6 +149,9 @@ class ResqJobOrderController extends Controller
|
|||
$row['is_mobile'] = $orow->getSource() == TransactionOrigin::MOBILE_APP;
|
||||
$row['is_vip'] = $is_vip;
|
||||
$row['is_emergency'] = $is_emergency;
|
||||
$row['flag_cust_new'] = $orow->isCustNew();
|
||||
$row['date_assign'] = !empty($orow->getDateAssign()) ? $orow->getDateAssign()->format("c") : null;
|
||||
$row['date_fulfill'] = !empty($orow->getDateFulfill()) ? $orow->getDateFulfill()->format("c") : null;
|
||||
|
||||
$processor = $orow->getProcessedBy();
|
||||
if ($processor == null)
|
||||
|
|
@ -132,11 +159,28 @@ class ResqJobOrderController extends Controller
|
|||
else
|
||||
$row['processor'] = $orow->getProcessedBy()->getFullName();
|
||||
|
||||
// get the assigned hub, if any
|
||||
$assigned_hub = $orow->getHub();
|
||||
if ($assigned_hub == null)
|
||||
$row['assigned_hub'] = '';
|
||||
else
|
||||
$row['assigned_hub'] = $orow->getHub()->getName();
|
||||
|
||||
// add the items for Actions
|
||||
$jo_id = $orow->getID();
|
||||
|
||||
$row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
$row['meta']['unlock_url'] = $this->generateUrl('jo_proc_unlock', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
if ($tier == 'proc')
|
||||
{
|
||||
$row['meta']['update_url'] = $this->generateUrl('jo_proc_form', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
$row['meta']['unlock_url'] = $this->generateUrl('jo_proc_unlock', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
}
|
||||
else
|
||||
{
|
||||
// default to all
|
||||
$row['meta']['update_url'] = $this->generateUrl('jo_all_form', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
$row['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id, 'origin' => 'resq']);
|
||||
$row['meta']['view_url'] = $this->generateUrl('jo_all_view_form',['id' => $jo_id, 'origin' => 'resq']);
|
||||
}
|
||||
|
||||
$rows[] = $row;
|
||||
}
|
||||
|
|
@ -148,11 +192,77 @@ class ResqJobOrderController extends Controller
|
|||
]);
|
||||
}
|
||||
|
||||
protected function setQueryFilters($datatable, &$query, $qb, $status, $source)
|
||||
/**
|
||||
* @Menu(selected="jo_resq_all")
|
||||
* @IsGranted("jo_resq_all.list")
|
||||
*/
|
||||
public function listAll(EntityManagerInterface $em)
|
||||
{
|
||||
$query->where('q.status = :status')
|
||||
->andWhere('q.source = :source')
|
||||
->setParameter('status', $status)
|
||||
->setParameter('source', $source);
|
||||
$params['table_refresh_rate'] = $this->container->getParameter('job_order_refresh_interval');
|
||||
|
||||
// get riders for dropdown
|
||||
$params['riders'] = $em->getRepository(Rider::class)->findAll();
|
||||
|
||||
return $this->render('resq-job-order/list.all.html.twig', $params);
|
||||
}
|
||||
|
||||
protected function setQueryFilters($datatable, &$query, $qb, $tier)
|
||||
{
|
||||
switch ($tier)
|
||||
{
|
||||
case 'proc':
|
||||
$query->where('q.status = :status')
|
||||
->andWhere('q.source = :source')
|
||||
->setParameter('status', JOStatus::PENDING)
|
||||
->setParameter('source', TransactionOrigin::MOBILE_APP);
|
||||
|
||||
if (isset($datatable['query']['data-rows-search']))
|
||||
{
|
||||
$query->andWhere('q.plate_number like :filter')
|
||||
->orWhere('q.phone_mobile like :filter')
|
||||
->orWhere('q.first_name like :filter')
|
||||
->orWhere('q.last_name like :filter')
|
||||
->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
|
||||
}
|
||||
|
||||
break;
|
||||
case 'all':
|
||||
if (isset($datatable['query']['data-rows-search']))
|
||||
{
|
||||
$query->andWhere('q.plate_number like :filter')
|
||||
->orWhere('q.phone_mobile like :filter')
|
||||
->orWhere('q.first_name like :filter')
|
||||
->orWhere('q.last_name like :filter')
|
||||
->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
|
||||
}
|
||||
if (isset($datatable['query']['rider']))
|
||||
{
|
||||
$query->innerJoin('q.rider', 'r')
|
||||
->andWhere('r.id = :rider_id')
|
||||
->setParameter('rider_id', $datatable['query']['rider']);
|
||||
}
|
||||
if (isset($datatable['query']['schedule_date']))
|
||||
{
|
||||
$start = $datatable['query']['schedule_date'][0] . ' ' . '00:00:00';
|
||||
$end = $datatable['query']['schedule_date'][1] . ' ' . '23:59:00';
|
||||
|
||||
$date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start);
|
||||
$date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end);
|
||||
|
||||
$query->andWhere('q.date_schedule >= :date_start')
|
||||
->andWhere('q.date_schedule <= :date_end')
|
||||
->setParameter('date_start', $date_start)
|
||||
->setParameter('date_end', $date_end);
|
||||
}
|
||||
|
||||
$query->andWhere('q.source = :source')
|
||||
->setParameter('source', TransactionOrigin::MOBILE_APP);
|
||||
|
||||
break;
|
||||
default:
|
||||
$query->where('q.source = :source')
|
||||
->setParameter('source', TransactionOrigin::MOBILE_APP);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -206,6 +206,7 @@
|
|||
<div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<!-- commenting out car club at request of customer since promo has ended
|
||||
<div class="col-lg-3">
|
||||
<div class="col-lg-12 form-group-inner">
|
||||
<div class="m-checkbox-list">
|
||||
|
|
@ -223,7 +224,7 @@
|
|||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="m-form__section">
|
||||
|
|
|
|||
|
|
@ -130,6 +130,7 @@
|
|||
<div class="form-control-feedback hide" data-field="flag_dpa_consent"></div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<!-- commenting out because customer request
|
||||
<div class="col-lg-3">
|
||||
<div class="col-lg-12 form-group-inner">
|
||||
<div class="m-checkbox-list">
|
||||
|
|
@ -148,6 +149,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="m-form__section">
|
||||
|
|
|
|||
287
templates/resq-job-order/list.all.html.twig
Normal file
287
templates/resq-job-order/list.all.html.twig
Normal file
|
|
@ -0,0 +1,287 @@
|
|||
{% 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">
|
||||
RESQ Job Orders (All)
|
||||
</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- END: Subheader -->
|
||||
<div class="m-content">
|
||||
<!--Begin::Section-->
|
||||
<div class="row">
|
||||
<div class="col-xl-12">
|
||||
<div class="m-portlet m-portlet--mobile">
|
||||
<div class="m-portlet__body">
|
||||
<div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
|
||||
<div class="row align-items-center">
|
||||
<div class="col-xl-12">
|
||||
<div class="form-group m-form__group row align-items-center">
|
||||
<div class="col-md-4">
|
||||
<div class="m-input-icon m-input-icon--left">
|
||||
<input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
|
||||
<span class="m-input-icon__icon m-input-icon__icon--left">
|
||||
<span><i class="la la-search"></i></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="m-input-icon m-input-icon--left">
|
||||
<div class="input-group">
|
||||
<select class="form-control m-input" id="rider_list" name="rider_list">
|
||||
<option value="">All Riders</option>
|
||||
{% for rider in riders %}
|
||||
<option value="{{ rider.getID }}">{{ rider.getFirstName ~ ' ' ~ rider.getLastName }} </option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="m-input-icon m-input-icon--left">
|
||||
<div class="input-daterange input-group" id="date-range">
|
||||
<input role="presentation" type="text" class="form-control m-input" id="date_start" 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" id="date_end" name="date_end" placeholder="End date" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--begin: Datatable -->
|
||||
<div id="data-rows"></div>
|
||||
<!--end: Datatable -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script>
|
||||
$(function() {
|
||||
$("#date-range").datepicker({
|
||||
orientation: "bottom"
|
||||
});
|
||||
|
||||
var options = {
|
||||
data: {
|
||||
type: 'remote',
|
||||
source: {
|
||||
read: {
|
||||
url: '{{ url('jo_resq_all_rows') }}',
|
||||
method: 'POST'
|
||||
}
|
||||
},
|
||||
saveState: {
|
||||
cookie: false,
|
||||
webstorage: false
|
||||
},
|
||||
pageSize: 10,
|
||||
serverPaging: true,
|
||||
serverFiltering: true,
|
||||
serverSorting: true
|
||||
},
|
||||
rows: {
|
||||
beforeTemplate: function (row, data, index) {
|
||||
var attribute = getRowAttribute(data);
|
||||
// check if we have to apply a background color for the row
|
||||
if (attribute) {
|
||||
var row_class = "m-table__row--" + attribute;
|
||||
$(row).addClass(row_class);
|
||||
}
|
||||
},
|
||||
afterTemplate: function (row, data, index) {
|
||||
// if this row has an incrementing timer, handle the behavior
|
||||
const timer = row.find('[data-incrementing]')[0];
|
||||
|
||||
if (timer) {
|
||||
setInterval(() => {
|
||||
const dateStart = new moment(data.date_assign, moment.ISO_8601);
|
||||
const dateEnd = moment();
|
||||
|
||||
timer.innerHTML = timeDiff(dateStart, dateEnd);
|
||||
}, 1000)
|
||||
}
|
||||
},
|
||||
},
|
||||
columns: [
|
||||
{
|
||||
field: 'id',
|
||||
title: 'JO Number'
|
||||
},
|
||||
{
|
||||
field: 'plate_number',
|
||||
title: 'Plate #'
|
||||
},
|
||||
{
|
||||
field: 'flag_cust_new',
|
||||
title: 'New',
|
||||
template: function (row, index, datatable) {
|
||||
var tag = '';
|
||||
|
||||
if (row.flag_cust_new === true) {
|
||||
tag = '<span class="m-badge m-badge--success m-badge--wide">Yes</span>';
|
||||
} else {
|
||||
tag = '<span class="m-badge m-badge--danger m-badge--wide">No</span>';
|
||||
}
|
||||
|
||||
return tag;
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'customer_name',
|
||||
title: 'Customer'
|
||||
},
|
||||
{
|
||||
field: 'delivery_address',
|
||||
title: 'Customer Area'
|
||||
},
|
||||
{
|
||||
field: 'assigned_hub',
|
||||
title: 'Assigned Hub'
|
||||
},
|
||||
{
|
||||
field: 'service_type',
|
||||
title: 'Transaction Type'
|
||||
},
|
||||
{
|
||||
field: 'date_schedule',
|
||||
title: 'Scheduled Date'
|
||||
},
|
||||
{
|
||||
field: 'status',
|
||||
title: 'Status'
|
||||
},
|
||||
{
|
||||
field: 'processor',
|
||||
title: 'Dispatcher'
|
||||
},
|
||||
{
|
||||
field: '',
|
||||
title: 'Dispatch Time',
|
||||
sortable: false,
|
||||
searchable: false,
|
||||
textAlign: 'right',
|
||||
template: function (row, index, datatable) {
|
||||
let dateAssign;
|
||||
let dateEnd;
|
||||
let incrementing = false;
|
||||
|
||||
// only display timer for these statuses
|
||||
const statusesWithTimer = [
|
||||
'Assigned',
|
||||
'In Transit',
|
||||
'In Progress',
|
||||
'Completed', // NOTE: completed would be based off the fulfillment time
|
||||
];
|
||||
|
||||
if (row.date_assign && statusesWithTimer.includes(row.status)) {
|
||||
dateAssign = new moment(row.date_assign, moment.ISO_8601);
|
||||
|
||||
// on completed jos, use date_fulfill as end date and do not increment
|
||||
if (row.status == 'Completed') {
|
||||
if (row.date_fulfill) {
|
||||
dateEnd = new moment(row.date_fulfill, moment.ISO_8601);
|
||||
}
|
||||
} else {
|
||||
dateEnd = moment();
|
||||
incrementing = true;
|
||||
}
|
||||
}
|
||||
|
||||
return dateEnd ? '<span class="m-badge m-badge--wide m--font-boldest ' + (incrementing ? 'm-badge--warning" data-incrementing="1"' : 'm-badge--success"') + '>' + timeDiff(dateAssign, dateEnd) + '</span>' : '-';
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'Actions',
|
||||
width: 110,
|
||||
title: 'Actions',
|
||||
sortable: false,
|
||||
overflow: 'visible',
|
||||
template: function (row, index, datatable) {
|
||||
var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="Edit"><i class="la la-edit"></i></a>';
|
||||
actions += '<a href="' + row.meta.view_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View"><i class="la la-eye"></i></a>';
|
||||
actions += '<a href="' + row.meta.pdf_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="PDF" target="_blank"><i class="la la-file-o"></i></a>';
|
||||
|
||||
return actions;
|
||||
},
|
||||
}
|
||||
],
|
||||
search: {
|
||||
onEnter: false,
|
||||
input: $('#data-rows-search'),
|
||||
delay: 400
|
||||
}
|
||||
};
|
||||
|
||||
var table = $("#data-rows").mDatatable(options);
|
||||
|
||||
// auto refresh table
|
||||
setInterval(function() {
|
||||
table.reload();
|
||||
}, {{ table_refresh_rate }});
|
||||
|
||||
$("#rider_list").on("change", function() {
|
||||
table.search($(this).val(), "rider");
|
||||
});
|
||||
|
||||
$("#date_start").on("change", function() {
|
||||
var date_start = $(this).val();
|
||||
var date_end = $("[name='date_end']").val();
|
||||
var date_array = [date_start, date_end];
|
||||
|
||||
table.search(date_array, "schedule_date");
|
||||
});
|
||||
|
||||
$("#date_end").on("change", function() {
|
||||
console.log($(this).val());
|
||||
|
||||
var date_end = $(this).val();
|
||||
var date_start = $("[name='date_start']").val();
|
||||
var date_array = [date_start, date_end];
|
||||
|
||||
table.search(date_array, "schedule_date");
|
||||
});
|
||||
|
||||
// get difference in hh:mm:ss format
|
||||
const timeDiff = (startDate, endDate) => {
|
||||
const seconds = Math.abs(startDate.diff(endDate, 'seconds'));
|
||||
|
||||
const hh = Math.floor(seconds / 3600).toString().padStart(2, "0");
|
||||
const mm = Math.floor((seconds % 3600) / 60).toString().padStart(2, "0");
|
||||
const ss = (seconds % 60).toString().padStart(2, "0");
|
||||
|
||||
return [hh, mm, ss].join(':');
|
||||
}
|
||||
});
|
||||
|
||||
function getRowAttribute(data) {
|
||||
if (data.is_vip) {
|
||||
return 'is_vip';
|
||||
}
|
||||
if (data.is_emergency) {
|
||||
return 'is_emergency';
|
||||
}
|
||||
if (data.flag_advance) {
|
||||
return 'danger';
|
||||
}
|
||||
if (data.is_mobile) {
|
||||
return 'is_mobile';
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
@ -126,6 +126,7 @@ menu.joborder.fulfillment: 'Fulfillment'
|
|||
menu.joborder.open: 'Open'
|
||||
menu.joborder.viewall: 'View All'
|
||||
menu.joborder.hubview: 'Hub View'
|
||||
menu.joborder.resqall: 'RESQ View All'
|
||||
|
||||
menu.support: 'Support'
|
||||
menu.support.customers: 'Customers'
|
||||
|
|
|
|||
Loading…
Reference in a new issue