diff --git a/app/Resources/views/default/login-choices.html.twig b/app/Resources/views/default/login-choices.html.twig index 31969c21..b0689a60 100755 --- a/app/Resources/views/default/login-choices.html.twig +++ b/app/Resources/views/default/login-choices.html.twig @@ -9,42 +9,80 @@ diff --git a/app/Resources/views/logged/import.html.twig b/app/Resources/views/logged/import.html.twig new file mode 100644 index 00000000..72494cfd --- /dev/null +++ b/app/Resources/views/logged/import.html.twig @@ -0,0 +1,64 @@ +{% extends 'base.html.twig' %} +{% trans_default_domain 'FOSUserBundle' %} +{% block body %} +

Importation, création en masse

+
+ + Fonctionnalité en cours de création +
+ +
+
+

+ Création de produits en masse +

+ +
+ +
+ Vous pouvez copier et adapter cet exemple: + 
+    catégorie: livre
+        mon livre 1;5€
+        mon livre 2;6€
+        mon livre 2;7€
+    catégorie: poster
+        super bannière A2;10€
+    catégorie: dessin à la demande
+        dessin;20€
+
+
+ + +
+
+
+

+ + Importer votre historique de ventes +

+ 1) + + + Télécharger le fichier de modèle + +
+ 2) Remplir votre modèle avec vos ventes +
+ 3) +
+
+ + Importer votre modèle rempli + + +
+
+
+
+ +{% endblock %} diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php index 88f5a2cb..9cd3b5b2 100755 --- a/src/AppBundle/Controller/DefaultController.php +++ b/src/AppBundle/Controller/DefaultController.php @@ -363,4 +363,34 @@ class DefaultController extends Controller { // replace this example code with whatever you need return $this->redirectToRoute( 'dashboard' ); } + + /** + * @Route("/import", name="import") + */ + public function importAction() { + $currentUser = $this->getUser(); + $m = $this->getDoctrine()->getManager(); + $sellingRepo = $m->getRepository( 'AppBundle:SellRecord' ); + $mySellings = $sellingRepo->findByUser( $currentUser->getId() ); + + return $this->render( 'logged/import.html.twig', + [ + 'base_dir' => '', + ] ); + } + /** + * @Route("/mass-create", name="mass_create") + */ + public function massCreateAction() { + $currentUser = $this->getUser(); + $m = $this->getDoctrine()->getManager(); + $sellingRepo = $m->getRepository( 'AppBundle:SellRecord' ); + $mySellings = $sellingRepo->findByUser( $currentUser->getId() ); + + return $this->render( 'logged/import.html.twig', + [ + 'base_dir' => '', + ] ); + } + } diff --git a/src/AppBundle/Entity/Product.php~ b/src/AppBundle/Entity/Product.php~ index 18ddcc4a..82baf74b 100755 --- a/src/AppBundle/Entity/Product.php~ +++ b/src/AppBundle/Entity/Product.php~ @@ -24,7 +24,7 @@ class Product { /** - * @ORM\Column(type="string", length=256) + * @ORM\Column(type="string", length=256, nullable=true) */ private $image; diff --git a/src/AppBundle/Entity/SellRecord.php b/src/AppBundle/Entity/SellRecord.php index ecbb9800..6ebfa0d6 100644 --- a/src/AppBundle/Entity/SellRecord.php +++ b/src/AppBundle/Entity/SellRecord.php @@ -17,6 +17,11 @@ class SellRecord { * @ORM\GeneratedValue(strategy="AUTO") */ private $id; + /** + * gender of the client + * @ORM\Column( type = "string", nullable=true ) + */ + private $gender; /** * liste des produits de la vente * @ORM\OneToMany(targetEntity="AppBundle\Entity\ProductSold", mappedBy="sellRecords") @@ -215,4 +220,28 @@ class SellRecord { public function getUser() { return $this->user; } + + /** + * Set gender. + * + * @param string|null $gender + * + * @return SellRecord + */ + public function setGender($gender = null) + { + $this->gender = $gender; + + return $this; + } + + /** + * Get gender. + * + * @return string|null + */ + public function getGender() + { + return $this->gender; + } } diff --git a/src/AppBundle/Entity/SellRecord.php~ b/src/AppBundle/Entity/SellRecord.php~ index ecbb9800..97174107 100755 --- a/src/AppBundle/Entity/SellRecord.php~ +++ b/src/AppBundle/Entity/SellRecord.php~ @@ -17,6 +17,11 @@ class SellRecord { * @ORM\GeneratedValue(strategy="AUTO") */ private $id; + /** + * gender of the client + * @ORM\Column( type = "string", nullable=true ) + */ + private $gender; /** * liste des produits de la vente * @ORM\OneToMany(targetEntity="AppBundle\Entity\ProductSold", mappedBy="sellRecords") diff --git a/src/AppBundle/Entity/User.php~ b/src/AppBundle/Entity/User.php~ index 2050f819..9eef808f 100755 --- a/src/AppBundle/Entity/User.php~ +++ b/src/AppBundle/Entity/User.php~ @@ -283,4 +283,26 @@ class User extends BaseUser { public function getFestivals() { return $this->festivals; } + + /** + * Set activeFestival. + * + * @param \AppBundle\Entity\Festival|null $activeFestival + * + * @return User + */ + public function setActiveFestival( \AppBundle\Entity\Festival $activeFestival = null ) { + $this->activeFestival = $activeFestival; + + return $this; + } + + /** + * Get activeFestival. + * + * @return \AppBundle\Entity\Festival|null + */ + public function getActiveFestival() { + return $this->activeFestival; + } } diff --git a/web/.~lock.modele_import_caisse.csv# b/web/.~lock.modele_import_caisse.csv# new file mode 100644 index 00000000..93d63671 --- /dev/null +++ b/web/.~lock.modele_import_caisse.csv# @@ -0,0 +1 @@ +,tykayn,ubuntu-P775DM3-G,19.04.2018 11:02,file:///home/tykayn/.config/libreoffice/4; \ No newline at end of file diff --git a/web/modele_import_caisse.csv b/web/modele_import_caisse.csv new file mode 100644 index 00000000..e69de29b