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

Merge branch '162-phase-2-changes' into 'master'

Browse source 
Resolve "Phase 2 changes"

Closes #162

See merge request jankstudio/resq!182
This commit is contained in:
Kendrick Chan 2018-09-03 07:58:50 +00:00
commit 02d0ec6101
4 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/assets/css/style.css
View file

@ -144,6 +144,17 @@ span.has-danger,
color: #fff !important; color: #fff !important;
} }
.m-table__row--is_mobile td {
background-color: #0000ff !important;
color: #fff !important;
}
.m-table__row--is_mobile td > span,
.m-table__row--is_mobile td > span a,
.m-table__row--is_mobile td > span a i {
color: #fff !important;
}
.m-datatable.m-datatable--default > .m-datatable__table { .m-datatable.m-datatable--default > .m-datatable__table {
min-height: 0 !important; min-height: 0 !important;
} }

1
src/Controller/JobOrderController.php
View file

@ -788,6 +788,7 @@ class JobOrderController extends BaseController
$row['status'] = $statuses[$orow->getStatus()]; $row['status'] = $statuses[$orow->getStatus()];
$row['flag_advance'] = $orow->isAdvanceOrder(); $row['flag_advance'] = $orow->isAdvanceOrder();
$row['plate_number'] = $orow->getCustomerVehicle()->getPlateNumber(); $row['plate_number'] = $orow->getCustomerVehicle()->getPlateNumber();
$row['is_mobile'] = $orow->getSource() == TransactionOrigin::MOBILE_APP;
$processor = $orow->getProcessedBy(); $processor = $orow->getProcessedBy();
if ($processor == null) if ($processor == null)

2
src/Controller/RAPIController.php
View file

@ -739,7 +739,7 @@ class RAPIController extends Controller
public function changeService(Request $req, InvoiceCreator $ic) public function changeService(Request $req, InvoiceCreator $ic)
{ {
// $this->debugRequest($req); $this->debugRequest($req);
// allow rider to change service, promo, battery and trade-in options // allow rider to change service, promo, battery and trade-in options
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();

4
templates/job-order/list.processing.html.twig
View file

@ -70,6 +70,10 @@
if (data.flag_advance) { if (data.flag_advance) {
$(row).addClass('m-table__row--danger'); $(row).addClass('m-table__row--danger');
} }
if (data.is_mobile) {
$(row).addClass('m-table__row--is_mobile');
}
} }
}, },
columns: [ columns: [