mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for EPC failures
This commit is contained in:
parent
f2859e0e6f
commit
1d2ebf3b7a
@ -113,7 +113,7 @@ class QuoteFilters extends QueryFilters
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(in_array('convert', $status_parameters)) {
|
if(in_array('converted', $status_parameters)) {
|
||||||
$query->orWhere(function ($q) {
|
$query->orWhere(function ($q) {
|
||||||
$q->whereNotNull('invoice_id');
|
$q->whereNotNull('invoice_id');
|
||||||
});
|
});
|
||||||
|
@ -41,15 +41,17 @@ class EpcQrGenerator
|
|||||||
|
|
||||||
public function getQrCode()
|
public function getQrCode()
|
||||||
{
|
{
|
||||||
$renderer = new ImageRenderer(
|
$qr = '';
|
||||||
new RendererStyle(200),
|
|
||||||
new SvgImageBackEnd()
|
|
||||||
);
|
|
||||||
$writer = new Writer($renderer);
|
|
||||||
|
|
||||||
$this->validateFields();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
$renderer = new ImageRenderer(
|
||||||
|
new RendererStyle(200),
|
||||||
|
new SvgImageBackEnd()
|
||||||
|
);
|
||||||
|
$writer = new Writer($renderer);
|
||||||
|
|
||||||
|
$this->validateFields();
|
||||||
|
|
||||||
$qr = $writer->writeString($this->encodeMessage(), 'utf-8');
|
$qr = $writer->writeString($this->encodeMessage(), 'utf-8');
|
||||||
} catch(\Throwable $e) {
|
} catch(\Throwable $e) {
|
||||||
return '';
|
return '';
|
||||||
|
@ -5177,6 +5177,7 @@ $LANG = array(
|
|||||||
'log' => 'Log',
|
'log' => 'Log',
|
||||||
'classification' => 'Classification',
|
'classification' => 'Classification',
|
||||||
'stock_quantity_number' => 'Stock :quantity',
|
'stock_quantity_number' => 'Stock :quantity',
|
||||||
|
'upcoming' => 'Upcoming',
|
||||||
);
|
);
|
||||||
|
|
||||||
return $LANG;
|
return $LANG;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user