fixed bugs

contributte · Jul 27, 2017 · b9878d3 · b9878d3
1 parent 5861745
commit b9878d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/Data/Item.php b/src/Data/Item.php
@@ -23,7 +23,7 @@ class Item {
 	 * @param int|float $price
 	 * @throws InvoiceException
 	 */
-	public function __construct(string $name, $count, $price) {
+	public function __construct(string $name, $price, $count) {
 		$this->name = $name;
 		$this->count = $count;
 		$this->price = $price;

diff --git a/src/Data/Order.php b/src/Data/Order.php
@@ -33,7 +33,7 @@ class Order {
 	 * @param PaymentInformation $payment
 	 * @param \DateTime|NULL $created
 	 */
-	public function __construct($number, \DateTime $dueDate, Account $account, PaymentInformation $payment,
+	public function __construct($number, ?\DateTime $dueDate, ?Account $account, PaymentInformation $payment,
 								\DateTime $created = NULL) {
 		$this->number = $number;
 		$this->dueDate = $dueDate;
@@ -77,14 +77,14 @@ public function getNumber() {
 	/**
 	 * @return \DateTime
 	 */
-	public function getDueDate(): \DateTime {
+	public function getDueDate(): ?\DateTime {
 		return $this->dueDate;
 	}
 
 	/**
 	 * @return Account
 	 */
-	public function getAccount(): Account {
+	public function getAccount(): ?Account {
 		return $this->account;
 	}
 

diff --git a/src/Invoice.php b/src/Invoice.php
@@ -621,7 +621,7 @@ protected function itemsHeader() {
 	protected function paymentInformation() {
 		$multiplier = 0;
 
-		if ($this->order->getDueDate()) {
+		if ($this->order->getAccount() && $this->order->getDueDate()) {
 			$this->image->text('&#xe660;', 1445, 710 + ($multiplier * 55), function (Font $font) {
 				$font->color($this->template->getPrimaryColor());
 				$font->file($this->template->getIconFont());
@@ -640,7 +640,7 @@ protected function paymentInformation() {
 			$multiplier++;
 		}
 
-		if ($this->order->getAccount()->getAccountNumber()) {
+		if ($this->order->getAccount() && $this->order->getAccount()->getAccountNumber()) {
 			$this->image->text('&#xe645;', 1445, 710 + ($multiplier * 55), function (Font $font) {
 				$font->color($this->template->getPrimaryColor());
 				$font->file($this->template->getIconFont());
@@ -659,7 +659,7 @@ protected function paymentInformation() {
 			$multiplier++;
 		}
 
-		if ($this->order->getAccount()->getIBan()) {
+		if ($this->order->getAccount() && $this->order->getAccount()->getIBan()) {
 			$this->image->text('&#xe645;', 1445, 710 + ($multiplier * 55), function (Font $font) {
 				$font->color($this->template->getPrimaryColor());
 				$font->file($this->template->getIconFont());
@@ -678,7 +678,7 @@ protected function paymentInformation() {
 			$multiplier++;
 		}
 
-		if ($this->order->getAccount()->getSwift()) {
+		if ($this->order->getAccount() && $this->order->getAccount()->getSwift()) {
 			$this->image->text('&#xe645;', 1445, 710 + ($multiplier * 55), function (Font $font) {
 				$font->color($this->template->getPrimaryColor());
 				$font->file($this->template->getIconFont());

diff --git a/src/InvoiceFactory.php b/src/InvoiceFactory.php
@@ -60,7 +60,7 @@ public function createCustomer($name, $town, $address, $zip, $country, $tin = NU
 	 * @param \DateTime|NULL $created
 	 * @return Order
 	 */
-	public function createOrder($number, \DateTime $dueDate, Account $account, PaymentInformation $payment, \DateTime $created = NULL): Order {
+	public function createOrder($number, ?\DateTime $dueDate, ?Account $account, PaymentInformation $payment, \DateTime $created = NULL): Order {
 		return new Order($number, $dueDate, $account, $payment, $created);
 	}