From 0fca0fadc30f4aebc2ff59db61c1d3ac4fe98431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Wed, 8 Mar 2023 01:18:27 +0100
Subject: [PATCH] Payment request
---
.gitlab-ci.yml | 2 +-
lib/CF2022/Controller/Orders.pm | 20 +++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4b2354..10f6443 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.13.2
+ IMAGE_VER: 0.13.3
services:
- docker:20.10.9-dind
diff --git a/lib/CF2022/Controller/Orders.pm b/lib/CF2022/Controller/Orders.pm
index 7b262f7..1326832 100644
--- a/lib/CF2022/Controller/Orders.pm
+++ b/lib/CF2022/Controller/Orders.pm
@@ -171,18 +171,20 @@ sub create ($c ) {
order_id => $rc->json->{code},
});
- $rc->json->{payment_request} => {
- account => $c->cfg->{payment_account},
- amount => $order->response->{payments}[0]{amount},
- vs => sprintf(TPL_VS, $c->cfg->{payment_vs_prefix}, $order->id ),
- ss => $c->cfg->{payment_ss},
- ks => $c->cfg->{payment_ks},
- qr => '/api/orders/' . $order->id . '/payment.png',
- };
$c->render(
status => 201,
- json => $rc->json,
+ json => {
+ %{ $rc->json },
+ payment_request => {
+ account => $c->cfg->{payment_account},
+ amount => $order->response->{payments}[0]{amount},
+ vs => sprintf(TPL_VS, $c->cfg->{payment_vs_prefix}, $order->id ),
+ ss => $c->cfg->{payment_ss},
+ ks => $c->cfg->{payment_ks},
+ qr => '/api/orders/' . $order->id . '/payment.png',
+ },
+ }
);
}
--
GitLab