diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6e9c394646440dfa3ff420ba0702747861853e2..72e63bc48cec44a7a4363dd77a222979ae842aea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: docker:20.10.9 variables: DOCKER_TLS_CERTDIR: "/certs" - IMAGE_VER: 0.10.0 + IMAGE_VER: 0.11.0 services: - docker:20.10.9-dind diff --git a/cf2022.conf b/cf2022.conf index 5d51031c6e392efc77b5767a8026b71a7c1cff6b..52d5eec311b7c8f80076b60d8b69ffba9587dc0f 100644 --- a/cf2022.conf +++ b/cf2022.conf @@ -9,7 +9,8 @@ pretix_event => 'cf2022', pretix_qid_sso => 29, # identifikator otazky SSO UID pretix_qid_region => 8, # identifikator otazky Kraj - pretix_product_member => 1, # produkt pro cleny - pretix_product_regp => 2, # produkt pro regp +# pretix_product_member => 1, # produkt pro cleny +# pretix_product_regp => 2, # produkt pro regp mail_domain => 'pirati.cz', + products_map => {split /\D+/, $ENV{CFG_PRODUCTS_MAP}}, } diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm index b7fb11c4b24707395d50b718d62b44d6e98d4a5d..c9a0c6f590a1258671fc139742df1054487999b9 100644 --- a/lib/CF2022/Controller/Orders.pm +++ b/lib/CF2022/Controller/Orders.pm @@ -99,6 +99,8 @@ sub create ($c ) { } } + $product->{id} = $c->mapped_product_id($product->{id}); + push @products, $product; } diff --git a/lib/CF2022/Helpers/Core.pm b/lib/CF2022/Helpers/Core.pm index b5d5ff48ef74d20f261c2956128022e526fd5ff0..30a65844fb2b773619e478fb8ac330c7b4824c1e 100644 --- a/lib/CF2022/Helpers/Core.pm +++ b/lib/CF2022/Helpers/Core.pm @@ -70,6 +70,9 @@ sub register ($class, $self, $conf) { return $data; }); + $self->helper(mapped_product_id => sub ($c, $id) { + return $c->cfg->{products_map}{$id} // $id; + }); } 1;