From d18777296c92c187322f79048161d63392de916c Mon Sep 17 00:00:00 2001 From: adametz Date: Fri, 9 Mar 2018 15:14:40 +0000 Subject: [PATCH] Remove travelCancellation from booking form git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3378 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../email/components/bookingSummary.txt.twig | 8 -------- .../views/default/pages/booking.html.twig | 12 ++++-------- .../Controller/BookingController.php | 3 --- trunk/src/AppBundle/Entity/BookingRequest.php | 19 ------------------- .../Entity/TravelBookingRepository.php | 2 +- .../src/AppBundle/Form/BookingRequestType.php | 1 - 6 files changed, 5 insertions(+), 40 deletions(-) diff --git a/trunk/app/Resources/views/default/email/components/bookingSummary.txt.twig b/trunk/app/Resources/views/default/email/components/bookingSummary.txt.twig index 6e3833ce..4259d2a6 100644 --- a/trunk/app/Resources/views/default/email/components/bookingSummary.txt.twig +++ b/trunk/app/Resources/views/default/email/components/bookingSummary.txt.twig @@ -42,14 +42,6 @@ Nicht eingeschlossene, zubuchbare Leistungen: [o] {{ travel_program_service|raw }} {% endfor %} -===================================================================================== -Reise-Rücktrittskosten-Versicherung: -===================================================================================== -{% if(booking_request.travelCancellation == 1) %} - [x] Informationen angefordert -{% else %} - [o] Keine Informationen gewünscht -{% endif %} ===================================================================================== Reiseanmelder{% if booking_request.salutation == 2 %}in{% endif %} diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig index f7b1b4fb..d2ae582e 100644 --- a/trunk/app/Resources/views/default/pages/booking.html.twig +++ b/trunk/app/Resources/views/default/pages/booking.html.twig @@ -176,14 +176,10 @@ Reiseversicherung - {% if form.travelCancellation is defined %} -
- {{ form_widget(form.travelCancellation) }} - -
- {% endif %} +

+
+ STERN TOURS GmbH empfiehlt generell den Abschluss einer Reise-Rücktrittskosten-Versicherung und einer Auslands-Reisekrankenversicherung mit Rücktransport. Im Anschluss der Buchung senden wir Ihnen diesbezüglich Informationen zu. +

diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php index 9cc14a8f..8bf2625a 100644 --- a/trunk/src/AppBundle/Controller/BookingController.php +++ b/trunk/src/AppBundle/Controller/BookingController.php @@ -283,9 +283,6 @@ class BookingController extends Controller $possibleRooms = $this->getRooms($travelDate->getPrices(), $persons); - if($bookingRequest->getTravelCancellation()){ - - } if ($bookingRequest->getComfort()) { foreach ($possibleRooms as $room) diff --git a/trunk/src/AppBundle/Entity/BookingRequest.php b/trunk/src/AppBundle/Entity/BookingRequest.php index 7358571a..df6b3743 100644 --- a/trunk/src/AppBundle/Entity/BookingRequest.php +++ b/trunk/src/AppBundle/Entity/BookingRequest.php @@ -39,8 +39,6 @@ class BookingRequest */ private $insurance; - private $travelCancellation; - private $comfort = false; private $travelOptions = []; @@ -258,23 +256,6 @@ class BookingRequest { $this->insurance = $insurance; } - - /** - * @return mixed - */ - public function getTravelCancellation() - { - return $this->travelCancellation; - } - - /** - * @param mixed $comfort - */ - public function setTravelCancellation($travelCancellation) - { - $this->travelCancellation = $travelCancellation; - } - /** diff --git a/trunk/src/AppBundle/Entity/TravelBookingRepository.php b/trunk/src/AppBundle/Entity/TravelBookingRepository.php index 7fb5a0de..8e5698cc 100644 --- a/trunk/src/AppBundle/Entity/TravelBookingRepository.php +++ b/trunk/src/AppBundle/Entity/TravelBookingRepository.php @@ -62,7 +62,7 @@ class TravelBookingRepository extends \Doctrine\ORM\EntityRepository $ret->setInsurances($insurances); } - $ret->setTravelCancellation($bookingRequest->getTravelCancellation()); + //$ret->setTravelCancellation($bookingRequest->getTravelCancellation()); $ret->setParticipants($bookingRequest->getTravelers()); $ret->setParticipantsTotal($bookingRequest->getTravelerCount()); $ret->setRooms($bookingPriceInfo['rooms']); diff --git a/trunk/src/AppBundle/Form/BookingRequestType.php b/trunk/src/AppBundle/Form/BookingRequestType.php index dc12c7a9..cfe3b302 100644 --- a/trunk/src/AppBundle/Form/BookingRequestType.php +++ b/trunk/src/AppBundle/Form/BookingRequestType.php @@ -209,7 +209,6 @@ class BookingRequestType extends AbstractType } //$travelDate->getPrices()[0]->getPriceType() - $builder->add('travelCancellation', CheckboxType::class, ['required' => false]); if ($travelDate->hasComfortCategory()) {