waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed tax summary report tax name issue

This commit is contained in:
Cihan Şentürk 2025-07-17 22:15:52 +03:00 committed by GitHub
parent dfb165f379
commit ffe2442d18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Reports/TaxSummary.php
View File

@ -10,6 +10,7 @@ use App\Models\Setting\Tax;
use App\Traits\Currencies;
use App\Utilities\Recurring;
use App\Utilities\Date;
use Illuminate\Support\Str;
class TaxSummary extends Report
{
@ -109,11 +110,19 @@ class TaxSummary extends Report
continue;
}
$item_total_name = $item_total->name;
if (
!isset($this->row_values[$item_total->name][$type][$date])
|| !isset($this->footer_totals[$item_total->name][$date])
!isset($this->row_values[$item_total_name][$type][$date])
|| !isset($this->footer_totals[$item_total_name][$date])
) {
continue;
$item_total_name = Str::lcfirst($item_total_name); // #Clickup@86c3nzq4r
if (!isset($this->row_values[$item_total_name][$type][$date])
|| !isset($this->footer_totals[$item_total_name][$date])
) {
continue;
}
}
if ($date_field == 'paid_at') {
@ -126,13 +135,13 @@ class TaxSummary extends Report
$amount = $this->convertToDefault($item_amount, $item->currency_code, $item->currency_rate);
if ($type == 'income') {
$this->row_values[$item_total->name][$type][$date] += $amount;
$this->row_values[$item_total_name][$type][$date] += $amount;
$this->footer_totals[$item_total->name][$date] += $amount;
$this->footer_totals[$item_total_name][$date] += $amount;
} else {
$this->row_values[$item_total->name][$type][$date] -= $amount;
$this->row_values[$item_total_name][$type][$date] -= $amount;
$this->footer_totals[$item_total->name][$date] -= $amount;
$this->footer_totals[$item_total_name][$date] -= $amount;
}
}
}