EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2019.07.53'

Browse Source
This commit is contained in:
Björn Fromme
2019-07-19 17:09:18 +02:00
parent 362f409928 030ce3285a
commit d57b090da0
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+5 -5
View File
@@ -260,12 +260,12 @@ class ProductRepository extends AbstractRepository
$query = $qb
->select(
'date.uid as dateUid', 'date.date_start as dateStart', 'date.date_end as dateEnd',
'date.min_price as dateMinPrice', 'date.discount as dateDiscount', 'date.bus_price as busPrice',
'date.nights as dateNights', 'date.bus_included as dateBusIncluded', 'date.services_included as dateServicesIncluded',
'date.services_general as dateServicesGeneral', 'date.skipass_included as dateSkipassIncluded',
'date.bus_pro_id as dateBusProId', 'date.hotel_bus_pro_id as hotelBusProId'
'date.min_price as dateMinPrice', 'date.pseudo_price as datePseudoPrice', 'date.discount as dateDiscount',
'date.bus_price as busPrice', 'date.nights as dateNights', 'date.bus_included as dateBusIncluded',
'date.services_included as dateServicesIncluded', 'date.services_general as dateServicesGeneral',
'date.skipass_included as dateSkipassIncluded', 'date.bus_pro_id as dateBusProId',
'date.hotel_bus_pro_id as hotelBusProId', 'date.available as available'
)
->addSelectLiteral('SUM(room.available) as available')
->from('tx_epproducts_domain_model_date', 'date')
->innerJoin('date', 'tx_epproducts_domain_model_room', 'room', 'room.date = date.uid')
->leftJoin('date', 'tx_epproducts_product_region_mm', 'mm', 'mm.uid_local = date.product')
public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+3 -2
View File
@@ -341,13 +341,14 @@ class DateService implements SingletonInterface
'dateStart' => $dateStart->format('d.m.y'),
'dateEnd' => $dateEnd->format('d.m.y'),
'dateMinPrice' => $row['dateMinPrice'],
'datePseudoPrice' => $row['datePseudoPrice'],
'dateBusPrice' => $row['dateBusPrice'],
'dateDiscount' => $row['dateDiscount'],
'dateNights' => $row['dateNights'],
'dateBusIncluded' => (bool) $row['dateBusIncluded'],
'dateSkipassIncluded' => (bool) $row['dateSkipassIncluded'],
'dateServicesIncluded' => unserialize($row['dateServicesIncluded']),
'dateServicesGeneral' => unserialize($row['dateServicesGeneral']),
'dateServicesIncluded' => unserialize($row['dateServicesIncluded'], ['allowed_classes' => false]),
'dateServicesGeneral' => unserialize($row['dateServicesGeneral'], ['allowed_classes' => false]),
'available' => $row['available'],
'bookingUrl' => $bookingUrl,
];
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DatesTable.vue
+5 -2
View File
@@ -27,7 +27,7 @@
<thead>
<tr>
<th>Termin</th>
<th>Nächte</th>
<th><i class="fa fa-bed tooltiptoggle" data-placement="top" title="Nächte"></i></th>
<th>Preis ab</th>
<th>inkl.</th>
<th class="hidden-xs"></th>
@@ -53,7 +53,10 @@
<template v-else>{{ row.dateStart }} - {{ row.dateEnd }}</template>
</td>
<td class="dates-table__cell dates-table__cell--nights">{{ row.dateNights }}</td>
<td class="dates-table__cell dates-table__cell--price"><strong>{{ calculatePrice(row) }} €</strong></td>
<td class="dates-table__cell dates-table__cell--price">
<span class="dates-table__pseudo-price" v-if="row.datePseudoPrice">{{ row.datePseudoPrice }}</span>
<strong>{{ calculatePrice(row) }} €</strong>
</td>
<td class="dates-table__cell dates-table__cell--icons">
<span class="icon-wrapper hidden-xs hidden-sm">
<i v-if="showBusIcon(row)" data-placement="top" title="Busfahrt inklusive"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_tables.scss
+8
View File
@@ -52,3 +52,11 @@
text-align:right;
}
}
.dates-table__pseudo-price {
font-weight: 400;
font-size: 85%;
color: $color-font-light;
text-decoration: line-through;
display: block;
}