Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 15:34:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2023-09-12 17:23:52 +10:00
parent dc4ccd57ca
commit 56744fc78c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Export/CSV/BaseExport.php
View File

@ -65,7 +65,7 @@ class BaseExport
'id_number' => 'vendor.id_number', 'id_number' => 'vendor.id_number',
'name' => 'vendor.name', 'name' => 'vendor.name',
'number' => 'vendor.number', 'number' => 'vendor.number',
'client_phone' => 'vendor.phone', 'phone' => 'vendor.phone',
'postal_code' => 'vendor.postal_code', 'postal_code' => 'vendor.postal_code',
'private_notes' => 'vendor.private_notes', 'private_notes' => 'vendor.private_notes',
'public_notes' => 'vendor.public_notes', 'public_notes' => 'vendor.public_notes',
@ -657,7 +657,7 @@ class BaseExport
// nlog("searching for {$column}"); // nlog("searching for {$column}");
$transformed_invoice = false; $transformed_invoice = false;
if($transformer instanceof PaymentTransformer && ($entity->invoice ?? false)) { if($transformer instanceof PaymentTransformer && ($entity->invoices ?? false)) {
$transformed_invoices = $transformer->includeInvoices($entity); $transformed_invoices = $transformer->includeInvoices($entity);
$manager = new Manager(); $manager = new Manager();

2
app/Export/CSV/VendorExport.php
View File

@ -119,7 +119,7 @@ class VendorExport extends BaseExport
if (is_array($parts) && $parts[0] == 'vendor' && array_key_exists($parts[1], $transformed_vendor)) { if (is_array($parts) && $parts[0] == 'vendor' && array_key_exists($parts[1], $transformed_vendor)) {
$entity[$key] = $transformed_vendor[$parts[1]]; $entity[$key] = $transformed_vendor[$parts[1]];
} elseif (is_array($parts) && $parts[0] == 'vendor_contact' && array_key_exists($parts[1], $transformed_contact)) { } elseif (is_array($parts) && $parts[0] == 'vendor_contact' && isset($transformed_contact[$parts[1]])) {
$entity[$key] = $transformed_contact[$parts[1]]; $entity[$key] = $transformed_contact[$parts[1]];
} else { } else {
$entity[$key] = $this->resolveKey($key, $vendor, $this->vendor_transformer); $entity[$key] = $this->resolveKey($key, $vendor, $this->vendor_transformer);

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

@ -293,7 +293,7 @@ class ReportCsvGenerationTest extends TestCase
])->post('/api/v1/reports/vendors', $data); ])->post('/api/v1/reports/vendors', $data);
$csv = $response->streamedContent(); $csv = $response->streamedContent();
nlog($csv);
$this->assertEquals('Vendor 1', $this->getFirstValueByColumn($csv, 'Vendor Name')); $this->assertEquals('Vendor 1', $this->getFirstValueByColumn($csv, 'Vendor Name'));
$this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Vendor Number')); $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Vendor Number'));
$this->assertEquals('city', $this->getFirstValueByColumn($csv, 'Vendor City')); $this->assertEquals('city', $this->getFirstValueByColumn($csv, 'Vendor City'));
@ -345,9 +345,9 @@ class ReportCsvGenerationTest extends TestCase
$csv = $response->streamedContent(); $csv = $response->streamedContent();
$this->assertEquals('Vendor 1', $this->getFirstValueByColumn($csv, 'Name')); $this->assertEquals('Vendor 1', $this->getFirstValueByColumn($csv, 'Vendor Name'));
$this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Number')); $this->assertEquals('1234', $this->getFirstValueByColumn($csv, 'Vendor Number'));
$this->assertEquals('city', $this->getFirstValueByColumn($csv, 'City')); $this->assertEquals('city', $this->getFirstValueByColumn($csv, 'Vendor City'));
} }