Merge branch 'address_refactoring' into add-location-period

src/Bundle/ChillPersonBundle/Resources/views/Address/edit.html.twig

@@ -26,6 +26,7 @@
     {% block content %}
         <h1>{{ block('title') }}</h1>
 
+        {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
             address_id: person.lastAddress.id,
             mode: 'edit',

src/Bundle/ChillPersonBundle/Resources/views/Address/list.html.twig

@@ -67,12 +67,28 @@
 
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {#
+                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
 
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
 
                     {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+                    {#
+                        {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
+                            address_id: address.id,
+                            mode: 'edit',
+                            binModalStep1: false,
+                            binModalStep2: false,
+                        } %}
+                    #}
 
                 <div class="date">
                     {% if address.validTo is not empty %}

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -26,6 +26,7 @@
     {% block content %}
         <h1>{{ block('title') }}</h1>
 
+        {# include vue_address component #}
         {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
             address_id: person.lastAddress.id,
             mode: 'new',

src/Bundle/ChillPersonBundle/Resources/views/Household/address_edit.html.twig

@@ -6,6 +6,7 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
+        {# include vue_address component #}
         <div id="household-address"></div>
     </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/address_move.html.twig

@@ -6,6 +6,7 @@
     <h1>{{ block('title') }}</h1>
 
     <div>
+        {# include vue_address component #}
         <div id="household-address"></div>
     </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Household/addresses.html.twig

@@ -13,10 +13,13 @@
 
         <ul class="record_actions my-3">
             <li style="margin: auto;">
+
+                {# include vue_address component #}
                 <a class="btn btn-lg btn-create"
                    href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
                     {{ 'Move household'|trans }}
                 </a>
+
             </li>
         </ul>
 
@@ -34,7 +37,10 @@
 
                 <div class="{{ 'row' ~ row ~ ' ' }}col-b"></div>
                 <div class="{{ 'row' ~ row ~ ' ' }}col-c action">
+
+                    {# include vue_address component #}
                     <a href="" class="btn btn-sm btn-create">{{ 'Insert an address'|trans }}</a></div>
+
                 <div class="date">
                     {% if address.validTo is not empty %}
                         {{ address.validTo|format_date('short') }}
@@ -54,7 +60,11 @@
                 }) }}
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}" class="btn btn-edit"></a>
+
+                        {# include vue_address component #}
+                        <a href="{{ path('chill_person_household_address_edit', { 'household_id': household.id, 'address_id' : address.id } ) }}"
+                           class="btn btn-edit"></a>
+
                     </li>
                 </ul>
             </div>
@@ -77,10 +87,13 @@
             </a>
         </li>
         <li>
+
+            {# include vue_address component #}
             <a class="btn btn-create"
-            href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
+                href="{{ chill_path_add_return_path('chill_person_household_address_move', { 'household_id': household.id }) }}">
-            {{ 'Move household'|trans }}
+                {{ 'Move household'|trans }}
             </a>
+
         </li>
     </ul>