diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 4ea21e68..bcf16f68 100755 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -2,6 +2,8 @@ + {% block title %}Fiche de compte dynamique{% endblock %} {% block stylesheets %} @@ -35,7 +37,7 @@ _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function () { - var u = "//piwik.cipherbliss.com/"; + var u = "https://piwik.cipherbliss.com/"; _paq.push(['setTrackerUrl', u + 'piwik.php']); _paq.push(['setSiteId', '1']); var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0]; diff --git a/app/Resources/views/default/main-screen.html.twig b/app/Resources/views/default/main-screen.html.twig index e343617e..99d40c0b 100755 --- a/app/Resources/views/default/main-screen.html.twig +++ b/app/Resources/views/default/main-screen.html.twig @@ -55,7 +55,6 @@ avatar Mastodon @tykayn@mamot.fr - diff --git a/src/AppBundle/Entity/Festival.php~ b/src/AppBundle/Entity/Festival.php~ index bfc0ab63..e2c7207a 100755 --- a/src/AppBundle/Entity/Festival.php~ +++ b/src/AppBundle/Entity/Festival.php~ @@ -286,4 +286,92 @@ class Festival { public function getChiffreAffaire() { return $this->chiffreAffaire; } + + /** + * Set fraisInscription. + * + * @param string|null $fraisInscription + * + * @return Festival + */ + public function setFraisInscription( $fraisInscription = null ) { + $this->fraisInscription = $fraisInscription; + + return $this; + } + + /** + * Get fraisInscription. + * + * @return string|null + */ + public function getFraisInscription() { + return $this->fraisInscription; + } + + /** + * Set fraisHebergement. + * + * @param string|null $fraisHebergement + * + * @return Festival + */ + public function setFraisHebergement( $fraisHebergement = null ) { + $this->fraisHebergement = $fraisHebergement; + + return $this; + } + + /** + * Get fraisHebergement. + * + * @return string|null + */ + public function getFraisHebergement() { + return $this->fraisHebergement; + } + + /** + * Set fraisTransport. + * + * @param string|null $fraisTransport + * + * @return Festival + */ + public function setFraisTransport( $fraisTransport = null ) { + $this->fraisTransport = $fraisTransport; + + return $this; + } + + /** + * Get fraisTransport. + * + * @return string|null + */ + public function getFraisTransport() { + return $this->fraisTransport; + } + + /** + * Set fraisRepas. + * + * @param string|null $fraisRepas + * + * @return Festival + */ + public function setFraisRepas( $fraisRepas = null ) { + $this->fraisRepas = $fraisRepas; + + return $this; + } + + /** + * Get fraisRepas. + * + * @return string|null + */ + public function getFraisRepas() { + return $this->fraisRepas; + } } diff --git a/src/AppBundle/Entity/Product.php b/src/AppBundle/Entity/Product.php index 294affec..bdfba8c0 100644 --- a/src/AppBundle/Entity/Product.php +++ b/src/AppBundle/Entity/Product.php @@ -42,6 +42,10 @@ class Product { * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="products") */ private $user; + /** + * @ORM\OneToMany(targetEntity="AppBundle\Entity\ProductSold", mappedBy="product") + */ + private $productsSold; use Sellable; use Commentable; @@ -165,4 +169,44 @@ class Product { public function getStockCount() { return $this->stockCount; } + + /** + * Constructor + */ + public function __construct() { + $this->productsSold = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * Add productsSold. + * + * @param \AppBundle\Entity\User $productsSold + * + * @return Product + */ + public function addProductsSold( \AppBundle\Entity\User $productsSold ) { + $this->productsSold[] = $productsSold; + + return $this; + } + + /** + * Remove productsSold. + * + * @param \AppBundle\Entity\User $productsSold + * + * @return boolean TRUE if this collection contained the specified element, FALSE otherwise. + */ + public function removeProductsSold( \AppBundle\Entity\User $productsSold ) { + return $this->productsSold->removeElement( $productsSold ); + } + + /** + * Get productsSold. + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getProductsSold() { + return $this->productsSold; + } } diff --git a/src/AppBundle/Entity/Product.php~ b/src/AppBundle/Entity/Product.php~ index 294affec..bf1570e9 100755 --- a/src/AppBundle/Entity/Product.php~ +++ b/src/AppBundle/Entity/Product.php~ @@ -42,6 +42,10 @@ class Product { * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="products") */ private $user; + /** + * @ORM\OneToMany(targetEntity="AppBundle\Entity\User", mappedBy="product") + */ + private $productsSold; use Sellable; use Commentable; diff --git a/src/Entity/User/User.php b/src/Entity/User/User.php deleted file mode 100755 index 06152758..00000000 --- a/src/Entity/User/User.php +++ /dev/null @@ -1,24 +0,0 @@ -id = $id; - } - - public function getId(): UserIdInterface - { - return $this->id; - } -}