Better information in dashboard tiles and prevent division by zero in Excel calculations.
This commit is contained in:
@@ -93,15 +93,17 @@ class ExcelController extends Controller
|
||||
|
||||
$row = 2;
|
||||
foreach ($invoices as $invoice) {
|
||||
foreach ($invoice->items as $item) {
|
||||
if (!isset($net[$item->tax])) {
|
||||
$net[$item->tax] = 0;
|
||||
$tax[$item->tax] = 0;
|
||||
$gross[$item->tax] = 0;
|
||||
if ($invoice->sum != 0) {
|
||||
foreach ($invoice->items as $item) {
|
||||
if (!isset($net[$item->tax])) {
|
||||
$net[$item->tax] = 0;
|
||||
$tax[$item->tax] = 0;
|
||||
$gross[$item->tax] = 0;
|
||||
}
|
||||
$net[$item->tax] += $item->amount * $item->price;
|
||||
$tax[$item->tax] += $item->amount * $item->price * $item->tax / 100;
|
||||
$gross[$item->tax] += $item->total;
|
||||
}
|
||||
$net[$item->tax] += $item->amount * $item->price;
|
||||
$tax[$item->tax] += $item->amount * $item->price * $item->tax / 100;
|
||||
$gross[$item->tax] += $item->total;
|
||||
}
|
||||
$worksheet->setCellValue('A' . $row, $invoice->number);
|
||||
$worksheet->setCellValue('B' . $row, $invoice->customer->name);
|
||||
@@ -114,6 +116,7 @@ class ExcelController extends Controller
|
||||
$worksheet->setCellValue('F' . $row, $invoice->sum);
|
||||
$worksheet->setCellValue('G' . $row, Date::PHPToExcel(\DateTime::createFromFormat('!d.m.Y', $invoice->created)));
|
||||
$worksheet->getCell('G' . $row)->getStyle()->getNumberFormat()->setFormatCode('dd.mm.yyyy');
|
||||
|
||||
$row++;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user