mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 21:22:58 +01:00
Merge pull request #8860 from beganovich/fixes-for-report-previews
Return correct identifier for reports
This commit is contained in:
commit
01cebfc448
@ -54,7 +54,7 @@ class ActivityExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ class ClientExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -89,7 +89,7 @@ class ContactExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -44,7 +44,7 @@ class CreditExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -50,7 +50,7 @@ class DocumentExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -44,7 +44,7 @@ class ExpenseExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -73,7 +73,7 @@ class InvoiceExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -81,7 +81,7 @@ class InvoiceItemExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ class PaymentExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -42,7 +42,7 @@ class ProductExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -114,7 +114,7 @@ class PurchaseOrderExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -73,7 +73,7 @@ class PurchaseOrderItemExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$query->cursor()
|
$query->cursor()
|
||||||
|
@ -75,7 +75,7 @@ class QuoteExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -75,7 +75,7 @@ class QuoteItemExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$query->cursor()
|
$query->cursor()
|
||||||
|
@ -87,7 +87,7 @@ class RecurringInvoiceExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
@ -100,7 +100,7 @@ class TaskExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$query->cursor()
|
$query->cursor()
|
||||||
|
@ -74,7 +74,7 @@ class VendorExport extends BaseExport
|
|||||||
$headerdisplay = $this->buildHeader();
|
$headerdisplay = $this->buildHeader();
|
||||||
|
|
||||||
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
$header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
|
||||||
return ['identifier' => $value, 'display_value' => $headerdisplay[$value]];
|
return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
|
||||||
})->toArray();
|
})->toArray();
|
||||||
|
|
||||||
$report = $query->cursor()
|
$report = $query->cursor()
|
||||||
|
Loading…
Reference in New Issue
Block a user