fix edit adresa sediu ong

code4romania · Jan 16, 2024 · 3e3784b · 3e3784b
1 parent 48ceb87
commit 3e3784b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/lang/ro.json b/lang/ro.json
@@ -176,7 +176,8 @@
     "organization_phone_label": "Telefon contact organizație (public)",
     "organization_contact_person_label": "Persoana de contact",
     "organization_email_label": "Email contact organizație (public)",
-    "organization_address_label": "Adresă sediu",
+    "organization_address_county_label": "Județ",
+    "organization_address_street_address_label": "Adresă sediu",
     "address_label": "Strada",
     "payment_gateway_data": "Date EuPlătesc",
     "merchant_id": "Merchant ID",

diff --git a/resources/js/Pages/AdminOng/Organizations/Edit.vue b/resources/js/Pages/AdminOng/Organizations/Edit.vue
@@ -352,9 +352,8 @@
             </Field>
 
             <!-- Edit organizaton address -->
-            <Field :label="$t('organization_address_label')" :hasPendingChanges="changes.includes('address')" alt>
+            <Field :label="$t('organization_address_county_label')" :hasPendingChanges="changes.includes('counties')" alt>
                 <template #value>
-                    {{ organization.address }},
                     {{ originalOrganization.county_names.join(', ') }}
                 </template>
 
@@ -363,7 +362,6 @@
                         @action="editField('counties')"
                         @cancel="
                             organization.counties = originalOrganization.counties;
-                            organization.address = originalOrganization.address;
                         "
                         class="flex justify-end col-span-1"
                     >
@@ -378,7 +376,22 @@
                                 multiple
                             />
                         </div>
+                    </EditModal>
+                </template>
+            </Field>
+            <Field :label="$t('organization_address_street_address_label')" :hasPendingChanges="changes.includes('address')" alt>
+                <template #value>
+                    {{ organization.address }},
+                </template>
 
+                <template #action>
+                    <EditModal
+                        @action="editField('address')"
+                        @cancel="
+                            organization.address = originalOrganization.address;
+                        "
+                        class="flex justify-end col-span-1"
+                    >
                         <Input
                             class="w-full mt-4"
                             :label="$t('address_label')"