Merge branch 'dev'
This commit is contained in:
gregoirenovel
commit
06ad0f2eb4
10 changed files with 48 additions and 45 deletions
5
Gemfile
5
Gemfile
|
|
@ -75,10 +75,7 @@ gem 'hashie'
|
|||
|
||||
gem 'mailjet'
|
||||
|
||||
# FIXME: this is a fork, go back to official version
|
||||
# once https://github.com/Sology/smart_listing/pull/139
|
||||
# has been merged and released
|
||||
gem 'smart_listing', git: 'https://github.com/mizinsky/smart_listing.git', branch: 'kaminari-update'
|
||||
gem 'smart_listing'
|
||||
|
||||
gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
|
||||
|
||||
|
|
|
|||
18
Gemfile.lock
18
Gemfile.lock
|
|
@ -25,17 +25,6 @@ GIT
|
|||
open4 (~> 1.3.4)
|
||||
rake
|
||||
|
||||
GIT
|
||||
remote: https://github.com/mizinsky/smart_listing.git
|
||||
revision: bcdd4f25954fc6f4faa3d6ea6ea9a69c65da678b
|
||||
branch: kaminari-update
|
||||
specs:
|
||||
smart_listing (1.2.1)
|
||||
coffee-rails
|
||||
jquery-rails
|
||||
kaminari (>= 0.17)
|
||||
rails (>= 3.2)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
|
|
@ -703,6 +692,11 @@ GEM
|
|||
tilt (~> 2.0)
|
||||
skylight (1.5.1)
|
||||
activesupport (>= 3.0.0)
|
||||
smart_listing (1.2.2)
|
||||
coffee-rails
|
||||
jquery-rails
|
||||
kaminari (>= 0.17)
|
||||
rails (>= 3.2)
|
||||
spreadsheet_architect (1.4.8)
|
||||
axlsx (>= 2.0)
|
||||
rodf (= 0.3.7)
|
||||
|
|
@ -853,7 +847,7 @@ DEPENDENCIES
|
|||
shoulda-matchers
|
||||
simple_form
|
||||
skylight
|
||||
smart_listing!
|
||||
smart_listing
|
||||
spreadsheet_architect (~> 1.4.8)
|
||||
spring
|
||||
spring-commands-rspec
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
}
|
||||
|
||||
.libelle {
|
||||
width: 250px;
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
td.updated-at {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
Description
|
||||
- @mail_template.tags.each do |tag|
|
||||
%tr
|
||||
%td.center
|
||||
%td
|
||||
%code{ style: "white-space: pre-wrap;" }
|
||||
= "--#{tag[:libelle]}--"
|
||||
%td
|
||||
= tag[:description]
|
||||
|
|
|
|||
|
|
@ -1,47 +1,49 @@
|
|||
- entreprise = entreprise.decorate
|
||||
- etablissement = entreprise.etablissement
|
||||
%h4= entreprise.raison_sociale_or_name
|
||||
|
||||
%table.table.vertical
|
||||
%table.table.vertical.dossier-champs
|
||||
%tbody
|
||||
%tr
|
||||
%th SIRET :
|
||||
%th.libelle Dénomination :
|
||||
%td= entreprise.raison_sociale_or_name
|
||||
%tr
|
||||
%th.libelle SIRET :
|
||||
%td= entreprise.siret_siege_social
|
||||
%tr
|
||||
%th Forme juridique :
|
||||
%th.libelle Forme juridique :
|
||||
%td= sanitize(entreprise.forme_juridique)
|
||||
- if etablissement.present?
|
||||
%tr
|
||||
%th Libellé NAF :
|
||||
%th.libelle Libellé NAF :
|
||||
%td= etablissement.libelle_naf
|
||||
%tr
|
||||
%th Code NAF :
|
||||
%th.libelle Code NAF :
|
||||
%td= etablissement.naf
|
||||
%tr
|
||||
%th Date de création :
|
||||
%th.libelle Date de création :
|
||||
%td= Time.at(entreprise.date_creation).localtime.strftime("%d/%m/%Y")
|
||||
%tr
|
||||
%th Effectif de l'organisation :
|
||||
%th.libelle Effectif de l'organisation :
|
||||
%td= entreprise.effectif
|
||||
%tr
|
||||
%th Code effectif :
|
||||
%th.libelle Code effectif :
|
||||
%td= entreprise.code_effectif_entreprise
|
||||
%tr
|
||||
%th Numéro de TVA intracommunautaire :
|
||||
%th.libelle Numéro de TVA intracommunautaire :
|
||||
%td= entreprise.numero_tva_intracommunautaire
|
||||
- if etablissement.present?
|
||||
%tr
|
||||
%th Adresse :
|
||||
%th.libelle Adresse :
|
||||
%td
|
||||
- etablissement.adresse.split("\n").each do |line|
|
||||
= line
|
||||
%br
|
||||
%tr
|
||||
%th Capital social :
|
||||
%th.libelle Capital social :
|
||||
%td= entreprise.pretty_capital_social
|
||||
- if etablissement.present?
|
||||
%tr
|
||||
%th Exercices :
|
||||
%th.libelle Exercices :
|
||||
%td
|
||||
- etablissement.exercices.each_with_index do |exercice, index|
|
||||
= "#{exercice.date_fin_exercice.year} : "
|
||||
|
|
@ -49,20 +51,20 @@
|
|||
%br
|
||||
- if entreprise.rna_information.present?
|
||||
%tr
|
||||
%th Numéro RNA :
|
||||
%th.libelle Numéro RNA :
|
||||
%td= entreprise.rna_information.association_id
|
||||
%tr
|
||||
%th Titre :
|
||||
%th.libelle Titre :
|
||||
%td= entreprise.rna_information.titre
|
||||
%tr
|
||||
%th Objet :
|
||||
%th.libelle Objet :
|
||||
%td= entreprise.rna_information.objet
|
||||
%tr
|
||||
%th Date de création :
|
||||
%th.libelle Date de création :
|
||||
%td= entreprise.rna_information.date_creation&.strftime("%d/%m/%Y")
|
||||
%tr
|
||||
%th Date de publication :
|
||||
%th.libelle Date de publication :
|
||||
%td= entreprise.rna_information.date_publication&.strftime("%d/%m/%Y")
|
||||
%tr
|
||||
%th Date de déclaration :
|
||||
%th.libelle Date de déclaration :
|
||||
%td= entreprise.rna_information.date_declaration&.strftime("%d/%m/%Y")
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
%table.table.vertical
|
||||
%table.table.vertical.dossier-champs
|
||||
%tbody
|
||||
%tr
|
||||
%th Civilité :
|
||||
%th.libelle Civilité :
|
||||
%td= individual.gender
|
||||
%tr
|
||||
%th Prénom :
|
||||
%th.libelle Prénom :
|
||||
%td= individual.prenom
|
||||
%tr
|
||||
%th Nom :
|
||||
%th.libelle Nom :
|
||||
%td= individual.nom
|
||||
- if individual.birthdate.present?
|
||||
%tr
|
||||
%th Date de naissance :
|
||||
%th.libelle Date de naissance :
|
||||
%td= Date.parse(individual.birthdate).strftime("%d/%m/%Y")
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
%table.table.vertical.dossier-champs
|
||||
%tbody
|
||||
%tr
|
||||
%th.libelle Email :
|
||||
%td= user.email
|
||||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
%h2 Identité du demandeur
|
||||
|
||||
= render partial: "new_gestionnaire/dossiers/user_infos", locals: { user: @dossier.user }
|
||||
|
||||
- if @dossier.entreprise.present?
|
||||
= render partial: "identite_entreprise", locals: { entreprise: @dossier.entreprise }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
.container
|
||||
.tab-title Identité du demandeur
|
||||
.card
|
||||
= render partial: "new_gestionnaire/dossiers/user_infos", locals: { user: dossier.user }
|
||||
|
||||
- if dossier.entreprise.present?
|
||||
= render partial: "new_gestionnaire/dossiers/identite_entreprise", locals: { entreprise: dossier.entreprise }
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
%p.role-panel-explanation Créez des formulaires en ligne en quelques minutes et instruisez les demandes des usagers sur une plateforme dédiée
|
||||
|
||||
= link_to "Demander un compte",
|
||||
"mailto:#{t("dynamics.contact_email")}?subject=Demande%20de%20compte%20administrateur%20demarches-simplifiees.fr",
|
||||
"https://pipedrivewebforms.com/form/c4a5de08b0a1dcc92374e853aa11905a1871869",
|
||||
class: "role-panel-button-primary",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer",
|
||||
|
|
@ -198,7 +198,7 @@
|
|||
%p.cta-panel-explanation Notre équipe est disponible pour vous renseigner et vous aider
|
||||
%div
|
||||
= link_to "Contactez-nous",
|
||||
"mailto:#{t("dynamics.contact_email")}?subject=Question%20à%20propos%20de%20demarches-simplifiees.fr",
|
||||
"https://pipedrivewebforms.com/form/c4a5de08b0a1dcc92374e853aa11905a1871869",
|
||||
class: "cta-panel-button-white",
|
||||
target: "_blank",
|
||||
rel: "noopener noreferrer"
|
||||
|
|
|
|||
Loading…
Reference in a new issue