added option priceWithTax to order

contributte · Aug 24, 2017 · a356e7d · a356e7d
1 parent b9878d3
commit a356e7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Data/Order.php b/src/Data/Order.php
@@ -26,24 +26,36 @@ class Order {
 	/** @var Item[] */
 	private $items = [];
 
+	/** @var bool */
+	private $hasPriceWithTax = FALSE;
+
 	/**
 	 * @param string|int $number
 	 * @param \DateTime $dueDate
 	 * @param Account $account
 	 * @param PaymentInformation $payment
 	 * @param \DateTime|NULL $created
+	 * @param bool $hasPriceWithTax
 	 */
 	public function __construct($number, ?\DateTime $dueDate, ?Account $account, PaymentInformation $payment,
-								\DateTime $created = NULL) {
+								\DateTime $created = NULL, bool $hasPriceWithTax = FALSE) {
 		$this->number = $number;
 		$this->dueDate = $dueDate;
 		$this->account = $account;
 		$this->payment = $payment;
 		$this->created = $created ? : new \DateTime();
+		$this->hasPriceWithTax = $hasPriceWithTax;
 
 		$this->validate();
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function hasPriceWithTax(): bool {
+		return $this->hasPriceWithTax;
+	}
+
 	/**
 	 * @param string $name
 	 * @param int|float $price

diff --git a/src/Invoice.php b/src/Invoice.php
@@ -453,7 +453,7 @@ protected function totalPrice($plus) {
 	 */
 	private function getTotalPrice($useTax = FALSE) {
 		$total = 0;
-		if ($useTax && $this->company->hasTax() && $this->order->getPayment()->getTax() !== NULL) {
+		if ($useTax && $this->company->hasTax() && $this->order->getPayment()->getTax() !== NULL && !$this->order->hasPriceWithTax()) {
 			$tax = $this->order->getPayment()->getTax() + 1;
 		} else {
 			$tax = 1;