From 628fc40751308bfa3f7815bf421e5b22842d4c41 Mon Sep 17 00:00:00 2001 From: adametz Date: Fri, 10 Aug 2018 13:09:40 +0000 Subject: [PATCH] #1464 getInsurance3 git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3439 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../components/booking/insurance.html.twig | 17 ++++++--- trunk/src/AppBundle/Entity/TravelProgram.php | 37 ++++++++++++++++++- .../src/AppBundle/Form/BookingRequestType.php | 4 ++ 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/trunk/app/Resources/views/default/components/booking/insurance.html.twig b/trunk/app/Resources/views/default/components/booking/insurance.html.twig index 58852930..4217d7e9 100644 --- a/trunk/app/Resources/views/default/components/booking/insurance.html.twig +++ b/trunk/app/Resources/views/default/components/booking/insurance.html.twig @@ -22,16 +22,21 @@ diff --git a/trunk/src/AppBundle/Entity/TravelProgram.php b/trunk/src/AppBundle/Entity/TravelProgram.php index 8c5061f8..69ccf80a 100644 --- a/trunk/src/AppBundle/Entity/TravelProgram.php +++ b/trunk/src/AppBundle/Entity/TravelProgram.php @@ -7,7 +7,8 @@ use Doctrine\ORM\Mapping as ORM; /** * TravelProgram * - * @ORM\Table(name="travel_program", indexes={@ORM\Index(name="FK_travel_program_travel_organizer", columns={"organizer"}), @ORM\Index(name="FK_travel_program_travel_insurance", columns={"insurance_1"}), @ORM\Index(name="FK_travel_program_travel_insurance_2", columns={"insurance_2"}), @ORM\Index(name="FK_travel_program_travel_category", columns={"category_id"}), @ORM\Index(name="travel_program_ibfk_4", columns={"generalnote"}), @ORM\Index(name="FK_travel_program_travel_arrival_point", columns={"travel_arrival_point_id"})}) + * @ORM\Table(name="travel_program", indexes={@ORM\Index(name="FK_travel_program_travel_organizer", columns={"organizer"}), @ORM\Index(name="FK_travel_program_travel_insurance", columns={"insurance_1"}), @ORM\Index(name="FK_travel_program_travel_insurance_2", columns={"insurance_2"}), + @ORM\Index(name="FK_travel_program_travel_insurance_3", columns={"insurance_3"}), @ORM\Index(name="FK_travel_program_travel_category", columns={"category_id"}), @ORM\Index(name="travel_program_ibfk_4", columns={"generalnote"}), @ORM\Index(name="FK_travel_program_travel_arrival_point", columns={"travel_arrival_point_id"})}) * @ORM\Entity(repositoryClass="AppBundle\Entity\TravelProgramRepository") */ class TravelProgram @@ -295,6 +296,16 @@ class TravelProgram */ private $insurance2; + /** + * @var \AppBundle\Entity\TravelInsurance + * + * @ORM\ManyToOne(targetEntity="AppBundle\Entity\TravelInsurance") + * @ORM\JoinColumns({ + * @ORM\JoinColumn(name="insurance_3", referencedColumnName="id") + * }) + */ + private $insurance3; + /** * @var \AppBundle\Entity\TravelCategory * @@ -1334,6 +1345,30 @@ class TravelProgram return $this->insurance2; } + /** + * Set insurance3 + * + * @param \AppBundle\Entity\TravelInsurance $insurance2 + * + * @return TravelProgram + */ + public function setInsurance3(\AppBundle\Entity\TravelInsurance $insurance3 = null) + { + $this->insurance3 = $insurance3; + + return $this; + } + + /** + * Get insurance3 + * + * @return \AppBundle\Entity\TravelInsurance + */ + public function getInsurance3() + { + return $this->insurance3; + } + /** * Set category * diff --git a/trunk/src/AppBundle/Form/BookingRequestType.php b/trunk/src/AppBundle/Form/BookingRequestType.php index 93967c48..6ad4cf6a 100644 --- a/trunk/src/AppBundle/Form/BookingRequestType.php +++ b/trunk/src/AppBundle/Form/BookingRequestType.php @@ -197,6 +197,10 @@ class BookingRequestType extends AbstractType { $insuranceChoices[$travelProgram->getInsurance2()->getName()] = $travelProgram->getInsurance2(); } + if ($travelProgram->getInsurance3()) + { + $insuranceChoices[$travelProgram->getInsurance3()->getName()] = $travelProgram->getInsurance3(); + } if (!empty($insuranceChoices)) { $builder->add('insurance', EntityType::class, [