shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #389

Browse Source
This commit is contained in:
denisdulici 2018-06-21 16:22:37 +03:00
parent da5035ec64
commit 89158e83bd
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Expenses/Bills.php
View File

@ -539,11 +539,21 @@ class Bills extends Controller
$tables = ['items', 'histories', 'payments', 'totals']; $tables = ['items', 'histories', 'payments', 'totals'];
foreach ($tables as $table) { foreach ($tables as $table) {
$excel->sheet('bill_' . $table, function($sheet) use ($bills, $table) { $excel->sheet('bill_' . $table, function($sheet) use ($bills, $table) {
$bills->each(function ($bill) use ($sheet, $table) { $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at'];
$sheet->fromModel($bill->$table->makeHidden([
'id', 'company_id', 'created_at', 'updated_at', 'deleted_at' $i = 1;
])); foreach ($bills as $bill) {
}); $model = $bill->$table->makeHidden($hidden_fields);
if ($i == 1) {
$sheet->fromModel($model, null, 'A1', false);
} else {
// Don't put multiple heading columns
$sheet->fromModel($model, null, 'A1', false, false);
}
$i++;
}
}); });
} }
})->download('xlsx'); })->download('xlsx');

20
app/Http/Controllers/Incomes/Invoices.php
View File

@ -560,11 +560,21 @@ class Invoices extends Controller
$tables = ['items', 'histories', 'payments', 'totals']; $tables = ['items', 'histories', 'payments', 'totals'];
foreach ($tables as $table) { foreach ($tables as $table) {
$excel->sheet('invoice_' . $table, function($sheet) use ($invoices, $table) { $excel->sheet('invoice_' . $table, function($sheet) use ($invoices, $table) {
$invoices->each(function ($bill) use ($sheet, $table) { $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at'];
$sheet->fromModel($bill->$table->makeHidden([
'id', 'company_id', 'created_at', 'updated_at', 'deleted_at' $i = 1;
])); foreach ($invoices as $invoice) {
}); $model = $invoice->$table->makeHidden($hidden_fields);
if ($i == 1) {
$sheet->fromModel($model, null, 'A1', false);
} else {
// Don't put multiple heading columns
$sheet->fromModel($model, null, 'A1', false, false);
}
$i++;
}
}); });
} }
})->download('xlsx'); })->download('xlsx');