diff --git a/VERSION.txt b/VERSION.txt index f0937ee63866..55f6aea29818 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.12 \ No newline at end of file +5.8.13 \ No newline at end of file diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 15e0d94aec9e..42db03a65d7a 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -176,7 +176,10 @@ class HtmlEngine $data['$credit.datetime'] = &$data['$entity.datetime']; $data['$payment_button'] = ['value' => $this->buildViewButton($this->invitation->getPaymentLink(), ctrans('texts.pay_now')), 'label' => ctrans('texts.pay_now')]; $data['$payment_link'] = ['value' => $this->invitation->getPaymentLink(), 'label' => ctrans('texts.pay_now')]; + $data['$payment_qrcode'] = ['value' => $this->invitation->getPaymentQrCode(), 'label' => ctrans('texts.pay_now')]; + $data['$payment_qrcode_raw'] = ['value' => $this->invitation->getPaymentQrCodeRaw(), 'label' => ctrans('texts.pay_now')]; + $data['$exchange_rate'] = ['value' => $this->entity->exchange_rate ?: ' ', 'label' => ctrans('texts.exchange_rate')]; $data['$triangular_tax'] = ['value' => ctrans('texts.triangular_tax'), 'label' => '']; $data['$tax_info'] = ['value' => $this->taxLabel(), 'label' => '']; diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 5990c7e3da0d..735937d81fa8 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -60,6 +60,14 @@ trait Inviteable public function getPaymentQrCode() { + return htmlentities( + sprintf('
%s
', $this->getPaymentQrCodeRaw()) + ); + } + + public function getPaymentQrCodeRaw() + { + $renderer = new ImageRenderer( new RendererStyle(150, margin: 0), new SvgImageBackEnd() @@ -68,9 +76,8 @@ trait Inviteable $qr = $writer->writeString($this->getPaymentLink(), 'utf-8'); - return htmlentities( - sprintf('
%s
', $qr) - ); + return $qr; + } public function getUnsubscribeLink() diff --git a/config/ninja.php b/config/ninja.php index 01d9f0fb939e..b8e0ad1c3380 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.8.12'), - 'app_tag' => env('APP_TAG', '5.8.12'), + 'app_version' => env('APP_VERSION', '5.8.13'), + 'app_tag' => env('APP_TAG', '5.8.13'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),