From 68f66783d9bf5104afec3368738d316a235a7f9c Mon Sep 17 00:00:00 2001
From: adametz <adametz@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Wed, 4 Jul 2018 10:19:10 +0000
Subject: [PATCH]  #1375 Opt-in raus, Text

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3424 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../views/default/pages/booking.html.twig       | 10 ++++------
 trunk/src/AppBundle/Entity/BookingRequest.php   | 17 -----------------
 trunk/src/AppBundle/Form/BookingRequestType.php |  1 -
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig
index 1382231f..d29ed72b 100644
--- a/trunk/app/Resources/views/default/pages/booking.html.twig
+++ b/trunk/app/Resources/views/default/pages/booking.html.twig
@@ -566,7 +566,7 @@
                                             <div class="accordion-toggle-2" id="nationality_entry_{{ currentIndex }}" style="display:none;">
                                                 <div class="panel-group" id="accordion_entry_{{ currentIndex }}">
                                                     <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion_entry_{{ currentIndex }}" href="#collapse_entry_{{ currentIndex }}" aria-expanded="true">
-                                                        <h3><span>Einreisebestimmungen</span><i class="indicator pull-right icon-plus"></i></h3>
+                                                        <h3><span>Einreise-, Visabestimmungen und gesundheitspolizeilichen Vorschriften</span><i class="indicator pull-right icon-plus"></i></h3>
                                                     </a>
                                                     <div id="collapse_entry_{{ currentIndex }}" class="panel-collapse collapse acc_nationality_panel" aria-expanded="true" style="">
                                                         <div class="panel-body">
@@ -686,16 +686,14 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <div class="checkbox">
-                                        {{ form_widget(form.acceptProcessing) }}
-                                        <label for="{{ form.acceptProcessing.vars.id }}" style="line-height: 1.2em;">Einwilligungserklärung: Hiermit willige ich in die Verarbeitung der von mir freiwillig
+                                    <div class="">
+                                        <label for="" style="line-height: 1.2em;">Einwilligungserklärung: Hiermit willige ich in die Verarbeitung der von mir freiwillig
                                             angegebenen personenbezogenen Daten ein.
                                             Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit ohne Nachteile per Mail an
                                             stern@sterntours.de widerrufen kann.
 
                                         </label>
-                                        {{ form_errors(form.acceptProcessing) }}
-                                        <div class="help-block with-errors"></div>
+
                                     </div>
                                 </div>
 
diff --git a/trunk/src/AppBundle/Entity/BookingRequest.php b/trunk/src/AppBundle/Entity/BookingRequest.php
index 64f93117..4ae2ba61 100644
--- a/trunk/src/AppBundle/Entity/BookingRequest.php
+++ b/trunk/src/AppBundle/Entity/BookingRequest.php
@@ -101,8 +101,6 @@ class BookingRequest
     
     private $acceptPrivacy = false;
 
-    private $acceptProcessing = false;
-
     /**
      * BookingRequest constructor.
      */
@@ -658,21 +656,6 @@ class BookingRequest
         $this->acceptPrivacy = $acceptPrivacy;
     }
 
-     /**
-     * @return mixed
-     */
-    public function isAcceptProcessing()
-    {
-        return $this->acceptProcessing;
-    }
-
-    /**
-     * @param mixed $acceptProcessing
-     */
-    public function setAcceptProcessing($acceptProcessing)
-    {
-        $this->acceptProcessing = $acceptProcessing;
-    }
 
     /**
      * @Assert\Callback
diff --git a/trunk/src/AppBundle/Form/BookingRequestType.php b/trunk/src/AppBundle/Form/BookingRequestType.php
index ac6bbba6..93967c48 100644
--- a/trunk/src/AppBundle/Form/BookingRequestType.php
+++ b/trunk/src/AppBundle/Form/BookingRequestType.php
@@ -151,7 +151,6 @@ class BookingRequestType extends AbstractType
             ->add('notes', TextareaType::class, ['required' => false])
             ->add('acceptTerms', CheckboxType::class, ['required' => true])
             ->add('acceptPrivacy', CheckboxType::class, ['required' => true])
-            ->add('acceptProcessing', CheckboxType::class, ['required' => true])
             ->add('acceptLegalRights', CheckboxType::class, ['required' => true])
             ;