From 14a887ef30621dac0ef6b68d820b0bdc626fe188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Mon, 9 Mar 2020 10:34:03 +0100 Subject: [PATCH 1/3] Update ddev config --- .ddev/config.yaml | 145 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index cb6c54ad..facaca0d 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.13.0 +APIVersion: v1.13.1 name: ep-reisen type: typo3 docroot: public @@ -20,3 +20,146 @@ provider: default omit_containers: [dba] use_dns_when_possible: true timezone: Europe/Berlin + + +# This config.yaml was created with ddev version v1.13.1 +# webimage: drud/ddev-webserver:v1.13.1 +# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.13.0 +# dbaimage: phpmyadmin/phpmyadmin:5 +# However we do not recommend explicitly wiring these images into the +# config.yaml as they may break future versions of ddev. +# You can update this config.yaml using 'ddev config'. + +# Key features of ddev's config.yaml: + +# name: # Name of the project, automatically provides +# http://projectname.ddev.site and https://projectname.ddev.site + +# type: # drupal6/7/8, backdrop, typo3, wordpress, php + +# docroot: # Relative path to the directory containing index.php. + +# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" + +# You can explicitly specify the webimage, dbimage, dbaimage lines but this +# is not recommended, as the images are often closely tied to ddev's' behavior, +# so this can break upgrades. + +# webimage: # nginx/php docker image. +# dbimage: # mariadb docker image. +# dbaimage: + +# mariadb_version and mysql_version +# ddev can use many versions of mariadb and mysql +# However these directives are mutually exclusive +# mariadb_version: 10.2 +# mysql_version: 8.0 + +# router_http_port: # Port to be used for http (defaults to port 80) +# router_https_port: # Port for https (defaults to 443) + +# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" +# Note that for most people the commands +# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better, +# as leaving xdebug enabled all the time is a big performance hit. + +# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well + +# timezone: Europe/Berlin +# This is the timezone used in the containers and by PHP; +# it can be set to any valid timezone, +# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +# For example Europe/Dublin or MST7MDT + +# additional_hostnames: +# - somename +# - someothername +# would provide http and https URLs for "somename.ddev.site" +# and "someothername.ddev.site". + +# additional_fqdns: +# - example.com +# - sub1.example.com +# would provide http and https URLs for "example.com" and "sub1.example.com" +# Please take care with this because it can cause great confusion. + +# upload_dir: custom/upload/dir +# would set the destination path for ddev import-files to custom/upload/dir. + +# working_dir: +# web: /var/www/html +# db: /home +# would set the default working directory for the web and db services. +# These values specify the destination directory for ddev ssh and the +# directory in which commands passed into ddev exec are run. + +# omit_containers: ["dba", "ddev-ssh-agent"] +# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently +# only those two containers can be omitted here. +# Note that these containers can also be omitted globally in the +# ~/.ddev/global_config.yaml or with the "ddev config global" command. + +# nfs_mount_enabled: false +# Great performance improvement but requires host configuration first. +# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container + +# host_https_port: "59002" +# The host port binding for https can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_webserver_port: "59001" +# The host port binding for the ddev-webserver can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_db_port: "59002" +# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic +# unless explicitly specified. + +# phpmyadmin_port: "1000" +# The PHPMyAdmin port can be changed from the default 8036 + +# mailhog_port: "1001" +# The MailHog port can be changed from the default 8025 + +# webimage_extra_packages: [php-yaml, php7.3-ldap] +# Extra Debian packages that are needed in the webimage can be added here + +# dbimage_extra_packages: [telnet,netcat] +# Extra Debian packages that are needed in the dbimage can be added here + +# use_dns_when_possible: true +# If the host has internet access and the domain configured can +# successfully be looked up, DNS will be used for hostname resolution +# instead of editing /etc/hosts +# Defaults to true + +# project_tld: ddev.site +# The top-level domain used for project URLs +# The default "ddev.site" allows DNS lookup via a wildcard +# If you prefer you can change this to "ddev.local" to preserve +# pre-v1.9 behavior. + +# ngrok_args: --subdomain mysite --auth username:pass +# Provide extra flags to the "ngrok http" command, see +# https://ngrok.com/docs#http or run "ngrok http -h" + +# disable_settings_management: false +# If true, ddev will not create CMS-specific settings files like +# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php +# In this case the user must provide all such settings. + +# provider: default # Currently either "default" or "pantheon" +# +# Many ddev commands can be extended to run tasks before or after the +# ddev command is executed, for example "post-start", "post-import-db", +# "pre-composer", "post-composer" +# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more +# information on the commands that can be extended and the tasks you can define +# for them. Example: +#hooks: +# post-start: +# - exec: composer install -d /var/www/html From fb15a4e33042aeecea0b53b8c828b6b388363cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Mon, 9 Mar 2020 10:35:03 +0100 Subject: [PATCH 2/3] Fix 0,- prices in tables --- .../Classes/Service/DateImportService.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php index adf410c3..7aed681a 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php @@ -525,7 +525,8 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface */ protected function parseRooms(\SimpleXMLElement $xmlHotel, $hotelUid, array &$date, array $services) { - $minPrice = 0; + $minPriceOverall = 0; + $minPriceAvailable = 0; $availableTotal = 0; $boardCode = ''; $count = 0; @@ -561,8 +562,14 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface $pax = (int) $roomXml->attributes()['MaxPax']; $availableTotal += $available * $pax; - if ($code !== static::CODE_BABYROOM && $available > 0 && ($minPrice === 0 || $price < $minPrice)) { - $minPrice = $price; + // Determine lowest price of available rooms + if ($code !== static::CODE_BABYROOM && $available > 0 && ($minPriceAvailable === 0 || $price < $minPriceAvailable)) { + $minPriceAvailable = $price; + } + + // Determine lowest overall price + if ($code !== static::CODE_BABYROOM && ($minPriceOverall === 0 || $price < $minPriceOverall)) { + $minPriceOverall = $price; } if ($roomXml->attributes()['status'] === static::STATUS_STOP && $price && !$available) { @@ -600,7 +607,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface } $date['board_code'] = $boardCode; - $date['min_price'] = $minPrice; + $date['min_price'] = $minPriceAvailable ?: $minPriceOverall; $date['available'] = $availableTotal; $date['rooms'] = $count; } From 9672f0c11d237456b082adef72b86be2809211ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Mon, 9 Mar 2020 10:36:18 +0100 Subject: [PATCH 3/3] Update project dependencies --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 514bdf94..d78f419b 100644 --- a/composer.lock +++ b/composer.lock @@ -5944,16 +5944,16 @@ }, { "name": "ichhabrecht/filefill", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/IchHabRecht/filefill.git", - "reference": "af7ab4ad9be29281804abae019857f9693f251d1" + "reference": "4294475fabf06f4a7a0d9301fc8e9efdaf1a4387" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/IchHabRecht/filefill/zipball/af7ab4ad9be29281804abae019857f9693f251d1", - "reference": "af7ab4ad9be29281804abae019857f9693f251d1", + "url": "https://api.github.com/repos/IchHabRecht/filefill/zipball/4294475fabf06f4a7a0d9301fc8e9efdaf1a4387", + "reference": "4294475fabf06f4a7a0d9301fc8e9efdaf1a4387", "shasum": "" }, "require": { @@ -6000,7 +6000,7 @@ "placeholder", "typo3" ], - "time": "2020-02-26T13:26:05+00:00" + "time": "2020-03-05T13:54:11+00:00" }, { "name": "pimple/pimple",