From 2f16a34aa45ece6eff174b9b3260cd75ba5fac83 Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Thu, 19 Apr 2018 15:53:29 +0200
Subject: [PATCH] fix formatting

---
 .../logged/angular/loaded-caisse.html.twig    | 13 +++--
 .../views/logged/angular/messages.html.twig   | 24 ++++++++-
 app/Resources/views/logged/history.html.twig  |  2 +-
 .../views/logged/mass-register.html.twig      | 18 ++++---
 .../Controller/DefaultController.php          | 53 ++++++++++---------
 5 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/app/Resources/views/logged/angular/loaded-caisse.html.twig b/app/Resources/views/logged/angular/loaded-caisse.html.twig
index 7a841baf..025821d1 100755
--- a/app/Resources/views/logged/angular/loaded-caisse.html.twig
+++ b/app/Resources/views/logged/angular/loaded-caisse.html.twig
@@ -1,10 +1,12 @@
 <!--ok loading done-->
 <div id="loaded" ng-if="initLoadDone">
-    {% include 'logged/angular/messages.html.twig' %}
+
 
     <!--caisse IHM-->
     <div id="load_ok">
+
         <div class="listing-products col-xs-7">
+            {% include 'logged/angular/messages.html.twig' %}
             {% include 'logged/angular/listing-products.html.twig' %}
 
 
@@ -13,15 +15,18 @@
             <div class="well">
 
                 {% include 'logged/angular/validate-button.html.twig' %}
-                {% include 'logged/angular/current.html.twig' %}
+                {% if app.user.products |length %}
+
+                    {% include 'logged/angular/current.html.twig' %}
+                {% endif %}
+
                 {#{% include 'logged/angular/paused.html.twig' %}#}
             </div>
         </div>
     </div>
     <div id="other_time">
 
-        Festival choisi par l'utilsateur:
-        {{ app.user.activeFestival.name }}
+
         {% include 'logged/angular/recent.html.twig' %}
     </div>
 </div>
diff --git a/app/Resources/views/logged/angular/messages.html.twig b/app/Resources/views/logged/angular/messages.html.twig
index ad2d32f6..a14092b3 100755
--- a/app/Resources/views/logged/angular/messages.html.twig
+++ b/app/Resources/views/logged/angular/messages.html.twig
@@ -8,9 +8,29 @@
         <i class="fa fa-info"></i>
         Vous n'avez pas encore enregistré de <strong>produit</strong>, ajoutez-en donc.
     </div>
-    Créez facilement vos catégories de produits et vos produits juste en écrivant un nom par ligne dans
     {% endverbatim %}
-<a class="btn btn-success" href="{{ path('import') }}">l'interface d'importation simplifiée</a>
+<div>
+
+
+    {% if app.user.activeFestival is null %}
+        <div id="no-products" class="alert alert-info" ng-if="!productsFromDB.length">
+            <i class="fa fa-info"></i>
+            Sélectionnez un <strong>festival</strong> pour grouper vos ventes clients par évènement.
+        </div>
+    {% endif %}
+
+</div>
+
+{% if not app.user.products |length %}
+    <div>
+
+        Créez facilement vos catégories de produits et vos produits juste en écrivant un nom par ligne dans
+
+        <a class="btn btn-success" href="{{ path('import') }}">l'interface d'importation simplifiée</a>
+    </div>
+    <hr>
+{% endif %}
+
 {% verbatim %}
 <!--end messages warning-->
 </div>
diff --git a/app/Resources/views/logged/history.html.twig b/app/Resources/views/logged/history.html.twig
index e3938d0c..49be47b8 100644
--- a/app/Resources/views/logged/history.html.twig
+++ b/app/Resources/views/logged/history.html.twig
@@ -28,7 +28,7 @@
                             <i class="fa fa-shopping-cart"></i>
                             panier moyen
                             <div class="chiffre">
-                                {{ chiffreAffaires / (recentSells |length) }} €
+                                {{ chiffreAffaires / ((recentSells |length) or 1) }} €
                             </div>
                         </h2>
                         <div>
diff --git a/app/Resources/views/logged/mass-register.html.twig b/app/Resources/views/logged/mass-register.html.twig
index 7ac4116b..cff5cceb 100644
--- a/app/Resources/views/logged/mass-register.html.twig
+++ b/app/Resources/views/logged/mass-register.html.twig
@@ -9,14 +9,16 @@
         <blockquote>
             <strong>Vous pouvez copier et adapter cet exemple: </strong>
             <pre>
-    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€
+catégorie: livre
+    les moutaines;5€
+    la laine des moutons;6€
+    star wars spécial noël;7€
+catégorie: poster
+    super bannière A2;10€
+    Sébastien Chabal sexy;10€
+catégorie: dessin à la demande
+    dessin A4 crayon;20€
+    dessin A4 aquarelle;150€
 </pre>
         </blockquote>
         <label for="produits">
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
index 84727e9b..f9a294d8 100755
--- a/src/AppBundle/Controller/DefaultController.php
+++ b/src/AppBundle/Controller/DefaultController.php
@@ -86,23 +86,26 @@ class DefaultController extends Controller {
 		}
 
 		$activeFestival = $currentUser->getActiveFestival();
-//		if ( ! $activeFestival ) {
-//			$activeFestival = $m->getRepository( 'AppBundle:Festival' )
-//			                    ->findOneBy( [ 'user' => $this->getUser()->getId() ],
-//				                    [ 'id' => 'desc' ],
-//				                    0,
-//				                    1 );
-//			if ( ! $activeFestival ) {
-//				$activeFestival = new Festival();
-//				$activeFestival->setDateCreation( new \DateTime() );
-//				$activeFestival->setName( 'default festival' );
-//				$activeFestival->setUser( $currentUser );
-//			}
-//			$currentUser->setActiveFestival( $activeFestival );
-//			$m->persist( $activeFestival );
-//			$m->persist( $currentUser );
-//			$m->flush();
-//		}
+		if ( ! $activeFestival ) {
+			$activeFestival = $m->getRepository( 'AppBundle:Festival' )
+			                    ->findOneBy( [ 'user' => $this->getUser()->getId() ],
+				                    [ 'id' => 'desc' ],
+				                    0,
+				                    1 );
+			if ( ! $activeFestival ) {
+				$activeFestival = new Festival();
+				$activeFestival->setDateCreation( new \DateTime() )
+				               ->setName( 'default festival' )
+				               ->setChiffreAffaire( 0 )
+				               ->setFondDeCaisseAvant( 0 )
+				               ->setFondDeCaisseApres( 0 )
+				               ->setUser( $currentUser );
+			}
+			$currentUser->setActiveFestival( $activeFestival );
+			$m->persist( $activeFestival );
+			$m->persist( $currentUser );
+			$m->flush();
+		}
 
 
 		$categRepo   = $m->getRepository( 'AppBundle:ProductCategory' );
@@ -396,7 +399,7 @@ class DefaultController extends Controller {
 			->setName( 'default category' );
 
 		foreach ( $myCategories as $my_category ) {
-			$myCategoriesByName [$my_category->getName()] = $my_category;
+			$myCategoriesByName [ $my_category->getName() ] = $my_category;
 			foreach ( $my_category->getProducts() as $product ) {
 				$myProductsByName[ $product->getName() ] = $product;
 			}
@@ -404,12 +407,10 @@ class DefaultController extends Controller {
 		}
 		$massLines = $request->request->get( 'produits' );
 		if ( $request->getMethod() == 'POST' ) {
-			var_dump( '<pre>' . nl2br( $massLines . '</pre>' ) );
 			$lines = preg_split( '/$\R?^/m', trim( $massLines ) );
-			var_dump( count( $lines ) );
 			foreach ( $lines as $line ) {
 
-				if ( strpos( $line,':' ) ) {
+				if ( strpos( $line, ':' ) ) {
 					// manage catgegories
 					$boom      = explode( ':', trim( $line ) );
 					$firstPart = $boom[ 0 ];
@@ -425,7 +426,7 @@ class DefaultController extends Controller {
 							$currentUser->addCategory( $newCateg );
 							$m->persist( $newCateg );
 							$currentCategory = $newCateg; // associate further categories with the newly created one
-						}else{
+						} else {
 							echo " la catégorie existe déjà";
 						}
 					}
@@ -434,8 +435,10 @@ class DefaultController extends Controller {
 					echo "<br/>    $line";
 					$boom        = explode( ';', $line );
 					$productName = $boom[ 0 ];
-					$price       = intval( str_replace( '€', '', $boom[ 0 ] ) );
-					var_dump( $productName );
+					$price       = 0;
+					if ( $boom[ 1 ] ) {
+						$price = intval( str_replace( '€', '', $boom[ 1 ] ) );
+					}
 					// or create new product
 					if ( $productName && ! isset( $myProductsByName[ $productName ] ) ) {
 						$newProduct = new Product();
@@ -457,8 +460,6 @@ class DefaultController extends Controller {
 			// check with existing categories and products, sort them by name.
 			// save all
 			$m->flush();
-		} else {
-			var_dump( "not post" );
 		}
 
 		return $this->render( 'logged/import.html.twig',