From d11582b9b385c04867c4e2fc2904a459dfc7fe77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Tue, 17 Jan 2023 22:22:01 +0100
Subject: [PATCH] Mapovani variaci
---
.gitlab-ci.yml | 2 +-
lib/CF2022/Controller/Orders.pm | 2 +-
lib/CF2022/Helpers/Core.pm | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 342874b..c035163 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.2
+ IMAGE_VER: 0.11.3
services:
- docker:20.10.9-dind
diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm
index 6217f3a..199f156 100644
--- a/lib/CF2022/Controller/Orders.pm
+++ b/lib/CF2022/Controller/Orders.pm
@@ -133,7 +133,7 @@ sub create ($c ) {
my $item = {
item => $c->mapped_product_id($product->{id}),
- variation => $product->{variation},
+ variation => $c->mapped_variation_id($product->{variation}),
attendee_name => $args->{name},
price => $product->{price},
company => $args->{company},
diff --git a/lib/CF2022/Helpers/Core.pm b/lib/CF2022/Helpers/Core.pm
index 2ac5d36..a32773f 100644
--- a/lib/CF2022/Helpers/Core.pm
+++ b/lib/CF2022/Helpers/Core.pm
@@ -72,7 +72,11 @@ sub register ($class, $self, $conf) {
$self->helper(mapped_product_id => sub ($c, $id) {
my %map = (split /\D+/, $c->cfg->{pretix_products_map});
- $c->trace(\%map);
+ return (exists $map{$id}) ? $map{$id} : $id;
+ });
+
+ $self->helper(mapped_variation_id => sub ($c, $id) {
+ my %map = (split /\D+/, $c->cfg->{pretix_variations_map});
return (exists $map{$id}) ? $map{$id} : $id;
});
}
--
GitLab