Ajout de champs dans le modèle Organisation + synchro (f290b0b9) · Commits · open-source / oscar

module/Oscar/src/Oscar/Controller/PublicController.php

+2 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ class PublicController extends AbstractOscarController implements UseTimesheetSe
		/** @var Authentification $auth */
		$auth = $this->getOscarUserContextService()->getAuthentification();



		if( !$this->getCurrentPerson() ){
		throw new OscarException("Votre compte n'est associé à aucune fiche Personne dans Oscar");
		}

+47 −0

Original line number	Diff line number	Diff line
		@@ -321,6 +321,19 @@ class Organization implements ResourceInterface, IConnectedObject
		protected $connectors;


		/**
		* @var string Numéro DUNS
		* @ORM\Column(type="string", nullable=true)
		*/
		protected $duns;

		/**
		* @var string TVA Intracommunautaire
		* @ORM\Column(type="string", nullable=true)
		*/
		protected $tvaintra;


		public function __construct()
		{
		$this->projects = new ArrayCollection();
		@@ -334,6 +347,40 @@ class Organization implements ResourceInterface, IConnectedObject
		return $this->getDateEnd() && $this->getDateEnd() <= new \DateTime();
		}

		/**
		* @return string
		*/
		public function getDuns(): ?string
		{
		return $this->duns;
		}

		/**
		* @param string $duns
		*/
		public function setDuns(?string $duns): self
		{
		$this->duns = $duns;
		return $this;
		}

		/**
		* @return string
		*/
		public function getTvaintra(): ?string
		{
		return $this->tvaintra;
		}

		/**
		* @param string $tvaintra
		*/
		public function setTvaintra(?string $tvaintra): self
		{
		$this->tvaintra = $tvaintra;
		return $this;
		}

		/**
		* @return OrganizationType
		*/

+7 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,13 @@ class JsonToOrganization extends JsonToObject implements IJsonToOrganisation
		->setEmail($this->getFieldValue($jsonData, 'email'))
		->setUrl($this->getFieldValue($jsonData, 'url'))
		->setSiret($this->getFieldValue($jsonData, 'siret'))
		->setType($this->getFieldValue($jsonData, 'type'));
		->setType($this->getFieldValue($jsonData, 'type'))

		// Ajout de champs
		->setDuns($this->getFieldValue($jsonData, 'duns'))
		->setTvaintra($this->getFieldValue($jsonData, 'tvaintra'))
		->setRnsr($this->getFieldValue($jsonData, 'rnsr'))
		;

		if( property_exists($jsonData, 'address') ){
		$address = $jsonData->address;