Add Source of Awareness and Remarks to job order form. #661
This commit is contained in:
Korina Cordero
parent
bbea317cf1
commit
ebaef97333
3 changed files with 87 additions and 12 deletions
|
|
@ -44,6 +44,7 @@ use App\Ramcar\WillingToWaitContent;
|
|||
use App\Ramcar\WarrantySource;
|
||||
use App\Ramcar\HubCriteria;
|
||||
use App\Ramcar\DeliveryStatus;
|
||||
use App\Ramcar\SourceOfAwareness;
|
||||
|
||||
use App\Service\InvoiceGeneratorInterface;
|
||||
use App\Service\JobOrderHandlerInterface;
|
||||
|
|
@ -396,6 +397,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
}
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
// TODO: check status before saving since JO might already
|
||||
// have a status that needs to be retained
|
||||
|
||||
|
|
@ -427,7 +434,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setNoTradeInReason($no_trade_in_reason);
|
||||
->setNoTradeInReason($no_trade_in_reason)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks);
|
||||
|
||||
// check if user is null, meaning call to create came from API
|
||||
if ($user != null)
|
||||
|
|
@ -622,6 +631,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
}
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
if (empty($error_array))
|
||||
{
|
||||
// get current user
|
||||
|
|
@ -648,7 +663,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setNoTradeInReason($no_trade_in_reason);
|
||||
->setNoTradeInReason($no_trade_in_reason)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks);
|
||||
|
||||
// did they change invoice?
|
||||
$invoice_items = $req->request->get('invoice_items', []);
|
||||
|
|
@ -794,6 +811,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$more_reason = $req->request->get('not_wait_notes');
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
if (empty($error_array))
|
||||
{
|
||||
// coordinates
|
||||
|
|
@ -817,7 +840,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setLandmark($req->request->get('landmark'))
|
||||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason);
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks);
|
||||
|
||||
// validate
|
||||
$errors = $this->validator->validate($obj);
|
||||
|
|
@ -909,6 +934,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$more_reason = $req->request->get('not_wait_notes');
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
// get current user
|
||||
$user = $this->security->getUser();
|
||||
|
||||
|
|
@ -934,7 +965,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setDeliveryStatus(DeliveryStatus::RIDER_ASSIGN);
|
||||
->setDeliveryStatus(DeliveryStatus::RIDER_ASSIGN)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks);
|
||||
|
||||
if ($user != null)
|
||||
{
|
||||
|
|
@ -1015,6 +1048,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$more_reason = $req->request->get('not_wait_notes');
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
if (empty($error_array)) {
|
||||
// coordinates
|
||||
$point = new Point($req->request->get('coord_lng'), $req->request->get('coord_lat'));
|
||||
|
|
@ -1034,7 +1073,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setDeliveryStatus(DeliveryStatus::FULFILLED);
|
||||
->setDeliveryStatus(DeliveryStatus::FULFILLED)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks);
|
||||
|
||||
// validate
|
||||
$errors = $this->validator->validate($obj);
|
||||
|
|
@ -1235,6 +1276,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$more_reason = $req->request->get('not_wait_notes');
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
// get previously assigned hub, if any
|
||||
$old_hub = $obj->getHub();
|
||||
|
||||
|
|
@ -1269,6 +1316,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks)
|
||||
->clearRider();
|
||||
|
||||
if ($user != null)
|
||||
|
|
@ -1465,6 +1514,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$more_reason = $req->request->get('not_wait_notes');
|
||||
}
|
||||
|
||||
// get source of awareness if any
|
||||
$soa_type = $req->request->get('source_of_awareness');
|
||||
|
||||
// get remarks
|
||||
$remarks = $req->request->get('remarks', '');
|
||||
|
||||
if (empty($error_array)) {
|
||||
// rider mqtt event
|
||||
// NOTE: need to send this before saving because rider will be cleared
|
||||
|
|
@ -1505,6 +1560,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
->setWillWait($req->request->get('flag_willing_to_wait'))
|
||||
->setReasonNotWait($reason)
|
||||
->setNotWaitingNotes($more_reason)
|
||||
->setSourceOfAwareness($soa_type)
|
||||
->setRemarks($remarks)
|
||||
->setDeliveryStatus(DeliveryStatus::RIDER_ASSIGN);
|
||||
|
||||
if ($user != null)
|
||||
|
|
@ -3011,6 +3068,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
|
|||
$params['willing_to_wait_content'] = WillingToWaitContent::getCollection();
|
||||
$params['no_wait_reasons'] = CustomerNotWaitReason::getCollection();
|
||||
$params['no_trade_in_reasons'] = NoTradeInReason::getCollection();
|
||||
$params['soa_types'] = SourceOfAwareness::getCollection();
|
||||
}
|
||||
|
||||
protected function initFormTags(&$params)
|
||||
|
|
|
|||
|
|
@ -449,6 +449,23 @@
|
|||
<div class="form-control-feedback hide" data-field="date_transaction"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row">
|
||||
<div class="col-lg-6">
|
||||
<label data-field="status">Source of Awareness</label>
|
||||
<select class="form-control m-input" id="source-of-awareness" name="source_of_awareness">
|
||||
<option value=""></option>
|
||||
{% for key, soa in soa_types %}
|
||||
<option value="{{ key }}"{{ key == obj.getSourceOfAwareness ? ' selected' }}>{{ soa }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="form-control-feedback hide" data-field="source_of_awareness"></div>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<label for="remarks" data-field="remarks"> Remarks </label>
|
||||
<textarea class="form-control m-input" id="remarks" rows="6" name="remarks">{{ obj.getRemarks }}</textarea>
|
||||
<div class="form-control-feedback hide" data-field="remarks"></div>
|
||||
</div>
|
||||
</div>
|
||||
<!--
|
||||
<div class="form-group m-form__group row">
|
||||
|
|
|
|||
|
|
@ -87,13 +87,13 @@
|
|||
<div class="form-group m-form__group row no-border">
|
||||
<div class="col-lg-4">
|
||||
<label data-field="status">Source of Awareness</label>
|
||||
<select class="form-control m-input" id="source-of-awareness" name="source_of_awareness">
|
||||
<option value=""></option>
|
||||
{% for key, soa in soa_types %}
|
||||
<option value="{{ key }}"{{ key == obj.getSourceOfAwareness ? ' selected' }}>{{ soa }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="form-control-feedback hide" data-field="source_of_awareness"></div>
|
||||
<select class="form-control m-input" id="source-of-awareness" name="source_of_awareness">
|
||||
<option value=""></option>
|
||||
{% for key, soa in soa_types %}
|
||||
<option value="{{ key }}"{{ key == obj.getSourceOfAwareness ? ' selected' }}>{{ soa }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<div class="form-control-feedback hide" data-field="source_of_awareness"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group m-form__group row no-border">
|
||||
|
|
|
|||
Loading…
Reference in a new issue