diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 621fad57450ed34a6cc2ac5d8b04564b41436c3f..3b84be9ddc15548139aa13c3d6c39afed50a5c49 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 1c8cb54a3b0aa70c462fb86715e61d2b58227990..c2fd8083761501f99b1ac61089443a5e7b7b42da 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', }; }