rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7beeef104c - Show all commits

2
src/Entity/Role.php
View file

@ -10,7 +10,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
/** /**
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="user_role") * @ORM\Table(name="role")
* @UniqueEntity("id") * @UniqueEntity("id")
* @UniqueEntity("name") * @UniqueEntity("name")
*/ */

4
src/Entity/User.php
View file

@ -12,7 +12,7 @@ use Serializable;
/** /**
* @ORM\Entity * @ORM\Entity
* @ORM\Table(name="user_user") * @ORM\Table(name="user")
* @UniqueEntity("username") * @UniqueEntity("username")
* @UniqueEntity("email") * @UniqueEntity("email")
*/ */
@ -39,7 +39,7 @@ class User extends BaseUser implements Serializable
/** /**
* @ORM\ManyToMany(targetEntity="Role", inversedBy="users") * @ORM\ManyToMany(targetEntity="Role", inversedBy="users")
* @ORM\JoinTable(name="user_user_role") * @ORM\JoinTable(name="user_role")
*/ */
protected $roles; protected $roles;