diff --git a/app/views/dossiers/_infos_dossier.html.haml b/app/views/dossiers/_infos_dossier.html.haml index 6d0bf1ef7..547b082c1 100644 --- a/app/views/dossiers/_infos_dossier.html.haml +++ b/app/views/dossiers/_infos_dossier.html.haml @@ -107,7 +107,7 @@ -elsif @facade.dossier.submitted? = form_tag(url_for({controller: 'backoffice/dossiers', action: :receive, dossier_id: @facade.dossier.id}), class: 'form-inline', method: 'POST') do %button.action_button.btn.btn-success - = 'Notifier de la bonne réception' + = 'Accuser réception' -elsif @facade.dossier.received? = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do diff --git a/app/views/layouts/_google_analytics.html b/app/views/layouts/_google_analytics.html new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/users/recapitulatif/show.html.haml b/app/views/users/recapitulatif/show.html.haml index 355c92446..ee50144b6 100644 --- a/app/views/users/recapitulatif/show.html.haml +++ b/app/views/users/recapitulatif/show.html.haml @@ -15,7 +15,7 @@ %br = form_tag(url_for({controller: :recapitulatif, action: :submit, dossier_id: @facade.dossier.id}), method: 'POST') do %button#validate_button.btn.btn-success - = 'Déposer mon dossier' + = 'Procéder au dépôt définitif' -else %h3{:class => 'text-success', :style => 'text-align:right'} = @facade.dossier.display_state diff --git a/spec/views/backoffice/dossiers/show.html.html_spec.rb b/spec/views/backoffice/dossiers/show.html.html_spec.rb index 1cd58d236..d09aadeaa 100644 --- a/spec/views/backoffice/dossiers/show.html.html_spec.rb +++ b/spec/views/backoffice/dossiers/show.html.html_spec.rb @@ -121,9 +121,9 @@ describe 'backoffice/dossiers/show.html.haml', type: :view do it { expect(rendered).to have_content('Déposé') } - it 'button notifier de la bonne réception is present' do + it 'button Accuser réception is present' do expect(rendered).to have_css('.action_button') - expect(rendered).to have_content('Notifier de la bonne réception') + expect(rendered).to have_content('Accuser réception') end it 'button Déclarer complet is not present' do diff --git a/spec/views/users/recapitulatif/show.html.haml_spec.rb b/spec/views/users/recapitulatif/show.html.haml_spec.rb index e70e3723b..739319181 100644 --- a/spec/views/users/recapitulatif/show.html.haml_spec.rb +++ b/spec/views/users/recapitulatif/show.html.haml_spec.rb @@ -107,9 +107,9 @@ describe 'users/recapitulatif/show.html.haml', type: :view do render end - it 'button Déposer mon dossier est present' do + it 'button Procéder au dépôt définitif est present' do expect(rendered).to have_css('#validate_button') - expect(rendered).to have_content('Déposer mon dossier') + expect(rendered).to have_content('Procéder au dépôt définitif') end it 'button Editer mon dossier n\'est plus present' do @@ -218,7 +218,7 @@ describe 'users/recapitulatif/show.html.haml', type: :view do end it 'submitted link is not present' do - expect(rendered).not_to have_content('Déposer mon dossier') + expect(rendered).not_to have_content('Procéder au dépôt définitif') end end end @@ -259,7 +259,7 @@ describe 'users/recapitulatif/show.html.haml', type: :view do end it 'submitted link is not present' do - expect(rendered).not_to have_content('Déposer mon dossier') + expect(rendered).not_to have_content('Procéder au dépôt définitif') end end end