Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Showing only changes of commit 41a6801c19 - Show all commits

View file

@ -7,7 +7,7 @@
<div class="m-portlet__body"> <div class="m-portlet__body">
<div class="row"> <div class="row">
<div class="col-12 d-flex flex-row justify-content-start"> <div class="col-12 d-flex flex-row justify-content-start">
<img class="mr-2 rider-image" src="{{ asset(rider.getImageFile ? "uploads/" . rider.getImageFile : "assets/images/user.gif") }}" alt=""> <img class="mr-2 rider-image" src="{{ asset(rider.getImageFile ? "uploads/" ~ rider.getImageFile : "assets/images/user.gif") }}" alt="">
<div class="flex-grow-1"> <div class="flex-grow-1">
<div><strong>Order #{{ jo.getID }}</strong></div> <div><strong>Order #{{ jo.getID }}</strong></div>
<div>{{ rider.getFullName }}</div> <div>{{ rider.getFullName }}</div>