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

added arithmetic total calculation

Browse Source
This commit is contained in:
Denis Duliçi 2021-07-16 11:26:17 +03:00
parent 2c0e96f351
commit e83b67971c
1 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/Abstracts/Report.php
View File

@ -324,17 +324,23 @@ abstract class Report
public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true) public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true)
{ {
$group_field = $this->getSetting('group') . '_id';
foreach ($items as $item) { foreach ($items as $item) {
// Make groups extensible // Make groups extensible
$item = $this->applyGroups($item); $item = $this->applyGroups($item);
$date = $this->getFormattedDate(Date::parse($item->$date_field)); $date = $this->getFormattedDate(Date::parse($item->$date_field));
$id_field = $this->getSetting('group') . '_id'; if (!isset($item->$group_field)) {
continue;
}
$group = $item->$group_field;
if ( if (
!isset($this->row_values[$table][$item->$id_field]) !isset($this->row_values[$table][$group])
|| !isset($this->row_values[$table][$item->$id_field][$date]) || !isset($this->row_values[$table][$group][$date])
|| !isset($this->footer_totals[$table][$date]) || !isset($this->footer_totals[$table][$date])
) { ) {
continue; continue;
@ -345,17 +351,80 @@ abstract class Report
$type = ($item->type === Document::INVOICE_TYPE || $item->type === 'income') ? 'income' : 'expense'; $type = ($item->type === Document::INVOICE_TYPE || $item->type === 'income') ? 'income' : 'expense';
if (($check_type == false) || ($type == 'income')) { if (($check_type == false) || ($type == 'income')) {
$this->row_values[$table][$item->$id_field][$date] += $amount; $this->row_values[$table][$group][$date] += $amount;
$this->footer_totals[$table][$date] += $amount; $this->footer_totals[$table][$date] += $amount;
} else { } else {
$this->row_values[$table][$item->$id_field][$date] -= $amount; $this->row_values[$table][$group][$date] -= $amount;
$this->footer_totals[$table][$date] -= $amount; $this->footer_totals[$table][$date] -= $amount;
} }
} }
} }
public function setArithmeticTotals($items, $date_field, $operator = 'add', $table = 'default', $amount_field = 'amount')
{
$group_field = $this->getSetting('group') . '_id';
$function = $operator . 'ArithmeticAmount';
foreach ($items as $item) {
// Make groups extensible
$item = $this->applyGroups($item);
$date = $this->getFormattedDate(Date::parse($item->$date_field));
if (!isset($item->$group_field)) {
continue;
}
$group = $item->$group_field;
if (
!isset($this->row_values[$table][$group])
|| !isset($this->row_values[$table][$group][$date])
|| !isset($this->footer_totals[$table][$date])
) {
continue;
}
$amount = isset($item->$amount_field) ? $item->$amount_field : 1;
$this->$function($this->row_values[$table][$group][$date], $amount);
$this->$function($this->footer_totals[$table][$date], $amount);
}
}
public function addArithmeticAmount(&$current, $amount)
{
$current = $current + $amount;
}
public function subArithmeticAmount(&$current, $amount)
{
$current = $current - $amount;
}
public function mulArithmeticAmount(&$current, $amount)
{
$current = $current * $amount;
}
public function divArithmeticAmount(&$current, $amount)
{
$current = $current / $amount;
}
public function modArithmeticAmount(&$current, $amount)
{
$current = $current % $amount;
}
public function expArithmeticAmount(&$current, $amount)
{
$current = $current ** $amount;
}
public function applyFilters($model, $args = []) public function applyFilters($model, $args = [])
{ {
event(new FilterApplying($this, $model, $args)); event(new FilterApplying($this, $model, $args));