From 040312c0351fbe0d00e9db6f3f6891d45cd07071 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Tue, 15 Nov 2022 18:27:35 +0300
Subject: [PATCH] Small fix

---
 .../clients/components/ClientsTableRow.vue    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index f9d7378..0a69efe 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -333,6 +333,16 @@ export default {
         };
       }
     },
+    mergeFullAddress() {
+      if (
+        this.dopeAddress.region &&
+        this.dopeAddress.city &&
+        this.dopeAddress.street &&
+        this.dopeAddress.house
+      ) {
+        return `${this.dopeAddress.region}.обл, г.${this.dopeAddress.city}, ул.${this.dopeAddress.street}, ${this.dopeAddress.house}, ${this.dopeAddress.flat}, ${this.dopeAddress.index}`;
+      }
+    },
     clearAddress() {
       this.dopeAddress = {
         city: "",
@@ -346,13 +356,7 @@ export default {
     postUpdateAddress() {
       fetchWrapper
         .post(`general/address/${this.addressId}/update/`, {
-          full_address:
-            this.dopeAddress.city +
-              this.dopeAddress.region +
-              this.dopeAddress.street +
-              this.dopeAddress.house +
-              this.dopeAddress.flat +
-              this.dopeAddress.index || this.dataAddress.join_adress,
+          full_address: this.mergeFullAddress() || this.dataAddress.join_adress,
         })
         .then(() => this.fetchClientDetail(this.id));
       this.clearAddress();
@@ -385,13 +389,7 @@ export default {
       fetchWrapper
         .post("general/address/create/", {
           person_id: this.id,
-          full_address:
-            this.dopeAddress.city +
-              this.dopeAddress.region +
-              this.dopeAddress.street +
-              this.dopeAddress.house +
-              this.dopeAddress.flat +
-              this.dopeAddress.index || this.dataAddress.join_adress,
+          full_address: this.mergeFullAddress() || this.dataAddress.join_adress,
         })
         .then(() => this.fetchClientDetail(this.id));
     },