Resolve "Bulk fixes for UAT handover" #844

Merged
jankstudio merged 10 commits from 33-bulk-fixes-for-uat-handover into master 2018-02-28 23:53:29 +00:00
Showing only changes of commit f779c50b8e - Show all commits

View file

@ -256,8 +256,28 @@
<div class="col-lg-6">
<label data-field="delivery_instructions">Delivery Instructions</label>
<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label>Prepared By</label>
<input type="text" name="created_by" class="form-control m-input" value="{{ obj.getCreatedBy.getFullName|default('') }}" disabled>
<div class="form-control-feedback hide" data-field="date_transaction"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label>Dispatched By</label>
<input type="text" name="created_by" class="form-control m-input" value="{{ obj.getProcessedBy.getFullName|default('') }}" disabled>
<div class="form-control-feedback hide" data-field="date_transaction"></div>
</div>
</div>
<div class="form-group m-form__group row">
<div class="col-lg-6">
<label>Rider Assigned By</label>
<input type="text" name="created_by" class="form-control m-input" value="{{ obj.getAssignedBy.getFullName|default('') }}" disabled>
<div class="form-control-feedback hide" data-field="date_transaction"></div>
</div>
</div>
<!--
<div class="form-group m-form__group row">