From d916b575da22a9b9ca13b4d6923882ff663c7ed1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 2 Aug 2021 13:26:23 +0200
Subject: [PATCH] AddAddress modal: make title dynamically passed by parent

---
 .../Resources/public/vuejs/Address/App.vue    |  8 +++--
 .../vuejs/Address/components/AddAddress.vue   | 32 ++++++++++---------
 .../public/vuejs/HouseholdAddress/App.vue     |  6 ++--
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index dea280212..c1d6fa5ac 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -4,6 +4,8 @@
          <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
          <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
          <add-address
+            modalAddTitle="add_an_address_title"
+            modalEditTitle="edit_an_address_title"
             @addNewAddress="addNewAddress">
          </add-address>
       </div>
@@ -14,10 +16,10 @@
          </show-address>
       </div>
    </div>
-   
+
    <div v-if="!edit" class='person-address__valid'>
       <h2>{{ $t('date') }}</h2>
-      
+
       <div class="input-group mb-3">
          <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
          <input type="date" class="form-control form-control-lg" name="validFrom"
@@ -25,7 +27,7 @@
             v-model="validFrom"
             aria-describedby="validFrom" />
       </div>
-      
+
       <div v-if="errors.length > 0">
          {{ errors }}
       </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 2fb5cf6c5..13f767fe0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,9 +1,9 @@
 <template>
    <button v-if="!edit" class="btn btn-create mt-4" @click="openModal">
-      {{ $t('add_an_address_title') }}
+      {{ $t(modalAddTitle) }}
    </button>
    <button v-else class="btn btn-create mt-4" @click="openModal">
-      {{ $t('edit_an_address_title') }}
+      {{ $t(modalEditTitle) }}
    </button>
 
    <teleport to="body">
@@ -12,25 +12,25 @@
          @close="modal.showModal = false">
 
          <template v-slot:header>
-            <h3 v-if="!edit" class="modal-title">{{ $t('add_an_address_title') }}</h3>
-            <h3 v-if="edit" class="modal-title">{{ $t('edit_an_address_title') }}</h3>
+            <h3 v-if="!edit" class="modal-title">{{ $t(modalAddTitle) }}</h3>
+            <h3 v-if="edit" class="modal-title">{{ $t(modalEditTitle) }}</h3>
          </template>
 
          <template v-slot:body>
             <div class="address-form">
-   
+
                <h4 class="h3">{{ $t('select_an_address_title') }}
                   <span v-if="loading">
                      <i class="fa fa-circle-o-notch fa-spin fa-lg"></i>
                   </span>
                </h4>
-            
+
                <div class="row my-3">
-                  <div class="col-lg-6">                     
-                  
+                  <div class="col-lg-6">
+
                      <div class="form-check">
                         <input type="checkbox"
-                           class="form-check-input" 
+                           class="form-check-input"
                            id="isNoAddress"
                            v-model="isNoAddress"
                            v-bind:value="value" />
@@ -38,18 +38,18 @@
                            {{ $t('isNoAddress') }}
                         </label>
                      </div>
-                     
+
                      <country-selection
                         v-bind:address="address"
                         v-bind:getCities="getCities">
                      </country-selection>
-                     
+
                      <city-selection
                         v-bind:address="address"
                         v-bind:focusOnAddress="focusOnAddress"
                         v-bind:getReferenceAddresses="getReferenceAddresses">
                      </city-selection>
-                     
+
                      <address-selection
                         v-if="!isNoAddress"
                         v-bind:address="address"
@@ -58,15 +58,15 @@
 
                   </div>
                   <div class="col-lg-6 mt-3 mt-lg-0">
-                  
+
                      <address-map
                         v-bind:address="address"
                         ref="addressMap">
                      </address-map>
-                  
+
                   </div>
                </div>
-               
+
                <address-more
                   v-if="!isNoAddress"
                   v-bind:address="address">
@@ -107,6 +107,8 @@ export default {
       AddressMore
    },
    props: [
+      'modalAddTitle',
+      'modalEditTitle'
    ],
    emits: ['addNewAddress'],
    data() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
index 0cf3a67c8..4adb87ed5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
@@ -5,6 +5,8 @@
             <h2 v-if="!edit">{{ $t('create_a_new_address') }}</h2>
             <h2 v-else>{{ $t('edit_a_new_address') }}</h2>
             <add-address
+               modalAddTitle="add_an_address_title"
+               modalEditTitle="edit_an_address_title"
                @addNewAddress="addNewAddress">
             </add-address>
          </div>
@@ -17,7 +19,7 @@
       </div>
       <div v-if="!edit" class='household__address-move__valid'>
          <h2>{{ $t('move_date') }}</h2>
-         
+
          <div class="input-group mb-3">
             <span class="input-group-text" id="validFrom"><i class="fa fa-fw fa-calendar"></i></span>
             <input type="date" class="form-control form-control-lg" name="validFrom"
@@ -25,7 +27,7 @@
                v-model="validFrom"
                aria-describedby="validFrom" />
          </div>
-         
+
          <div v-if="errors.length > 0">
             {{ errors }}
          </div>