Merge branch 'master' into finn/recurring

This commit is contained in:
Finn 2018-03-19 16:17:24 +00:00
commit 6849f12415

View file

@ -59,8 +59,8 @@
<label for="local" class="col-md-4 col-form-label">Is Local</label> <label for="local" class="col-md-4 col-form-label">Is Local</label>
<div class="col-md-8"> <div class="col-md-8">
<select id="local" class="form-control" name="is_local"> <select id="local" class="form-control" name="is_local">
<option value="0"<%= !$valid_org->is_local ? '' : ' selected' %>>Non Local</option> <option value="0" selected>Non Local</option>
<option value="1"<%= $valid_org->is_local ? ' selected' : '' %>>Local</option> <option value="1">Local</option>
</select> </select>
</div> </div>
</div> </div>
@ -68,8 +68,8 @@
<label for="local" class="col-md-4 col-form-label">Is Fairly Traded</label> <label for="local" class="col-md-4 col-form-label">Is Fairly Traded</label>
<div class="col-md-8"> <div class="col-md-8">
<select id="local" class="form-control" name="is_fair"> <select id="local" class="form-control" name="is_fair">
<option value="0"<%= !$valid_org->is_fair ? '' : ' selected' %>>Non Fairly Traded</option> <option value="0" selected>Non Fairly Traded</option>
<option value="1"<%= $valid_org->is_fair ? ' selected' : '' %>>Fairly Traded</option> <option value="1">Fairly Traded</option>
</select> </select>
</div> </div>
</div> </div>