Skip to content

Feature/ihb 718 tax rate and tax amount #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkobierzynski-convert merged 3 commits into from
Dec 7, 2021
Merged

Feature/ihb 718 tax rate and tax amount #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08be0ec
IHB-718 taxRate and taxAmount values fixed
mkobierzynski-convert Jul 19, 2021
3ebab03
[IHB-718] fix for shipping tax amount
mkobierzynski-convert Nov 17, 2021
fbb212d
[IHB-718] invalid body fix while wrong discounts taxAmount sent to dibs
mkobierzynski-convert Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Model/Dibs/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ public function addItems($items)
->setName($itemName)
->setUnit("st")
->setQuantity(round($qty, 0))
->setTaxRate($this->addZeroes($vat)) // the tax rate i.e 25% (2500)
->setTaxAmount($this->addZeroes($this->getTotalTaxAmount($unitPrice * $qty, $vat, false))) // total tax amount
->setTaxRate($vat)
->setTaxAmount($this->getTotalTaxAmount($unitPrice * $qty, $vat, false)) // total tax amount
->setUnitPrice((int) $unitPriceExclTax) // excl. tax price per item
->setNetTotalAmount((int) ($unitPriceExclTax * $qty)) // excl. tax
->setGrossTotalAmount((int) ($unitPrice * $qty)); // incl. tax
Expand Down Expand Up @@ -329,7 +329,7 @@ public function addShipping($address)
->setName((string)__('Shipping Fee (%1)', $address->getShippingDescription()))
->setUnit("st") // TODO! We need to map these somehow!
->setQuantity(1)
->setTaxRate($this->addZeroes($vat)) // the tax rate i.e 25% (2500)
->setTaxRate($vat)
->setTaxAmount($this->addZeroes($taxAmount)) // total tax amount
->setUnitPrice($this->addZeroes($exclTax)) // excl. tax price per item
->setNetTotalAmount($this->addZeroes($exclTax)) // excl. tax
Expand Down Expand Up @@ -428,13 +428,13 @@ public function generateInvoiceFeeItem($invoiceLabel, $invoiceFee, $vatIncluded)
$feeItem
->setName($invoiceLabel)
->setReference(strtolower(str_replace(" ", "_", $invoiceLabel)))
->setTaxRate($this->addZeroes($taxRate))
->setTaxRate($taxRate)
->setGrossTotalAmount($this->addZeroes($invoiceFeeInclTax)) // incl tax
->setNetTotalAmount($this->addZeroes($invoiceFeeExclTax)) // // excl. tax
->setUnit("st")
->setQuantity(1)
->setUnitPrice($this->addZeroes($invoiceFeeExclTax)) // // excl. tax
->setTaxAmount($this->addZeroes($taxAmount)); // tax amount
->setTaxAmount($taxAmount); // tax amount

return $feeItem;
}
Expand Down Expand Up @@ -466,7 +466,7 @@ public function addDiscounts($couponCode)
->setName($couponCode ? (string)__('Discount (%1)', $couponCode) : (string)__('Discount'))
->setUnit("st")
->setQuantity(1)
->setTaxRate($this->addZeroes($vat)) // the tax rate i.e 25% (2500)
->setTaxRate($vat)
->setTaxAmount($taxAmount) // total tax amount
->setUnitPrice(0) // excl. tax price per item
->setNetTotalAmount(-$amountExclTax) // excl. tax
Expand Down