Commit cc3cb270 authored by Jean-Baptiste Oellers's avatar Jean-Baptiste Oellers
Browse files

Ajout bouton pré-remplir et filtre sur france

parent caf7841a

module/Oscar/src/Oscar/Controller/OrganizationController.php

+2 −2
Original line number Diff line number Diff line
@@ -504,7 +504,6 @@ class OrganizationController extends AbstractOscarController implements UseOrgan 
        $form->init();

        $form->bind($entity);





        if ($this->getRequest()->isPost()) {

            $posted = $this->getRequest()->getPost();

            $form->setData($posted);
@@ -930,7 +929,8 @@ class OrganizationController extends AbstractOscarController implements UseOrgan 


    public function createAction() {

        return [

            'urlSiretApi' => $this->url()->fromRoute('siret/api')

            'urlSiretApi' => $this->url()->fromRoute('siret/api'),

            'urlOrganizationNew' => $this->url()->fromRoute('organization/new')

        ];

    }

module/Oscar/src/Oscar/Service/SiretService.php

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ class SiretService implements UseEntityManager, UseOscarConfigurationService 


      if ($etablissement == NULL && $recherche_par_api_disponible) {

        $curl = curl_init();

        $url = "https://api.insee.fr/api-sirene/3.11/siret?q=denominationUniteLegale:*" . urlencode($denominationLegale) . '*%20OR%20nomUniteLegale:*' . urlencode($denominationLegale) . '*';

        $url = "https://api.insee.fr/api-sirene/3.11/siret?q=-codePaysEtrangerEtablissement:*%20AND%20%28denominationUniteLegale:*" . urlencode($denominationLegale) . '*%20OR%20nomUniteLegale:*' . urlencode($denominationLegale) . '*%29';

        curl_setopt($curl, CURLOPT_URL, $url);

        $headers = [

          'X-INSEE-Api-Key-Integration: ' . $cleAPI,

module/Oscar/view/oscar/organization/create.phtml

+3 −1
Original line number Diff line number Diff line 
<div class="container">

    <div id="organization-search-apis-publiques"

         data-url-siret-api="<?php echo $urlSiretApi ?>">

         data-url-siret-api="<?php echo $urlSiretApi ?>"

         data-url-organization-new="<?php echo $urlOrganizationNew ?>">

    </div>

    <?php echo $this->Vite()->addJs('src/OrganizationSearchApisPubliques.js'); ?>

    

</div>

module/Oscar/view/oscar/organization/form.phtml

+22 −0
Original line number Diff line number Diff line
@@ -480,6 +480,28 @@ 
            $('[name="country"]').select2({});

        });

    </script>



    <script type="text/javascript">

        window.addEventListener("load", function () {

            const urlParams = new URLSearchParams(window.location.search);

            const fullName = urlParams.get('fullName');

            if (fullName && fullName.trim() != '') {

                setTimeout(() => { 

                    document.getElementsByName("fullName")[0].value = fullName;

                    document.getElementsByName("shortName")[0].value = urlParams.get('shortName');

                    document.getElementsByName('siret')[0].value = urlParams.get('siret');

                    document.getElementsByName('street1')[0].value = urlParams.get('street1');

                    document.getElementsByName('street2')[0].value = urlParams.get('street2');

                    document.getElementsByName('zipCode')[0].value = urlParams.get('zipCode');

                    document.getElementsByName('city')[0].value = urlParams.get('city');

                    document.getElementsByName('country')[0].value = 'France';

                    document.getElementsByName('country')[0].nextSibling.firstChild.firstChild.firstChild.setAttribute('title', 'France');

                    document.getElementsByName('country')[0].nextSibling.firstChild.firstChild.firstChild.innerText = 'France';

                }, 100);

            }

        });

    </script>



<?php

ui/src/OrganizationSearchApisPubliques.js

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ let elemDatas = document.querySelector(elemId); 
// Création de l'App

const app = createApp(OrganizationSearchApisPubliques, {

  "url-siret-api": elemDatas.dataset.urlSiretApi,

  "url-organization-new": elemDatas.dataset.urlOrganizationNew

});



// Affichage de l'app