Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 02:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Work on aggregating taxes

Browse Source
This commit is contained in:
David Bomba 2019-04-05 08:33:12 +11:00
parent 336bd26bb9
commit 19350f345d
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Helpers/Invoice/InvoiceItemCalc.php
View File

@ -18,11 +18,14 @@ class InvoiceItemCalc
protected $total_taxes; protected $total_taxes;
protected $tax_collection;
public function __construct(\stdClass $item, int $precision = 2, bool $inclusive_tax) public function __construct(\stdClass $item, int $precision = 2, bool $inclusive_tax)
{ {
$this->item = $item; $this->item = $item;
$this->precision = $precision; $this->precision = $precision;
$this->inclusive_tax = $inclusive_tax; $this->inclusive_tax = $inclusive_tax;
$this->tax_collection = collect();
} }
public function process() public function process()
@ -30,6 +33,7 @@ class InvoiceItemCalc
$this->setLineTotal($this->formatValue($this->item->cost, $this->precision) * $this->formatValue($this->item->qty, $this->precision)); $this->setLineTotal($this->formatValue($this->item->cost, $this->precision) * $this->formatValue($this->item->qty, $this->precision));
$this->setDiscount(); $this->setDiscount();
$this->calcTaxes(); $this->calcTaxes();
$this->groupTaxes();
} }
private function setDiscount() private function setDiscount()
@ -53,9 +57,13 @@ class InvoiceItemCalc
if($tax_rate1 != 0) if($tax_rate1 != 0)
{ {
if($this->inclusive_tax) if($this->inclusive_tax)
$item_tax += $this->formatValue(($this->getLineTotal() - ($this->getLineTotal() / (1+$tax_rate1/100))) , $this->precision); $item_tax_rate1_total = $this->formatValue(($this->getLineTotal() - ($this->getLineTotal() / (1+$tax_rate1/100))) , $this->precision);
else else
$item_tax += $this->formatValue(($this->getLineTotal() * $tax_rate1/100), $this->precision); $item_tax_rate1_total += $this->formatValue(($this->getLineTotal() * $tax_rate1/100), $this->precision);
$item_tax += $item_tax_rate1_total;
$this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total);
} }
$tax_rate2 = $this->formatValue($this->item->tax_rate2, $this->precision); $tax_rate2 = $this->formatValue($this->item->tax_rate2, $this->precision);
@ -72,6 +80,25 @@ class InvoiceItemCalc
$this->setTotalTaxes($item_tax); $this->setTotalTaxes($item_tax);
} }
private function groupTax($tax_name, $tax_rate, $tax_total) : array
{
$group_tax = [];
$key = str_replace(" ", "", $tax_name.$tax_rate);
$group_tax[$key] = $tax_total
return $group_tax;
}
private function groupTaxes($group_tax)
{
$this->tax_collection->merge(collect($group_tax));
return $this;
}
public function getLineTotal() public function getLineTotal()
{ {
return $this->item->line_total; return $this->item->line_total;

2
database/factories/InvoiceFactory.php
View File

@ -5,7 +5,7 @@ use Faker\Generator as Faker;
$factory->define(App\Models\Invoice::class, function (Faker $faker) { $factory->define(App\Models\Invoice::class, function (Faker $faker) {
return [ return [
'invoice_status_id' => App\Models\Invoice::STATUS_PAID, 'invoice_status_id' => App\Models\Invoice::STATUS_PAID,
'invoice_number' => $faker->text(20), 'invoice_number' => $faker->text(256),
'discount' => $faker->numberBetween(1,10), 'discount' => $faker->numberBetween(1,10),
'is_amount_discount' => $faker->boolean(), 'is_amount_discount' => $faker->boolean(),
'tax_name1' => 'GST', 'tax_name1' => 'GST',