From e64facbd6fbbbf5dbe744826189cfe0dd6469b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 5 Dec 2019 14:43:07 +0100 Subject: [PATCH 1/5] Properly detect blocked contingents --- .../typo3conf/ext/ep_products/Classes/Service/IcalService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php b/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php index c64cf291..c78d3734 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php @@ -80,7 +80,7 @@ class IcalService implements SingletonInterface $percentageBooked = 100; - if ($paxTotal > 0) { + if ($paxTotal > 0 && Contingent::STATUS_BLOCKED !== $event->getStatus()) { $percentageBooked = 100 - round($paxAvaiable / $paxTotal * 100); } From 20c990beacfef18b890e9868fc2c383899149451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Tue, 10 Dec 2019 16:49:08 +0100 Subject: [PATCH 2/5] Testdrive new logo and colors --- .../Resources/Private/Assets/images/logo_snowzone_2019.svg | 1 + .../ext/ep_theme/Resources/Private/Assets/js/_images.js | 1 + .../Resources/Private/Assets/scss/_color-snowzone.scss | 6 +++--- .../ext/ep_theme/Resources/Private/Assets/scss/_events.scss | 3 +-- .../Private/Assets/scss/remix/_colors_snowzone.scss | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg new file mode 100644 index 00000000..39671098 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js index beb6431c..f5838bf3 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js @@ -49,6 +49,7 @@ require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png'); require('../images/logo_boarderweek.svg'); require('../images/favicon_sbw.ico'); require('../images/logo_snowzone.svg'); +require('../images/logo_snowzone_2019.svg'); require('../images/favicon_sz.ico'); require('../images/logo_uni_champ.svg'); require('../images/favicon_uch.ico'); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss index 16a87a45..05eeaea9 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss @@ -5,14 +5,14 @@ ========================================================================== */ //hover/active/link -$link:#c31b63; -$bg:#9f0d4c; +$link:#82C3C6; +$bg:#82C3C6; $bg_second: #3995DF; $overlay:0.25; $overlayMid: 0.8; $hover_low:0.15; $color-overlay:rgba($bg, $overlayMid); -$darkButton: #9f0d4c; +$darkButton: #82C3C6; $darkButtonLine: rgba($darkButton, 0.8); $color-bg-second:rgba($darkButton, 0.5); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss index 3b60bf43..00b81151 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss @@ -16,8 +16,7 @@ &.snowzone{ .navbar-main-wrapper .navbar-main .logo{ - height: 55px; - margin-top: 30px; + height: 100px; margin-left: 10%; @media (max-width: $smartphoneWidth) { height: 100%; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss index cc944a07..c68e9aef 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss @@ -1,5 +1,5 @@ -$color-brand-primary: #9f0d4c; +$color-brand-primary: #82C3C6; -$color-button-background: #ffe900; +$color-button-background: #f9c33d; $color-button-foreground: $color-brand-primary; $color-button-booking: $color-label-success; From 5093fdf672b9a69b0d7d85072a2f42d6d1df7dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 11 Dec 2019 16:14:35 +0100 Subject: [PATCH 3/5] Replace logo image --- .../Resources/Private/Assets/images/logo_snowzone_2019.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg index 39671098..7b534d9f 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 8af60e9ed608f8bf6b8caec4e9bcf431dcc385fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 13 Dec 2019 09:54:44 +0100 Subject: [PATCH 4/5] Adjust colors --- .../Resources/Private/Assets/scss/_color-snowzone.scss | 4 ++-- .../ep_theme/Resources/Private/Assets/scss/_events.scss | 8 +++++--- .../Private/Assets/scss/remix/_colors_snowzone.scss | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss index 05eeaea9..996ee237 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss @@ -17,9 +17,9 @@ $darkButtonLine: rgba($darkButton, 0.8); $color-bg-second:rgba($darkButton, 0.5); -$button: #ffe900; +$button: #f9c33d; $bgAlpha: rgba($link, 0.5); -$buttonActiveHover: #e9d504; +$buttonActiveHover: #f9c33d; $buttonInfoHover:#04578e; $colorBlack: #404040; $typoWhite: #ffffff; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss index 00b81151..c48b6022 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss @@ -26,13 +26,15 @@ } - .btn, + .btn { + color: white; + } .ep-has-error-bar, .checkbox label input[type="checkbox"] + .cr > .cr-icon{ - color:$bg; + color: white; } .topnavi .container .row a{ - color:$typoWhite; + color: white; } .ep-disturber-last-chance{ diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss index c68e9aef..a2d204ce 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss @@ -1,5 +1,5 @@ $color-brand-primary: #82C3C6; $color-button-background: #f9c33d; -$color-button-foreground: $color-brand-primary; +$color-button-foreground: white; $color-button-booking: $color-label-success; From 11959b39e7253bf5e2d8ad3d358d1f5003f5e01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Fri, 13 Dec 2019 09:56:41 +0100 Subject: [PATCH 5/5] Update project dependencies --- composer.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 85c0b93d..6d885a5d 100644 --- a/composer.lock +++ b/composer.lock @@ -889,16 +889,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.4.1", + "version": "6.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11" + "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5", + "reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5", "shasum": "" }, "require": { @@ -913,12 +913,13 @@ "psr/log": "^1.1" }, "suggest": { + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "6.5-dev" } }, "autoload": { @@ -951,7 +952,7 @@ "rest", "web service" ], - "time": "2019-10-23T15:58:00+00:00" + "time": "2019-12-07T18:20:45+00:00" }, { "name": "guzzlehttp/promises",