fixes
This commit is contained in:
parent
2913dca789
commit
3bd2e304cd
@ -6,9 +6,6 @@ services:
|
||||
- ${APPLICATION_CODE_PATH_HOST?}:${APPLICATION_CODE_PATH_CONTAINER?}
|
||||
environment:
|
||||
- APP_ENV=test
|
||||
php-cron:
|
||||
environment:
|
||||
- APP_ENV=test
|
||||
php-fpm:
|
||||
environment:
|
||||
- APP_ENV=test
|
||||
|
||||
@ -14,10 +14,55 @@ services:
|
||||
web:
|
||||
environment:
|
||||
- APP_ENV=dev
|
||||
ports:
|
||||
- "${NGINX_HOST_HTTP_PORT:-80}:80"
|
||||
- "${NGINX_HOST_HTTPS_PORT:-443}:443"
|
||||
volumes:
|
||||
- ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?}
|
||||
php-fpm:
|
||||
environment:
|
||||
- APP_ENV=dev
|
||||
ports:
|
||||
- "${APPLICATION_SSH_HOST_PORT:-2222}:22"
|
||||
- "${APPLICATION_PANTHER_HOST_PORT:-9001}:9001"
|
||||
volumes:
|
||||
- ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?}
|
||||
|
||||
php-cron:
|
||||
environment:
|
||||
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG?}
|
||||
networks:
|
||||
- network
|
||||
cap_add:
|
||||
- "SYS_PTRACE"
|
||||
security_opt:
|
||||
- "seccomp=unconfined"
|
||||
extra_hosts:
|
||||
- host.docker.internal:host-gateway
|
||||
|
||||
chrome:
|
||||
ports:
|
||||
- "7900:7900"
|
||||
- "4444:4444"
|
||||
|
||||
smtp4dev:
|
||||
ports:
|
||||
# Change the number before : to the port the web interface should be accessible on
|
||||
- '5000:80'
|
||||
# Change the number before : to the port the SMTP server should be accessible on
|
||||
- '25:25'
|
||||
# Change the number before : to the port the IMAP server should be accessible on
|
||||
- '143:143'
|
||||
|
||||
webhook:
|
||||
ports:
|
||||
# Change the number before : to the port the IMAP server should be accessible on
|
||||
- '5002:8080'
|
||||
|
||||
mongodb:
|
||||
ports:
|
||||
- "127.0.0.1:27017:27017"
|
||||
|
||||
mysql:
|
||||
ports:
|
||||
- "127.0.0.1:3306:3306"
|
||||
|
||||
@ -26,22 +26,7 @@ services:
|
||||
- network
|
||||
extra_hosts:
|
||||
- host.docker.internal:host-gateway
|
||||
php-cron:
|
||||
environment:
|
||||
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG?}
|
||||
networks:
|
||||
- network
|
||||
cap_add:
|
||||
- "SYS_PTRACE"
|
||||
security_opt:
|
||||
- "seccomp=unconfined"
|
||||
extra_hosts:
|
||||
- host.docker.internal:host-gateway
|
||||
|
||||
web:
|
||||
ports:
|
||||
- "${NGINX_HOST_HTTP_PORT:-80}:80"
|
||||
- "${NGINX_HOST_HTTPS_PORT:-443}:443"
|
||||
networks:
|
||||
network:
|
||||
aliases:
|
||||
@ -50,21 +35,11 @@ services:
|
||||
- php-fpm
|
||||
chrome:
|
||||
image: selenium/standalone-chromium:latest
|
||||
ports:
|
||||
- "7900:7900"
|
||||
- "4444:4444"
|
||||
networks:
|
||||
- network
|
||||
smtp4dev:
|
||||
image: registry.thomas-peterson.de/smtp4dev:manifest-amd64
|
||||
restart: always
|
||||
ports:
|
||||
# Change the number before : to the port the web interface should be accessible on
|
||||
- '5000:80'
|
||||
# Change the number before : to the port the SMTP server should be accessible on
|
||||
- '25:25'
|
||||
# Change the number before : to the port the IMAP server should be accessible on
|
||||
- '143:143'
|
||||
environment:
|
||||
- ServerOptions__Urls=http://*:80
|
||||
- ServerOptions__HostName=smtp4dev
|
||||
@ -75,9 +50,6 @@ services:
|
||||
restart: always
|
||||
environment:
|
||||
- AUTO_CREATE_SESSIONS=true
|
||||
ports:
|
||||
# Change the number before : to the port the IMAP server should be accessible on
|
||||
- '5002:8080'
|
||||
networks:
|
||||
- network
|
||||
application:
|
||||
@ -100,9 +72,6 @@ services:
|
||||
- "SYS_PTRACE"
|
||||
security_opt:
|
||||
- "seccomp=unconfined"
|
||||
ports:
|
||||
- "${APPLICATION_SSH_HOST_PORT:-2222}:22"
|
||||
- "${APPLICATION_PANTHER_HOST_PORT:-9001}:9001"
|
||||
tty: true
|
||||
networks:
|
||||
- network
|
||||
@ -118,8 +87,6 @@ services:
|
||||
# - mongodb:/data/db
|
||||
networks:
|
||||
- network
|
||||
ports:
|
||||
- "127.0.0.1:27017:27017"
|
||||
mysql:
|
||||
image: mariadb:${MYSQL_VERSION?}
|
||||
environment:
|
||||
@ -134,5 +101,4 @@ services:
|
||||
command: --sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" --character-set-server=utf8 --collation-server=utf8_slovenian_ci --innodb-flush-log-at-trx-commit=0
|
||||
networks:
|
||||
- network
|
||||
ports:
|
||||
- "127.0.0.1:3306:3306"
|
||||
|
||||
|
||||
@ -64,9 +64,9 @@ server {
|
||||
try_files $uri @sfFront;
|
||||
}
|
||||
|
||||
# location /w2p/ {
|
||||
# proxy_pass http://tp:8080/w2p/;
|
||||
# proxy_temp_path /tmp/proxy;
|
||||
#location /w2p/ {
|
||||
# proxy_pass http://tp:8080/w2p/;
|
||||
# proxy_temp_path /tmp/proxy;
|
||||
#}
|
||||
|
||||
location @sfFront { # Symfony
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,5 +1,6 @@
|
||||
!.env.example
|
||||
.make/.env
|
||||
.make/.env.test
|
||||
.docker/.env
|
||||
.idea
|
||||
/phpstorm.yml
|
||||
|
||||
@ -17,6 +17,7 @@ export DOCKER_BUILDKIT
|
||||
|
||||
DOCKER_DIR:=./.docker
|
||||
DOCKER_ENV_FILE:=$(DOCKER_DIR)/.env
|
||||
DOCKER_ENV_TEST_FILE:=$(DOCKER_DIR)/.env.test
|
||||
DOCKER_COMPOSE_DIR:=$(DOCKER_DIR)/docker-compose
|
||||
DOCKER_COMPOSE_FILE_LOCAL_CI_PROD:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.ci.prod.yml
|
||||
DOCKER_COMPOSE_FILE_LOCAL_CI:=$(DOCKER_COMPOSE_DIR)/docker-compose.local.ci.yml
|
||||
@ -32,6 +33,7 @@ ifeq ($(ENV),prod)
|
||||
DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD)
|
||||
else ifeq ($(ENV),ci)
|
||||
DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_CI_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL_CI) -f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL)
|
||||
DOCKER_ENV_FILE:=$(DOCKER_ENV_TEST_FILE)
|
||||
else ifeq ($(ENV),local)
|
||||
DOCKER_COMPOSE_FILES:=-f $(DOCKER_COMPOSE_FILE_LOCAL_PROD) -f $(DOCKER_COMPOSE_FILE_LOCAL) -f $(DOCKER_COMPOSE_FILE_LOCAL_DEV)
|
||||
endif
|
||||
@ -89,7 +91,7 @@ docker-compose-init: ## Initialize the .env file for docker compose
|
||||
|
||||
.PHONY: docker-compose-init-test
|
||||
docker-compose-init-test: ## Initialize the .env file for docker compose
|
||||
@cp $(DOCKER_ENV_FILE).test.example $(DOCKER_ENV_FILE)
|
||||
@cp $(DOCKER_ENV_FILE).test.example $(DOCKER_ENV_TEST_FILE)
|
||||
|
||||
.PHONY: docker-compose-clean
|
||||
docker-compose-clean: ## Remove the .env file for docker compose
|
||||
|
||||
1
Makefile
1
Makefile
@ -46,7 +46,6 @@ include .make/variables.env
|
||||
-include .make/local.env
|
||||
# include the current environment settings
|
||||
-include .make/.env
|
||||
|
||||
# set default values for ENV and TAG to suppress "warning: undefined variable" when .make/.env does not exist yet
|
||||
ENV?=
|
||||
TAG?=
|
||||
|
||||
@ -138,17 +138,14 @@ class Shop
|
||||
/**
|
||||
* @return bool
|
||||
*/
|
||||
public function isDeleted(): bool
|
||||
public function isDisabled(): bool
|
||||
{
|
||||
return $this->deleted;
|
||||
return $this->disabled;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param bool $deleted
|
||||
*/
|
||||
public function setDeleted(bool $deleted): void
|
||||
public function setDisabled(bool $disabled): void
|
||||
{
|
||||
$this->deleted = $deleted;
|
||||
$this->disabled = $disabled;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -32,6 +32,11 @@ class Price
|
||||
#[OA\Property(type: 'integer')]
|
||||
private int $count = 1;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->tax = new Tax();
|
||||
}
|
||||
|
||||
public function getNet(): int
|
||||
{
|
||||
return $this->net;
|
||||
@ -113,4 +118,4 @@ class Price
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,4 +38,4 @@ class SpecialProductDenormalizer implements DenormalizerInterface, DenormalizerA
|
||||
|
||||
return $type == IProductTypeObject::class;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,13 +51,13 @@ $articleObj = new market_article();
|
||||
|
||||
</ul>
|
||||
|
||||
<?php if($this->shop->basketposfield1 != ""): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<?php if($this->shop->basketposfield1 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="ref_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getRef(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
</form>
|
||||
<?php endif; ?>
|
||||
<?php if($this->shop->basketposfield2 != ""): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<?php if($this->shop->basketposfield2 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="kst_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getKst(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
|
||||
@ -52,13 +52,13 @@ $articleObj = new market_article();
|
||||
|
||||
</ul>
|
||||
|
||||
<?php if($this->shop->basketposfield1 != ""): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<?php if($this->shop->basketposfield1 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="ref_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getRef(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
</form>
|
||||
<?php endif; ?>
|
||||
<?php if($this->shop->basketposfield2 != ""): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<?php if($this->shop->basketposfield2 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="kst_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getKst(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
|
||||
@ -51,13 +51,13 @@ $articleObj = new market_article();
|
||||
|
||||
</ul>
|
||||
<?php endif; ?>
|
||||
<?php if($this->shop->basketposfield1 != ""): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<?php if($this->shop->basketposfield1 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield1 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="ref_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getRef(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
</form>
|
||||
<?php endif; ?>
|
||||
<?php if($this->shop->basketposfield2 != ""): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<?php if($this->shop->basketposfield2 != "" && !$this->finish): ?><?php echo $this->shop->basketposfield2 ?>
|
||||
<form enctype="multipart/form-data" method="post">
|
||||
<div><input type="text" class="span3" style="margin-bottom: 0;" name="kst_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getKst(); ?>"/>
|
||||
<input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user