Merge branch '475-resq-missing-ticket-entries-for-cancelled-jos' into '485-resq-september-10-release'

Add fulfill-cancel mode to display the timeline. #475

See merge request jankstudio/resq!570
This commit is contained in:
Korina Cordero 2020-09-09 08:09:30 +00:00
commit 2516b14de8

View file

@ -34,7 +34,7 @@
{% elseif mode == 'update-reassign-rider' %}
Re-assign Rider
<small>{{ obj.getID() }}</small>
{% elseif mode == 'update-all' %}
{% elseif mode in ['update-all', 'fulfill-cancel'] %}
Viewing
<small>{{ obj.getID() }}</small>
{% else %}
@ -825,7 +825,7 @@
{% endif %}
{% endif %}
{% if mode == 'update-all' %}
{% if mode in ['update-all', 'fulfill-cancel'] %}
<div class="m-form__seperator m-form__seperator--dashed"></div>
<div class="m-form__section">