gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1457 und #1446

Browse source 
Status Buchnungen und Zimmer verfügbar

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3432 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-07-26 16:07:56 +00:00
parent 0bdd497cfb
commit a6ef96b4e5
15 changed files with 27874 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/app/Resources/views/default/pages/booking.html.twig
View file

@ -78,7 +78,9 @@
{# TODO folgendes evtl noch weiter verallgemeinern #}
{% set priceTypeIds = [] %}
{% for price in travel_date.prices %}
{% set priceTypeIds = priceTypeIds|merge([price.priceTypeId]) %}
{% if(price.available == "1") %}
{% set priceTypeIds = priceTypeIds|merge([price.priceTypeId]) %}
{% endif %}
{% endfor %}
{% if "1" in priceTypeIds %}

71
trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
View file

@ -231,34 +231,43 @@
</td>
{% endif %}
<td data-title="Preis p.P im Doppelzimmer">
{% if travel_date.prices[3].effectiveDiscountPrice %}
<i class="icons-percent"></i>
{% endif %}
<span class="block">
<span class="{% if travel_date.prices[3].effectiveDiscountPrice %}old_price{% endif %}">
ab {{ travel_date.prices[3].effectivePrice|number_format }} €
</span>
{% if travel_date.prices[3].available == "1" %}
{% if travel_date.prices[3].effectiveDiscountPrice %}
<span class="new_price">
ab {{ travel_date.prices[3].effectiveDiscountPrice|number_format }} €
</span>
<i class="icons-percent"></i>
{% endif %}
</span>
<span class="block">
<span class="{% if travel_date.prices[3].effectiveDiscountPrice %}old_price{% endif %}">
ab {{ travel_date.prices[3].effectivePrice|number_format }} €
</span>
{% if travel_date.prices[3].effectiveDiscountPrice %}
<span class="new_price">
ab {{ travel_date.prices[3].effectiveDiscountPrice|number_format }} €
</span>
{% endif %}
</span>
{% else %}
nicht verfügbar
{% endif %}
</td>
<td data-title="Preis p.P im Einzelzimmer">
{% if travel_date.prices[1].effectiveDiscountPrice %}
<i class="icons-percent"></i>
{% endif %}
<span class="block">
<span class="{% if travel_date.prices[1].effectiveDiscountPrice %}old_price{% endif %}">
ab {{ travel_date.prices[1].effectivePrice|number_format }} €
</span>
{% if travel_date.prices[1].available == "1" %}
{% if travel_date.prices[1].effectiveDiscountPrice %}
<span class="new_price">
ab {{ travel_date.prices[1].effectiveDiscountPrice|number_format }} €
</span>
<i class="icons-percent"></i>
{% endif %}
</span>
<span class="block">
<span class="{% if travel_date.prices[1].effectiveDiscountPrice %}old_price{% endif %}">
ab {{ travel_date.prices[1].effectivePrice|number_format }} €
</span>
{% if travel_date.prices[1].effectiveDiscountPrice %}
<span class="new_price">
ab {{ travel_date.prices[1].effectiveDiscountPrice|number_format }} €
</span>
{% endif %}
</span>
{% else %}
nicht verfügbar
{% endif %}
</td>
<td data-title="Abflugorte / Zuschläge">
<a href="#" class="color-brand" data-toggle="modal" data-target="#st-departures-modal-{{ loop.index0 }}">
@ -271,8 +280,22 @@
} %}
</td>
<td data-title="Verfügbarkeit">
<img src="/images/icons/available-{{ travel_date.effectiveStatus }}.png"
alt="Verfügbarkeit">
<div style="">
<img src="/images/icons/available-{{ travel_date.effectiveStatus }}.png" style="height: 24px; width: 24px;vertical-align:middle" data-toggle="tooltip" data-placement="top"
{% if travel_date.effectiveStatus == 0 %}
data-original-title="NICHT VERFÜGBAR" alt="NICHT VERFÜGBAR">
{% endif %}
{% if travel_date.effectiveStatus == 1 %}
data-original-title="WENIGE VERFÜGBAR" alt="WENIGE VERFÜGBAR">
{% endif %}
{% if travel_date.effectiveStatus == 2 %}
data-original-title="BUCHBAR" alt="BUCHBAR">
{% endif %}
{% if travel_date.effectiveStatus == 3 %}
data-original-title="GARANTIERT" alt="GARANTIERT">
{% endif %}
</div>
</td>
<td data-title="">
<a href="{{ page.urlPath ~ '/buchen?nr=' ~ travel_date.name }}"

29
trunk/src/AppBundle/Entity/TravelPeriodPrice.php
View file

@ -70,6 +70,11 @@ class TravelPeriodPrice
private $effectiveChildPrice = null;
private $effectiveComfortPrice = null;
/**
* @ORM\Column(name="available", type="integer", nullable=false)
*/
private $available;
/**
* Set priceType
*
@ -94,6 +99,30 @@ class TravelPeriodPrice
return $this->priceType;
}
/**
* Set available
*
* @param integer $available
*
* @return TravelPeriodPrice
*/
public function setAvailable($available)
{
$this->available = $available;
return $this;
}
/**
* Get available
*
* @return integer
*/
public function getAvailable()
{
return $this->available;
}
/**
* Set priceChildren
*

6981
trunk/web/images/icons/available-0.ai Normal file
View file

File diff suppressed because one or more lines are too long

BIN
trunk/web/images/icons/available-0.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

15
trunk/web/images/icons/available-0.svg Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#BE1622;}
</style>
<g>
<path class="st0" d="M19.8,10c0,2.6-1,5-2.8,6.9s-4.2,2.8-6.9,2.8c-2.6,0-5-1-6.8-2.9C1.2,15,0.2,12.6,0.2,10c0-2.7,1-5,2.9-6.9
C5,1.2,7.4,0.2,10,0.2s5,1,6.9,2.8S19.8,7.3,19.8,10z M18.5,10c0-2.3-0.8-4.3-2.4-5.9c-1.7-1.7-3.6-2.4-5.9-2.4S5.8,2.4,4.2,4.1
C2.4,5.7,1.6,7.7,1.6,10s0.8,4.3,2.4,5.9s3.6,2.4,5.9,2.4s4.3-0.8,5.9-2.4S18.5,12.3,18.5,10z M14.6,5.4c0.3,0.4,0.3,0.7-0.1,1
L10.9,10l3.2,3.6c0.3,0.3,0.3,0.6,0,0.9c-0.3,0.3-0.6,0.3-1,0L10,10.9l-3.6,3.6c-0.3,0.3-0.6,0.3-0.9,0c-0.3-0.3-0.3-0.6,0-0.9
L9.1,10L5.9,6.4c-0.3-0.3-0.3-0.6,0-1c0.3-0.3,0.6-0.3,1,0L10.1,9l3.6-3.6C13.9,5.1,14.2,5.1,14.6,5.4z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1,022 B

6975
trunk/web/images/icons/available-1.ai Normal file
View file

File diff suppressed because one or more lines are too long

BIN
trunk/web/images/icons/available-1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

11
trunk/web/images/icons/available-1.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#F39200;}
.st1{font-family:'ElegantIcons';}
.st2{font-size:19.6742px;}
</style>
<text transform="matrix(1.0066 0 0 1 0.1016 18.5986)" class="st0 st1 st2">r</text>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 552 B

6903
trunk/web/images/icons/available-2.ai Normal file
View file

File diff suppressed because one or more lines are too long

BIN
trunk/web/images/icons/available-2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3 KiB

Before After
Before After

13
trunk/web/images/icons/available-2.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#008D36;}
</style>
<g>
<path class="st0" d="M19.9,10c0,2.7-1,5-2.9,7s-4.3,2.9-7,2.9S5,18.9,3,17c-1.9-1.9-2.9-4.2-2.9-7c0-2.7,1-5,2.9-7
C5,1.1,7.3,0.2,10,0.2s5.1,1,7,2.9C18.9,5,19.9,7.3,19.9,10z M18.7,10c0-2.4-0.8-4.4-2.5-6.1c-1.7-1.7-3.7-2.5-6.1-2.5
S5.6,2.2,3.9,3.9S1.4,7.6,1.4,10s0.8,4.4,2.5,6.1c1.7,1.7,3.7,2.5,6.1,2.5s4.4-0.8,6.1-2.5C17.8,14.4,18.7,12.4,18.7,10z"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 767 B

6885
trunk/web/images/icons/available-3.ai Normal file
View file

File diff suppressed because one or more lines are too long

BIN
trunk/web/images/icons/available-3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

11
trunk/web/images/icons/available-3.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
<style type="text/css">
.st0{fill:#008D36;}
.st1{font-family:'ElegantIcons';}
.st2{font-size:19.6396px;}
</style>
<text transform="matrix(1.0029 0 0 1 0.1353 18.5664)" class="st0 st1 st2">R</text>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 552 B