Commit b15d81f0 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

FIX : Champ TVAIntra/DUNS ajouté dans le formulaire des organisations

parent a7c3e8f6

module/Oscar/src/Oscar/Controller/AdministrationController.php

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ class AdministrationController extends AbstractOscarController implements UsePro 
                $this->redirect()->toRoute('administration/accueil');

                return [];

            default:

                return $this->getResponseBadRequest();

                //return $this->getResponseBadRequest();

        }



        return [];

module/Oscar/src/Oscar/Factory/ActivityPcruInfoFromActivityFactory.php

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class ActivityPcruInfoFromActivityFactory 


        // Intitulé du rôle "Laboratoire" pour PCRU

        $roleStructureToFind = $this->oscarConfigurationService->getOptionalConfiguration('pcru_unite_role', 'Laboratoire');

        $rolePartnerToFind = $this->oscarConfigurationService->getOptionalConfiguration('pcru_patner_role', 'Financeur');

        $rolePartnerToFind = $this->oscarConfigurationService->getOptionalConfiguration('pcru_partner_role', 'Financeur');



        // Donnèes trouvées

        $codeUniteLabintel = "";
@@ -76,7 +76,6 @@ class ActivityPcruInfoFromActivityFactory 
                $partners[] = $partner->getOrganization()->getCodePcru();

            }

        }



        if( $codeUniteLabintel == "" ){

            $activityPcruInfos->addError("Le $roleStructureToFind (".implode(', ', $organizationsParsed).") n'a pas de code LABINTEL");

        }

module/Oscar/src/Oscar/Form/OrganizationIdentificationForm.php

+14 −2
Original line number Diff line number Diff line
@@ -84,6 +84,20 @@ class OrganizationIdentificationForm extends \Zend\Form\Form implements InputFil 
        ]);

        $this->add($labintel);



        $duns = new Element\Text('duns');

        $duns->setAttributes([

            'class'       => 'form-control',

            'placeholder'   => 'N°DUNS'

        ]);

        $this->add($duns);



        $tvaintra = new Element\Text('tvaintra');

        $tvaintra->setAttributes([

            'class'       => 'form-control',

            'placeholder'   => 'TVA Intracommunautaire'

        ]);

        $this->add($tvaintra);



        $rnsr = new Element\Text('rnsr');

        $rnsr->setAttributes([

            'class'       => 'form-control',
@@ -262,8 +276,6 @@ class OrganizationIdentificationForm extends \Zend\Form\Form implements InputFil 
            'dateEnd'=> [

                'required' => false,

            ],





        ];

    }

}
 
 No newline at end of file

module/Oscar/src/Oscar/Hydrator/OrganizationFormHydrator.php

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ class OrganizationFormHydrator implements HydratorInterface 
        $object->setFullName($data['fullName']);

        $object->setLabintel($data['labintel']);

        $object->setRnsr($data['rnsr']);

        $object->setDuns($data["duns"]);

        $object->setTvaintra($data["tvaintra"]);



        $object->setDateStart(

            !$data['dateStart'] ? null : new \DateTime($data['dateStart'])
@@ -85,6 +87,10 @@ class OrganizationFormHydrator implements HydratorInterface 
            'code' => $object->getCode(),

            'labintel' => $object->getLabintel(),

            'rnsr' => $object->getRnsr(),



            'duns' => $object->getDuns(),

            'tvaintra' => $object->getTvaintra(),



            'typeObj' => $object->getTypeObj() ? $object->getTypeObj()->getId() : null,

            'siret' => $object->getSiret(),

            'fullname' => $object->getFullName(),

module/Oscar/src/Oscar/Service/PCRUService.php

+7 −6
Original line number Diff line number Diff line
@@ -288,20 +288,21 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 


    }



    private $_logpool;



    public function logPool(string $message): void

    {

        static $logpool = null;

        if ($logpool == null) {

            $logpool = fopen($this->getOscarConfigurationService()->getPcruLogPoolFile(), 'w');

        if ($this->_logpool == null) {

            $this->_logpool = fopen($this->getOscarConfigurationService()->getPcruLogPoolFile(), 'w');

        }

        $msg = sprintf("%s \t%s\n", date('Y-m-d h:i:s'), $message);

        fwrite($logpool, $msg);

        fwrite($this->_logpool, $msg);

    }



    public function __destruct()

    {

        if ($logpool) {

            fclose($logpool);

        if ($this->_logpool) {

            fclose($this->_logpool);

        }

    }