From 079f0f613d2f8eb567076f9c701f4494ede2e5d8 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Mon, 20 Aug 2018 16:24:28 +0200 Subject: [PATCH] Revert "Mail Booking Controller" This reverts commit 82650454d2eae440148988622b0482e24195db4b. # Conflicts: # trunk/src/AppBundle/Controller/BookingController.php --- trunk/src/AppBundle/Controller/BookingController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php index 2ebc2f09..8b27997a 100644 --- a/trunk/src/AppBundle/Controller/BookingController.php +++ b/trunk/src/AppBundle/Controller/BookingController.php @@ -156,7 +156,11 @@ class BookingController extends Controller $this->get('mailer')->send(\Swift_Message::newInstance() ->setSubject('BUCHUNG: '. $travelProgram->getTitle() .'('. $travelDate->getName() .')') ->setFrom('stern@stern-tours.de', 'STERN TOURS') +<<<<<<< HEAD ->setTo("stern@stern-tours.de") +======= + ->setTo("kevin.adametz@me.com") //'stern@stern-tours.de' +>>>>>>> parent of 8265045... Mail Booking Controller ->setBody( $this->renderView('default/email/bookingServiceEmail.txt.twig', [ 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,