Commit 9ca7b0c9 authored by notebook's avatar notebook
Browse files

Merge origin/master into skuska

Conflicts:
	composer.lock
	config/packages/security.yaml
	src/Controller/Admin/DashboardController.php
	symfony.lock
parent fa94acb4
......@@ -44,13 +44,15 @@ class OrderItem
private $sum_total;
/**
* @ORM\ManyToOne(targetEntity=Orders::class, inversedBy="orderItems")
* @ORM\ManyToOne(targetEntity=Orders::class, inversedBy="orderItems", cascade={"persist"} )
*/
private $orders;
public function getId(): ?int
......@@ -121,9 +123,7 @@ class OrderItem
return $this;
}
public function getOrders(): ?Orders
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment