From ba70a627992041769e663c90602a7fa933f693c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Tue, 17 Jan 2023 22:12:53 +0100
Subject: [PATCH] Bugfix, test
---
.gitlab-ci.yml | 2 +-
cf2022.conf | 6 ++----
lib/CF2022/Controller/Orders.pm | 2 +-
lib/CF2022/Helpers/Core.pm | 4 +++-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d17ec03..342874b 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.11.1
+ IMAGE_VER: 0.11.2
services:
- docker:20.10.9-dind
diff --git a/cf2022.conf b/cf2022.conf
index 52d5eec..8743c8e 100644
--- a/cf2022.conf
+++ b/cf2022.conf
@@ -9,8 +9,6 @@
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
- mail_domain => 'pirati.cz',
- products_map => {split /\D+/, $ENV{CFG_PRODUCTS_MAP}},
+ pretix_qid_photo => 28, # identifikator otazky Foto
+ mail_domain => 'pirati.cz',
}
diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm
index be36ec1..6217f3a 100644
--- a/lib/CF2022/Controller/Orders.pm
+++ b/lib/CF2022/Controller/Orders.pm
@@ -121,7 +121,7 @@ sub create ($c ) {
if ( $photo_id ) {
push @answers, (
{
- question => 28,
+ question => $c->config->{pretix_qid_photo} ,
answer => $photo_id,
},
);
diff --git a/lib/CF2022/Helpers/Core.pm b/lib/CF2022/Helpers/Core.pm
index 30a6584..2ac5d36 100644
--- a/lib/CF2022/Helpers/Core.pm
+++ b/lib/CF2022/Helpers/Core.pm
@@ -71,7 +71,9 @@ sub register ($class, $self, $conf) {
});
$self->helper(mapped_product_id => sub ($c, $id) {
- return $c->cfg->{products_map}{$id} // $id;
+ my %map = (split /\D+/, $c->cfg->{pretix_products_map});
+ $c->trace(\%map);
+ return (exists $map{$id}) ? $map{$id} : $id;
});
}
--
GitLab