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

Remove the Action and Distance in KM from walkin form. Remove the Action columns in one step form. #424

Browse source
This commit is contained in:
Korina Cordero 2020-06-25 08:24:09 +00:00
parent c3b4e1219b
commit a65211a709
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -479,7 +479,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$new_cv->setCustomer($new_cust) $new_cv->setCustomer($new_cust)
->setVehicle($new_vehicle) ->setVehicle($new_vehicle)
->setPlateNumber($req->request->get('cv_plate')) ->setPlateNumber(trim($req->request->get('cv_plate')))
->setModelYear($req->request->get('cv_year')) ->setModelYear($req->request->get('cv_year'))
->setColor('') ->setColor('')
->setStatusCondition('') ->setStatusCondition('')
@ -2490,7 +2490,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$error_array['customer_phone_mobile'] = 'Invalid mobile phone number.'; $error_array['customer_phone_mobile'] = 'Invalid mobile phone number.';
// check if plate number is in request // check if plate number is in request
if (empty($req->request->get('cv_plate'))) if (empty(trim($req->request->get('cv_plate'))))
$error_array['cv_plate'] = 'Plate number is required.'; $error_array['cv_plate'] = 'Plate number is required.';
// find the vehicle using vid // find the vehicle using vid
@ -2516,7 +2516,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$new_cv->setCustomer($new_cust) $new_cv->setCustomer($new_cust)
->setVehicle($new_vehicle) ->setVehicle($new_vehicle)
->setPlateNumber($req->request->get('cv_plate')) ->setPlateNumber(trim($req->request->get('cv_plate')))
->setModelYear($req->request->get('cv_year')) ->setModelYear($req->request->get('cv_year'))
->setColor('') ->setColor('')
->setStatusCondition('') ->setStatusCondition('')

9
templates/job-order/cmb.form.onestep.html.twig
View file

@ -415,7 +415,6 @@
<th>Branch</th> <th>Branch</th>
<th>Contact Numbers</th> <th>Contact Numbers</th>
<th>Distance in KM</th> <th>Distance in KM</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="nearest_hubs"> <tbody id="nearest_hubs">
@ -425,7 +424,6 @@
<td>{{ hub.hub.getName }}</td> <td>{{ hub.hub.getName }}</td>
<td>{{ hub.hub.getBranch }}</td> <td>{{ hub.hub.getBranch }}</td>
<td>{{ hub.hub.getContactNumbers }}</td> <td>{{ hub.hub.getContactNumbers }}</td>
<td></span></td>
<td></td> <td></td>
{% endfor %} {% endfor %}
{% endif %} --> {% endif %} -->
@ -462,14 +460,13 @@
<th>Last Name</th> <th>Last Name</th>
<th>Contact No.</th> <th>Contact No.</th>
<th>Plate Number</th> <th>Plate Number</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="riders"> <tbody id="riders">
{% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %} {% if mode in ['onestep-edit', 'view-all', 'update-fulfillment'] %}
{% set avail_riders = obj.getHub.getAvailableRiders|default([]) %} {% set avail_riders = obj.getHub.getAvailableRiders|default([]) %}
<tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}"> <tr class="placeholder-row{{ obj.getHub and avail_riders|length > 0 ? ' hide' }}">
<td colspan="5"> <td colspan="4">
No riders available. No riders available.
</td> </td>
</tr> </tr>
@ -765,7 +762,6 @@ $(function() {
hub_table += '<td>' + hub['branch'] + '</td>'; hub_table += '<td>' + hub['branch'] + '</td>';
hub_table += '<td>' + hub['cnum'] + '</td>'; hub_table += '<td>' + hub['cnum'] + '</td>';
hub_table += '<td>' + hub['distance'] + '</td>'; hub_table += '<td>' + hub['distance'] + '</td>';
hub_table += '<td></td>';
hub_table += '</tr>'; hub_table += '</tr>';
} }
@ -794,7 +790,6 @@ $(function() {
hub_table += '<td>' + hub['branch'] + '</td>'; hub_table += '<td>' + hub['branch'] + '</td>';
hub_table += '<td>' + hub['cnum'] + '</td>'; hub_table += '<td>' + hub['cnum'] + '</td>';
hub_table += '<td>' + hub['distance'] + '</td>'; hub_table += '<td>' + hub['distance'] + '</td>';
hub_table += '<td></td>';
hub_table += '</tr>'; hub_table += '</tr>';
} }
@ -820,7 +815,6 @@ $(function() {
hub_table += '<td>' + hub['branch'] + '</td>'; hub_table += '<td>' + hub['branch'] + '</td>';
hub_table += '<td>' + hub['cnum'] + '</td>'; hub_table += '<td>' + hub['cnum'] + '</td>';
hub_table += '<td>' + hub['distance'] + '</td>'; hub_table += '<td>' + hub['distance'] + '</td>';
hub_table += '<td></td>';
hub_table += '</tr>'; hub_table += '</tr>';
} }
} }
@ -931,7 +925,6 @@ $(function() {
rider_table += '<td>' + rider['last_name'] + '</td>'; rider_table += '<td>' + rider['last_name'] + '</td>';
rider_table += '<td>' + rider['contact_num'] + '</td>'; rider_table += '<td>' + rider['contact_num'] + '</td>';
rider_table += '<td>' + rider['plate_num'] + '</td>'; rider_table += '<td>' + rider['plate_num'] + '</td>';
rider_table += '<td></td>';
rider_table += '</tr>'; rider_table += '</tr>';
} }

6
templates/job-order/cmb.form.walkin.html.twig
View file

@ -357,8 +357,6 @@
<th>Hub</th> <th>Hub</th>
<th>Branch</th> <th>Branch</th>
<th>Contact Numbers</th> <th>Contact Numbers</th>
<th>Distance in KM</th>
<th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="nearest_hubs"> <tbody id="nearest_hubs">
@ -367,16 +365,12 @@
<td>{{ obj.getHub.getName }}</td> <td>{{ obj.getHub.getName }}</td>
<td>{{ obj.getHub.getBranch }}</td> <td>{{ obj.getHub.getBranch }}</td>
<td>{{ obj.getHub.getContactNumbers }}</td> <td>{{ obj.getHub.getContactNumbers }}</td>
<td></span></td>
<td></td>
{% else %} {% else %}
{% for hub in hubs %} {% for hub in hubs %}
<tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}> <tr data-id="{{ hub.getID }}"{{ obj.getHub and obj.getHub.getID == hub.getID ? ' class="m-table__row--primary"' }}>
<td>{{ hub.getName }}</td> <td>{{ hub.getName }}</td>
<td>{{ hub.getBranch }}</td> <td>{{ hub.getBranch }}</td>
<td>{{ hub.getContactNumbers }}</td> <td>{{ hub.getContactNumbers }}</td>
<td></span></td>
<td></td>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</tbody> </tbody>