Merge branch 'improve_address' into person_renderbox_thirdparty_onthefly

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue

@@ -54,7 +54,7 @@ export default {
       assignAddress() {
         //console.log('assignAddress id', this.person.current_household_address);
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'person',
             personId: this.person.id

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue

@@ -41,7 +41,7 @@
                   :key="addAddress.type"
                   :options="addAddress.options"
                   :result="addAddress.result"
-                  @submitAddress="submitTemporaryAddress"
+                  :addressChanged="submitTemporaryAddress"
                   ref="addAddress">
                </add-address>
             </li>
@@ -118,7 +118,7 @@ export default {
       initAddressContext() {
          let context = {
             entity: {
-               type: this.accompanyingCourse.type,
+               name: this.accompanyingCourse.type,
                id: this.accompanyingCourse.id
             },
             edit: false,
@@ -133,7 +133,7 @@ export default {
       removeAddress() {
         //console.log('remove address');
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'none'
          };
@@ -142,9 +142,8 @@ export default {
       displayErrors() {
          return this.$refs.addAddress.errorMsg;
       },
-      submitTemporaryAddress() {
+      submitTemporaryAddress(payload) {
         //console.log('@@@ click on Submit Temporary Address Button');
-         let payload = this.$refs.addAddress.submitNewAddress();
          payload['locationStatusTo'] = 'address'; // <== temporary, not none, not person
          this.$store.dispatch('updateLocation', payload);
          this.$store.commit('setEditContextTrue');

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

@@ -30,8 +30,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
 
     {% endblock %}

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

@@ -74,8 +74,8 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            bindModalStep1: false,
+                            bindModalStep2: false,
                         } %}
                     #}
 
@@ -90,8 +90,8 @@
                             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
                             mode: 'edit',
                             addressId: address.id,
-                            binModalStep1: false,
-                            binModalStep2: false,
+                            bindModalStep1: false,
+                            bindModalStep2: false,
                         } %}
                     #}
 

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

@@ -30,8 +30,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'person', id: person.id },
             backUrl: path('chill_person_address_list', { 'person_id': person.id }),
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
 
     {% endblock %}

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

@@ -10,8 +10,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
     </div>
 

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

@@ -10,8 +10,8 @@
         {% include '@ChillMain/Address/_insert_vue_address.html.twig' with {
             targetEntity: { name: 'household', id: household.id },
             backUrl: path('chill_person_household_addresses', { 'household_id': household.id })
-            binModalStep1: false,
-            binModalStep2: false,
+            bindModalStep1: false,
+            bindModalStep2: false,
         } %}
     </div>
 

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

@@ -37,8 +37,12 @@
                             buttonSize: 'btn-sm',
                             buttonText: 'Move household',
                             modalTitle: 'Move household',
-                            buttonDisplayText: false
+                            buttonDisplayText: false,
                         } %}
+                        {#
+                            bindModalStep1: false,
+                            bindModalStep2: true,
+                        #}
                     </li>
                     <li class="list-inline-item">
                         <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"