diff --git a/templates/v2/blocks/b_make_mover_order.html b/templates/v2/blocks/b_make_mover_order.html index 3fae2c7..37678d2 100644 --- a/templates/v2/blocks/b_make_mover_order.html +++ b/templates/v2/blocks/b_make_mover_order.html @@ -11,6 +11,6 @@
-
{% trans "Заполните форму, чтобы отправить посылку" %}
- {% include 'v2/forms/f_make_poster_order.html' %} +
{% trans "Заполните форму, чтобы перевезти посылку" %}
+ {% include 'v2/forms/f_make_mover_order.html' %}
\ No newline at end of file diff --git a/templates/v2/forms/f_make_mover_order.html b/templates/v2/forms/f_make_mover_order.html index e71bcf6..0171c98 100644 --- a/templates/v2/forms/f_make_mover_order.html +++ b/templates/v2/forms/f_make_mover_order.html @@ -2,41 +2,46 @@ {% load i18n %}
- {% trans "Укажите город" as placeholder_for_city %} +
+
+ {% trans "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" as attention_type_transport %} + + {% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' list=form.fields.type_transport.choices initial=form.initial.type_transport %} + {% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %} + {% if form.errors.type_transport %}
{{ form.errors.type_transport.0 }}
{% endif %} +
+
+ {% trans "Укажите город" as placeholder_for_city %}
- + {% include 'v2/widgets/w_select_country.html' with name='from_city' placeholder=placeholder_for_city initial=form.initial.from_city %} {% if form.errors.from_city %}
{{ form.errors.from_city.0 }}
{% endif %}
- + {% include 'v2/widgets/w_select_country.html' with name='to_city' placeholder=placeholder_for_city initial=form.initial.to_city %} {% if form.errors.to_city %}
{{ form.errors.to_city.0 }}
{% endif %}
-
-
- - {% include 'v2/widgets/w_radio_inputs.html' with name='cargo_type' list=form.fields.cargo_type.choices initial=form.initial.cargo_type %} - {% if form.errors.cargo_type %}
{{ form.errors.cargo_type.0 }}
{% endif %} -
-
{% include 'v2/widgets/w_daterangepicker.html' with name='arrival_DT' initial=form.initial.arrival_DT %} {% if form.errors.arrival_DT %}
{{ form.errors.arrival_DT.0 }}
{% endif %}
+
+ + {% include 'v2/widgets/w_daterangepicker.html' with name='departure_DT' initial=form.initial.departure_DT %} + {% if form.errors.departure_DT %}
{{ form.errors.departure_DT.0 }}
{% endif %} +
-
- {% trans "Обязательно учитывайте Правила и особенности перевозки выбранным Вами видом транспорта" as attention_type_transport %} - - {% include 'v2/widgets/w_radio_inputs.html' with name='type_transport' list=form.fields.type_transport.choices initial=form.initial.type_transport %} - {% include 'v2/widgets/w_pay_attention.html' with text=attention_type_transport %} - {% if form.errors.type_transport %}
{{ form.errors.type_transport.0 }}
{% endif %} +
+ + {% include 'v2/widgets/w_radio_inputs.html' with name='cargo_type' list=form.fields.cargo_type.choices initial=form.initial.cargo_type %} + {% if form.errors.cargo_type %}
{{ form.errors.cargo_type.0 }}
{% endif %}
diff --git a/templates/v2/forms/f_make_poster_order.html b/templates/v2/forms/f_make_poster_order.html index f6199b9..557f4e3 100644 --- a/templates/v2/forms/f_make_poster_order.html +++ b/templates/v2/forms/f_make_poster_order.html @@ -18,7 +18,7 @@
- + {% include 'v2/widgets/w_radio_inputs.html' with name='cargo_type' list=form.fields.cargo_type.choices initial=form.initial.cargo_type %} {% if form.errors.cargo_type %}
{{ form.errors.cargo_type.0 }}
{% endif %}