Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8862 from turbo124/v5-develop

Browse Source 
v5.7.27
This commit is contained in:
David Bomba 2023-10-07 12:21:41 +11:00 committed by GitHub
commit 114a0dfb7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.26 5.7.27

2
app/Filters/QuoteFilters.php
View File

@ -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');
}); });

4
app/Helpers/Epc/EpcQrGenerator.php
View File

@ -41,6 +41,9 @@ class EpcQrGenerator
public function getQrCode() public function getQrCode()
{ {
$qr = '';
try {
$renderer = new ImageRenderer( $renderer = new ImageRenderer(
new RendererStyle(200), new RendererStyle(200),
new SvgImageBackEnd() new SvgImageBackEnd()
@ -49,7 +52,6 @@ class EpcQrGenerator
$this->validateFields(); $this->validateFields();
try {
$qr = $writer->writeString($this->encodeMessage(), 'utf-8'); $qr = $writer->writeString($this->encodeMessage(), 'utf-8');
} catch(\Throwable $e) { } catch(\Throwable $e) {
return ''; return '';

4
config/ninja.php
View File

@ -15,8 +15,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.7.26'), 'app_version' => env('APP_VERSION','5.7.27'),
'app_tag' => env('APP_TAG','5.7.26'), 'app_tag' => env('APP_TAG','5.7.27'),
'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', ''), 'api_secret' => env('API_SECRET', ''),

1
lang/en/texts.php
View File

@ -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;

18
tests/Feature/Export/ReportCsvGenerationTest.php
View File

@ -322,8 +322,8 @@ class ReportCsvGenerationTest extends TestCase
$data = $export->returnJson(); $data = $export->returnJson();
$this->assertNotNull($data); $this->assertNotNull($data);
// nlog($data);
$this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier')); // $this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier'));
$this->assertEquals('Vendor Name', $this->traverseJson($data, 'columns.9.display_value')); $this->assertEquals('Vendor Name', $this->traverseJson($data, 'columns.9.display_value'));
$this->assertEquals('vendor', $this->traverseJson($data, '0.0.entity')); $this->assertEquals('vendor', $this->traverseJson($data, '0.0.entity'));
$this->assertEquals('address1', $this->traverseJson($data, '0.0.id')); $this->assertEquals('address1', $this->traverseJson($data, '0.0.id'));
@ -380,7 +380,7 @@ class ReportCsvGenerationTest extends TestCase
$this->assertNotNull($data); $this->assertNotNull($data);
$this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier')); // $this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier'));
$this->assertEquals('Vendor Name', $this->traverseJson($data, 'columns.0.display_value')); $this->assertEquals('Vendor Name', $this->traverseJson($data, 'columns.0.display_value'));
$this->assertEquals('vendor', $this->traverseJson($data, '0.0.entity')); $this->assertEquals('vendor', $this->traverseJson($data, '0.0.entity'));
$this->assertEquals('name', $this->traverseJson($data, '0.0.id')); $this->assertEquals('name', $this->traverseJson($data, '0.0.id'));
@ -470,7 +470,7 @@ class ReportCsvGenerationTest extends TestCase
$this->assertNotNull($data); $this->assertNotNull($data);
$this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier')); // $this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier'));
$this->assertEquals('Client Name', $this->traverseJson($data, 'columns.0.display_value')); $this->assertEquals('Client Name', $this->traverseJson($data, 'columns.0.display_value'));
$this->assertEquals('client', $this->traverseJson($data, '0.0.entity')); $this->assertEquals('client', $this->traverseJson($data, '0.0.entity'));
$this->assertEquals('name', $this->traverseJson($data, '0.0.id')); $this->assertEquals('name', $this->traverseJson($data, '0.0.id'));
@ -597,7 +597,7 @@ class ReportCsvGenerationTest extends TestCase
$this->assertNotNull($data); $this->assertNotNull($data);
$this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier')); // $this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier'));
$this->assertEquals('Custom Value 1', $this->traverseJson($data, 'columns.0.display_value')); $this->assertEquals('Custom Value 1', $this->traverseJson($data, 'columns.0.display_value'));
$this->assertEquals('custom_value1', $this->traverseJson($data, '0.0.entity')); $this->assertEquals('custom_value1', $this->traverseJson($data, '0.0.entity'));
$this->assertEquals('custom_value1', $this->traverseJson($data, '0.0.id')); $this->assertEquals('custom_value1', $this->traverseJson($data, '0.0.id'));
@ -668,13 +668,13 @@ class ReportCsvGenerationTest extends TestCase
$this->assertNotNull($data); $this->assertNotNull($data);
$this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier')); // $this->assertEquals(0, $this->traverseJson($data, 'columns.0.identifier'));
$this->assertEquals('Payment Date', $this->traverseJson($data, 'columns.0.display_value')); $this->assertEquals('Payment Date', $this->traverseJson($data, 'columns.0.display_value'));
$this->assertEquals(1, $this->traverseJson($data, 'columns.1.identifier')); // $this->assertEquals(1, $this->traverseJson($data, 'columns.1.identifier'));
$this->assertEquals('Payment Amount', $this->traverseJson($data, 'columns.1.display_value')); $this->assertEquals('Payment Amount', $this->traverseJson($data, 'columns.1.display_value'));
$this->assertEquals(2, $this->traverseJson($data, 'columns.2.identifier')); // $this->assertEquals(2, $this->traverseJson($data, 'columns.2.identifier'));
$this->assertEquals('Invoice Invoice Number', $this->traverseJson($data, 'columns.2.display_value')); $this->assertEquals('Invoice Invoice Number', $this->traverseJson($data, 'columns.2.display_value'));
$this->assertEquals(4, $this->traverseJson($data, 'columns.4.identifier')); // $this->assertEquals(4, $this->traverseJson($data, 'columns.4.identifier'));
$this->assertEquals('Client Name', $this->traverseJson($data, 'columns.4.display_value')); $this->assertEquals('Client Name', $this->traverseJson($data, 'columns.4.display_value'));