From 8403b39f2db585fd7d378d6d084e58b34db630bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Thu, 23 Mar 2023 16:19:15 +0100
Subject: [PATCH] Bugdix
---
.gitlab-ci.yml | 2 +-
lib/CF2022/Controller/Orders.pm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 621fad5..3b84be9 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.15.1
+ IMAGE_VER: 0.15.2
services:
- docker:20.10.9-dind
diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm
index 1c8cb54..c2fd808 100644
--- a/lib/CF2022/Controller/Orders.pm
+++ b/lib/CF2022/Controller/Orders.pm
@@ -291,11 +291,11 @@ sub _upload_photo ($c, $username ) {
sub _payment_request($c, $order) {
- my $ks = $c->cfg->{payment_ks_base};
+ my $ks_bits = 0;
PRODUCT:
foreach my $pos ( @{ $order->response->{positions}} ) {
- $ks |= $c->payment_ks_bit($pos->{item})
+ $ks_bits |= $c->payment_ks_bit($pos->{item});
}
return {
@@ -306,7 +306,7 @@ sub _payment_request($c, $order) {
payer => $order->request->{positions}[0]{attendee_name},
vs => sprintf(TPL_VS, $c->cfg->{payment_vs_prefix}, $order->id ),
ss => $c->cfg->{payment_ss},
- ks => $ks,
+ ks => $c->cfg->{payment_ks_base} + $ks_bits,
qr => '/api/orders/' . $order->id . '/payment.png',
};
}
--
GitLab