+
+
+
+ {{ $t('child_of') }}
+ {{ parent.text }}
+
+
+
@@ -106,10 +141,11 @@ import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue';
import AddAddress from 'ChillMainAssets/vuejs/Address/components/AddAddress';
import { getThirdparty } from '../../_api/OnTheFly';
import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
export default {
name: "OnTheFlyThirdParty",
- props: ['id', 'type', 'action', 'query'],
+ props: ['id', 'type', 'action', 'query', 'parent'],
components: {
ThirdPartyRenderBox,
AddAddress,
@@ -124,8 +160,11 @@ export default {
kind: 'company',
name: '',
telephone: '',
-
+ civility: null,
+ profession: null,
},
+ professions: [],
+ civilities: [],
addAddress: {
options: {
openPanesInModal: true,
@@ -177,10 +216,10 @@ export default {
},
methods: {
loadData(){
- getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
+ return getThirdparty(this.id).then(thirdparty => new Promise((resolve, reject) => {
this.thirdparty = thirdparty;
this.thirdparty.kind = thirdparty.kind;
- //console.log('get thirdparty', thirdparty);
+ console.log('get thirdparty', thirdparty);
if (this.action !== 'show') {
if (thirdparty.address !== null) {
// bof! we force getInitialAddress because addressId not available when mounted
@@ -190,6 +229,30 @@ export default {
resolve();
}));
},
+ loadCivilities() {
+ const url = `/api/1.0/main/civility.json`;
+ return makeFetch('GET', url)
+ .then(response => {
+ this.$data.civilities = response.results;
+ return Promise.resolve();
+ })
+ .catch((error) => {
+ console.log(error)
+ this.$toast.open({message: error.body})
+ })
+ },
+ loadProfessions() {
+ const url = `/api/1.0/thirdparty/professions.json`;
+ return makeFetch('GET', url)
+ .then(response => {
+ this.$data.professions = response.results;
+ return Promise.resolve();
+ })
+ .catch((error) => {
+ console.log(error)
+ this.$toast.open({message: error.body})
+ })
+ },
submitAddress(payload) {
console.log('submitAddress', payload);
if (typeof payload.addressId !== 'undefined') { // <--
@@ -200,13 +263,24 @@ export default {
}
},
addQuery(query) {
- this.thirdparty.text = query;
- }
+ this.thirdparty.name = query;
+ },
},
- mounted() {
- //console.log('mounted', this.action);
+ mounted() {
+ let dependencies = [];
+ dependencies.push(this.loadProfessions());
+ dependencies.push(this.loadCivilities());
if (this.action !== 'create') {
- this.loadData();
+ if (this.id) {
+ dependencies.push(this.loadData());
+ // here we can do something when all promises are resolve, with
+ // Promise.all(dependencies).then(() => { /* do something */ });
+ }
+ if (this.action === 'addContact') {
+ this.$data.thirdparty.kind = 'child'
+ // this.$data.thirdparty.parent = this.parent.id
+ this.$data.thirdparty.address = null
+ }
} else {
this.thirdparty.kind = 'company';
}
@@ -229,5 +303,16 @@ dl {
margin-left: 1em;
}
}
+.parent-info {
+ margin-bottom: 1rem;
+}
+
+#child-info {
+ display: flex;
+ justify-content: space-between;
+ div {
+ width: 49%;
+ }
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
index 37d09320d..76f01e3f4 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_js/i18n.js
@@ -4,7 +4,12 @@ const thirdpartyMessages = {
name: "Dénomination",
email: "Courriel",
phonenumber: "Téléphone",
- }
+ comment: "Commentaire",
+ profession: "Qualité",
+ civility: "Civilité"
+ },
+ child_of: "Contact de: ",
+ children: "Personnes de contact: ",
}
};
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 6ffcc2dea..d518a9f2b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -36,6 +36,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
{
return [
'type' => 'thirdparty',
+ 'name' => $thirdParty->getName(),
'text' => $this->thirdPartyRender->renderString($thirdParty, []),
'id' => $thirdParty->getId(),
'kind' => $thirdParty->getKind(),
@@ -45,6 +46,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
'isChild' => $thirdParty->isChild(),
'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
+ 'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
];
}
diff --git a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
index 52db7589c..eb303a4f0 100644
--- a/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml
@@ -110,3 +110,14 @@ paths:
description: "OK"
422:
description: "Object with validation errors"
+
+ /1.0/thirdparty/professions.json:
+ get:
+ tags:
+ - thirdparty
+ summary: Return all thirdparty professions
+ responses:
+ 200:
+ description: "ok"
+ 401:
+ description: "Unauthorized"