From a3b1753d9adc63981292abbd2b6dc93e778b976c Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Fri, 20 Apr 2018 09:40:17 +0200
Subject: [PATCH] list stocks

---
 .../views/logged/angular/current.html.twig    |  6 ++-
 .../logged/angular/listing-products.html.twig |  3 ++
 app/Resources/views/product/index.html.twig   |  2 +
 assets/js/parts/main.js                       | 22 +++++++++-
 .../Controller/DefaultController.php          | 12 ++++--
 .../Controller/ProductCategoryController.php  |  2 +-
 src/AppBundle/Entity/Product.php              | 41 +++++++++----------
 src/AppBundle/Entity/Product.php~             | 23 +++++++++++
 src/AppBundle/Form/ProductType.php            | 12 ++++--
 9 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/app/Resources/views/logged/angular/current.html.twig b/app/Resources/views/logged/angular/current.html.twig
index 1a53a4ef..3ba92000 100755
--- a/app/Resources/views/logged/angular/current.html.twig
+++ b/app/Resources/views/logged/angular/current.html.twig
@@ -19,7 +19,9 @@
        </h2>
         {{ activeSelling.length }} produit<span ng-if="activeSelling.length>1">s</span>
         <input id="sellingComment" name="sellingComment" class="input input-lg" type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
-        {{ sellingComment }}
+        <button class="btn btn-default" ng-click="clearSellingComment()">
+        <i class="fa fa-times"></i>
+</button>
         <hr>
         <ul>
             <li ng-repeat="p in activeSelling track by $index">
@@ -28,7 +30,7 @@
                         <div class="input-group">
                             <input type="text" ng-model="p.name">
                             <span class="btn btn-warning input-group-addon remove-itm"
-                                    ng-click="activeSelling.splice($index,1);  regenActiveSellingIds()">
+                                    ng-click="removeProduct(p,$index)">
                                 <i class="fa fa-trash"></i>
                             </span>
                         </div>
diff --git a/app/Resources/views/logged/angular/listing-products.html.twig b/app/Resources/views/logged/angular/listing-products.html.twig
index af3c9d5b..3dea295e 100755
--- a/app/Resources/views/logged/angular/listing-products.html.twig
+++ b/app/Resources/views/logged/angular/listing-products.html.twig
@@ -21,6 +21,9 @@ class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSel
             <span class="badge">
                  {{ p.price }} €
             </span>
+            <span class="badge badge-default">
+                 {{ p.stockCount }}
+            </span>
         </button>
          <button ng-if="expressSelling" ng-click="expressSell(p)">
             <i class="fa fa-shopping-cart"></i>
diff --git a/app/Resources/views/product/index.html.twig b/app/Resources/views/product/index.html.twig
index e8452d82..55566316 100755
--- a/app/Resources/views/product/index.html.twig
+++ b/app/Resources/views/product/index.html.twig
@@ -10,6 +10,7 @@
             <th>Name</th>
             <th>Image</th>
             <th>Price</th>
+            <th>Stocks</th>
             <th>Comment</th>
             <th>Actions</th>
         </tr>
@@ -24,6 +25,7 @@
                 <td>{{ product.name }}</td>
                 <td>{{ product.image }}</td>
                 <td>{{ product.price }}</td>
+                <td>{{ product.stockCount }}</td>
                 <td>{{ product.comment }}</td>
                 <td>
                     <ul>
diff --git a/assets/js/parts/main.js b/assets/js/parts/main.js
index ce22451d..e26f97cd 100755
--- a/assets/js/parts/main.js
+++ b/assets/js/parts/main.js
@@ -10,7 +10,7 @@ angular
       $scope.recentSellings = [];
       $scope.lesParams = {};
       $scope.paidAmount = 0;
-      $scope.expressSelling = false;
+      $scope.expressSelling = true;
       $scope.pausedSelling = [];
       $scope.activeItemsSold = [];    // list of products ID to sell
       $scope.activeSelling = [];    // list of products to sell
@@ -58,13 +58,26 @@ angular
       $scope.pauseSelling = function (selling) {
           $scope.pausedSelling.push(selling);
       };
+      /**
+       * add to current sell list
+       * @param product
+       */
       $scope.addProduct = function (product) {
+          product.stockCount--;
           $scope.activeSelling.push(product);
           $scope.activeItemsSold.push(product.id);
           $scope.regenActiveSellingIds();
-          document.querySelector('#sellingComment').focus()
 
       };
+      /**
+       * remove from current sell list
+       * @param product
+       */
+      $scope.removeProduct = function (product, index) {
+          product.stockCount++;
+          $scope.activeSelling.splice($index, 1);
+          $scope.regenActiveSellingIds()
+      };
       $scope.pauseSelling = function () {
           $scope.pausedSelling.push(angular.copy($scope.activeSelling));
           $scope.activeSelling = [];
@@ -73,6 +86,11 @@ angular
           $scope.activeSelling = angular.copy(sellingList);
           $scope.pausedSelling.splice(index, 1);
       };
+
+      $scope.clearSellingComment = function () {
+          $scope.sellingComment = '';
+          document.querySelector('#sellingComment').focus();
+      }
       $scope.clearCurrentSelling = function () {
           $scope.paidAmount = 0;
           $scope.sellingComment = "";
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
index c45e55df..fb90f0af 100755
--- a/src/AppBundle/Controller/DefaultController.php
+++ b/src/AppBundle/Controller/DefaultController.php
@@ -125,10 +125,11 @@ class DefaultController extends Controller {
 				$listOfProductsInArray = [];
 				foreach ( $products as $product ) {
 					$listOfProductsInArray[] = [
-						'id'       => $product->getId(),
-						'name'     => $product->getName(),
-						'category' => $category->getId(),
-						'price'    => 1 * $product->getPrice(),
+						'id'         => $product->getId(),
+						'name'       => $product->getName(),
+						'category'   => $category->getId(),
+						'price'      => 1 * $product->getPrice(),
+						'stockCount' => $product->getStockCount(),
 					];
 				}
 				$products = $listOfProductsInArray;
@@ -201,6 +202,9 @@ class DefaultController extends Controller {
 			// link selling record with user, festival
 			$currentUser->addProductsSold( $newProductSold );
 			// persist all
+			$productModel->setStockCount( $productModel->getStockCount() - 1 );
+			$m->persist( $productModel );
+			$m->persist( $newProductSold );
 			$m->persist( $newProductSold );
 			$sumAmount += $record[ 'price' ];
 		}
diff --git a/src/AppBundle/Controller/ProductCategoryController.php b/src/AppBundle/Controller/ProductCategoryController.php
index 3e2122df..24582924 100755
--- a/src/AppBundle/Controller/ProductCategoryController.php
+++ b/src/AppBundle/Controller/ProductCategoryController.php
@@ -23,7 +23,7 @@ class ProductCategoryController extends Controller {
 	public function indexAction() {
 		$em = $this->getDoctrine()->getManager();
 
-		$productCategories = $em->getRepository( 'AppBundle:ProductCategory' )->findAll();
+		$productCategories = $em->getRepository( 'AppBundle:ProductCategory' )->findByUser($this->getUser() );
 
 		return $this->render( 'productcategory/index.html.twig',
 			[
diff --git a/src/AppBundle/Entity/Product.php b/src/AppBundle/Entity/Product.php
index 19882f7f..294affec 100644
--- a/src/AppBundle/Entity/Product.php
+++ b/src/AppBundle/Entity/Product.php
@@ -29,6 +29,7 @@ class Product {
 
 
 	/**
+	 * url for image
 	 * @ORM\Column(type="string", length=256, nullable=true)
 	 */
 	private $image;
@@ -143,27 +144,25 @@ class Product {
 		return $this->user;
 	}
 
-    /**
-     * Set stockCount.
-     *
-     * @param int $stockCount
-     *
-     * @return Product
-     */
-    public function setStockCount($stockCount)
-    {
-        $this->stockCount = $stockCount;
+	/**
+	 * Set stockCount.
+	 *
+	 * @param int $stockCount
+	 *
+	 * @return Product
+	 */
+	public function setStockCount( $stockCount ) {
+		$this->stockCount = $stockCount;
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Get stockCount.
-     *
-     * @return int
-     */
-    public function getStockCount()
-    {
-        return $this->stockCount;
-    }
+	/**
+	 * Get stockCount.
+	 *
+	 * @return int
+	 */
+	public function getStockCount() {
+		return $this->stockCount;
+	}
 }
diff --git a/src/AppBundle/Entity/Product.php~ b/src/AppBundle/Entity/Product.php~
index 6411e1ec..294affec 100755
--- a/src/AppBundle/Entity/Product.php~
+++ b/src/AppBundle/Entity/Product.php~
@@ -29,6 +29,7 @@ class Product {
 
 
 	/**
+	 * url for image
 	 * @ORM\Column(type="string", length=256, nullable=true)
 	 */
 	private $image;
@@ -142,4 +143,26 @@ class Product {
 	public function getUser() {
 		return $this->user;
 	}
+
+	/**
+	 * Set stockCount.
+	 *
+	 * @param int $stockCount
+	 *
+	 * @return Product
+	 */
+	public function setStockCount( $stockCount ) {
+		$this->stockCount = $stockCount;
+
+		return $this;
+	}
+
+	/**
+	 * Get stockCount.
+	 *
+	 * @return int
+	 */
+	public function getStockCount() {
+		return $this->stockCount;
+	}
 }
diff --git a/src/AppBundle/Form/ProductType.php b/src/AppBundle/Form/ProductType.php
index a71a88ab..379b6a82 100755
--- a/src/AppBundle/Form/ProductType.php
+++ b/src/AppBundle/Form/ProductType.php
@@ -11,9 +11,15 @@ class ProductType extends AbstractType {
 	 * {@inheritdoc}
 	 */
 	public function buildForm( FormBuilderInterface $builder, array $options ) {
-		$builder->add( 'name' )->add( 'image',
-			null,
-			[ 'label' => 'URL pour image' ] )->add( 'price' )->add( 'comment' )->add( 'category' )->add( 'user' );
+		$builder->add( 'name' )
+		        ->add( 'image',
+			        null,
+			        [ 'label' => 'URL pour image' ] )
+		        ->add( 'stockCount' )
+		        ->add( 'price' )
+		        ->add( 'comment' )
+		        ->add( 'category' )
+		        ->add( 'user' );
 	}
 
 	/**