Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-06 17:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9182 from turbo124/v5-develop

Browse Source 
v5.8.13
This commit is contained in:
David Bomba 2024-01-21 12:52:29 +11:00 committed by GitHub
commit e8ffad5f0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.12 5.8.13

3
app/Utils/HtmlEngine.php
View File

@ -176,7 +176,10 @@ class HtmlEngine
$data['$credit.datetime'] = &$data['$entity.datetime']; $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_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_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'] = ['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['$exchange_rate'] = ['value' => $this->entity->exchange_rate ?: ' ', 'label' => ctrans('texts.exchange_rate')];
$data['$triangular_tax'] = ['value' => ctrans('texts.triangular_tax'), 'label' => '']; $data['$triangular_tax'] = ['value' => ctrans('texts.triangular_tax'), 'label' => ''];
$data['$tax_info'] = ['value' => $this->taxLabel(), 'label' => '']; $data['$tax_info'] = ['value' => $this->taxLabel(), 'label' => ''];

13
app/Utils/Traits/Inviteable.php
View File

@ -60,6 +60,14 @@ trait Inviteable
public function getPaymentQrCode() public function getPaymentQrCode()
{ {
return htmlentities(
sprintf('<div>%s</div>', $this->getPaymentQrCodeRaw())
);
}
public function getPaymentQrCodeRaw()
{
$renderer = new ImageRenderer( $renderer = new ImageRenderer(
new RendererStyle(150, margin: 0), new RendererStyle(150, margin: 0),
new SvgImageBackEnd() new SvgImageBackEnd()
@ -68,9 +76,8 @@ trait Inviteable
$qr = $writer->writeString($this->getPaymentLink(), 'utf-8'); $qr = $writer->writeString($this->getPaymentLink(), 'utf-8');
return htmlentities( return $qr;
sprintf('<div>%s</div>', $qr)
);
} }
public function getUnsubscribeLink() public function getUnsubscribeLink()

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.12'), 'app_version' => env('APP_VERSION', '5.8.13'),
'app_tag' => env('APP_TAG', '5.8.12'), 'app_tag' => env('APP_TAG', '5.8.13'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),