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

Merge branch 'release/2020.12-01'

Browse Source
This commit is contained in:
Björn Fromme
2020-12-04 14:57:15 +01:00
parent d2fe86e714 39378b5edf
commit 552d74b85b
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+5 -5
View File
@@ -1535,16 +1535,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.10.2", "version": "v4.10.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "658f1be311a230e0907f5dfe0213742aff0596de" "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
"reference": "658f1be311a230e0907f5dfe0213742aff0596de", "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1583,7 +1583,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2020-09-26T10:30:38+00:00" "time": "2020-12-03T17:45:45+00:00"
}, },
{ {
"name": "pixelant/pxa-social-feed", "name": "pixelant/pxa-social-feed",
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+1 -1
View File
@@ -45,7 +45,7 @@ $.fancybox.defaults.iframe.css.width = '800px';
// Define date filter for vue templates // Define date filter for vue templates
Vue.filter('date', (value) => { Vue.filter('date', (value) => {
return dayjs(value).format('DD.MM.YYYY'); return dayjs(value).format('DD.MM.YY');
}); });
// Store // Store
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/App.vue
+5 -5
View File
@@ -5,11 +5,11 @@
<div class="absolute z-10 top-100 left-0 w-full bg-gray-200 shadow lg:relative lg:top-auto lg:left-auto lg:w-auto lg:shadow-none lg:flex lg:space-x-4" <div class="absolute z-10 top-100 left-0 w-full bg-gray-200 shadow lg:relative lg:top-auto lg:left-auto lg:w-auto lg:shadow-none lg:flex lg:space-x-4"
:class="{ 'hidden': !navVisible }"> :class="{ 'hidden': !navVisible }">
<div class="lg:flex lg:items-center m-0"> <div class="lg:flex lg:items-center m-0">
<router-link :to="{ name: 'address' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Adressdaten</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'address' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Adressdaten</router-link>
<router-link :to="{ name: 'newsletter' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Newsletter</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'newsletter' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Newsletter</router-link>
<router-link :to="{ name: 'profile' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Mein Profil</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'profile' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Mein Profil</router-link>
<router-link :to="{ name: 'events' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Buchungen</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'events' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800">Buchungen</router-link>
<router-link :to="{ name: 'teamer' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800" v-if="isTeamer">Teamer</router-link> <router-link @click.native="navVisible = false" :to="{ name: 'teamer' }" class="block p-4 text-black hover:bg-gray-400 hover:text-gray-800" active-class="bg-gray-400 text-gray-800" v-if="isTeamer">Teamer</router-link>
</div> </div>
<a class="block px-4 py-4 text-black hover:bg-gray-400 hover:text-gray-800" href="#" @click.prevent="logout()">Logout</a> <a class="block px-4 py-4 text-black hover:bg-gray-400 hover:text-gray-800" href="#" @click.prevent="logout()">Logout</a>
</div> </div>
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/Events.vue
+6 -4
View File
@@ -7,7 +7,8 @@
<tr> <tr>
<th class="text-left align-top">Buchungsdatum</th> <th class="text-left align-top">Buchungsdatum</th>
<th class="text-left align-top">Reisedatum</th> <th class="text-left align-top">Reisedatum</th>
<th class="text-left align-top w-1/4">Reise</th> <th class="text-left align-top">Reise</th>
<th class="text-left align-top">Vorgang</th>
<th class="text-center align-top">Preis</th> <th class="text-center align-top">Preis</th>
<th class="text-center align-top">offen</th> <th class="text-center align-top">offen</th>
<th class="text-left align-top">Status</th> <th class="text-left align-top">Status</th>
@@ -19,14 +20,15 @@
<td class="text-left align-top">{{ formatBookingDate(event.dateBooking) }}</td> <td class="text-left align-top">{{ formatBookingDate(event.dateBooking) }}</td>
<td class="text-left align-top">{{ event.dateTravel | date }}</td> <td class="text-left align-top">{{ event.dateTravel | date }}</td>
<td class="text-left align-top">{{ event.product }}</td> <td class="text-left align-top">{{ event.product }}</td>
<td class="text-left align-top">{{ event.bookingNumber }}</td>
<td class="text-right align-top whitespace-no-wrap">{{ formatCurrency(event.price) }}</td> <td class="text-right align-top whitespace-no-wrap">{{ formatCurrency(event.price) }}</td>
<td class="text-right align-top whitespace-no-wrap" :class="{ 'text-red-500': hasOutstandingPayment(event) }">{{ calculateBalance(event) }}</td> <td class="text-right align-top whitespace-no-wrap" :class="{ 'text-red-500': hasOutstandingPayment(event) }">{{ calculateBalance(event) }}</td>
<td class="text-left align-top">{{ status[event.status] }}</td> <td class="text-left align-top">{{ status[event.status] }}</td>
<td class="flex space-x-1"> <td class="flex space-x-1">
<a :href="getDownloadUrl(event, 'confirmation')" target="_blank" class="button button--small"> <a :href="getDownloadUrl(event, 'confirmation')" target="_blank" class="button button--action button--small">
Bestätigung Bestätigung
</a> </a>
<a :href="getDownloadUrl(event, 'documents')" target="_blank" class="button button--small" v-if="event.documents"> <a :href="getDownloadUrl(event, 'documents')" target="_blank" class="button button--secondary button--small" v-if="event.documents">
Reiseinfos Reiseinfos
</a> </a>
<router-link :to="{ name: 'bookingEdit', params: { id: event.id } }" v-if="event.editable" class="button button--small"> <router-link :to="{ name: 'bookingEdit', params: { id: event.id } }" v-if="event.editable" class="button button--small">
@@ -80,7 +82,7 @@ import {mapState, mapMutations, mapGetters} from 'vuex'
if (!date) { if (!date) {
return '-' return '-'
} }
return dayjs(date).format('DD.MM.YYYY') return dayjs(date).format('DD.MM.YY')
}, },
getDownloadUrl (event, type) { getDownloadUrl (event, type) {
return this.config.myEpApiBaseUrl return this.config.myEpApiBaseUrl