From ca6bfea51fcafd3dd1473db6dcadb9e291b03479 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Fri, 18 Feb 2022 14:17:39 +0100
Subject: [PATCH] Create 3rd party contact: fix adding civility and profession
 to payload

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |   9 +-
 .../_components/AddPersons/TypeThirdParty.vue | 112 ------------------
 2 files changed, 7 insertions(+), 114 deletions(-)
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 537cce4c2..061c9860b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -232,13 +232,18 @@ export default {
                         "name": data.text,
                         "isChild": true,
                         "parent": {"type": "thirdparty", "id": this.parent.id},
-                        "civility": {"id": data.civility},
-                        "profession": {"id": data.profession},
                         "comment": data.comment,
                         "telephone": data.phonenumber,
                         "email": data.email,
                         "address": this.parent.address
                      }
+                     if ("civility" in data) {
+                        Object.assign(data, {"civility": {"id": data.civility}} )
+                     }
+                     if ("profession" in data) {
+                        Object.assign(data,  {"profession": {"id": data.profession}} )
+                     }
+
                   } else {
                      type = this.$refs.castNew.radioType;
                      data = this.$refs.castNew.castDataByType();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
deleted file mode 100644
index 13574a8b6..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-    <div class="container tpartycontainer">
-      <div class="tparty-identification">
-        <span class="name">
-          {{ item.result.text }}&nbsp;
-        </span>
-        <span class="location">
-          <template v-if="hasAddress">
-            {{ getAddress.text }} -
-            {{ getAddress.postcode.name }}
-          </template>
-        </span>
-      </div>
-      <div class="tpartyparent" v-if="hasParent">
-        <span class="name">
-          > {{ item.result.parent.text }}
-        </span>
-      </div>
-    </div>
-
-    <div class="right_actions">
-      <badge-entity
-        :entity="item.result"
-        :options="{ displayLong: true }">
-      </badge-entity>
-      <on-the-fly v-if="item.result.kind === 'company'"
-          v-bind:parent="item.result"
-          @saveFormOnTheFly="emitEvent"
-          action="addContact"
-      ></on-the-fly>
-      <on-the-fly
-          type="thirdparty"
-          v-bind:id="item.result.id"
-          action="show">
-      </on-the-fly>
-    </div>
-</template>
-
-<script>
-import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
-import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
-
-const i18n = {
-  messages: {
-    fr: {
-      thirdparty: {
-        contact: "Personne physique",
-        company: "Personne morale",
-        child: "Personne de contact"
-      }
-    }
-  }
-};
-
-export default {
-  name: 'SuggestionThirdParty',
-  components: {
-    OnTheFly,
-    BadgeEntity
-  },
-  props: ['item'],
-  emits: ['saveFormOnTheFly'],
-  i18n,
-  computed: {
-    hasAddress() {
-      if (this.$props.item.result.address !== null) {
-        return true;
-      }
-      if (this.$props.item.result.parent !== null) {
-        this.$props.item.result.parent.address !== null;
-      }
-    },
-    hasParent() {
-      return this.$props.item.result.parent !== null;
-    },
-    getAddress() {
-      if (this.$props.item.result.address !== null) {
-        return this.$props.item.result.address;
-      }
-      if (this.$props.item.result.parent.address !== null) {
-        return this.$props.item.result.parent.address;
-      }
-
-      return null;
-    }
-  },
-  methods: {
-    emitEvent({data, type}) {
-      this.$emit('saveFormOnTheFly', {type: type, data: data})
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.tpartycontainer {
- .tpartyparent {
-    .name {
-      font-weight: bold;
-      font-variant: all-small-caps;
-    }
- }
- .tparty-identification {
-   span:not(.name) {
-     margin-left: 0.5em;
-     opacity: 0.5;
-     font-size: 90%;
-     font-style: italic;
-   }
- }
-}
-</style>