From 77f0b9c73af902e58899a10e6398d9d0daa892a0 Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Fri, 20 Apr 2018 12:30:58 +0200
Subject: [PATCH] noting client name in scope

---
 .../views/logged/angular/current.html.twig    | 11 -----
 .../logged/angular/listing-products.html.twig |  6 +--
 .../views/logged/dashboard.html.twig          | 40 +++++++++++++++++--
 assets/js/parts/main.js                       |  3 ++
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/app/Resources/views/logged/angular/current.html.twig b/app/Resources/views/logged/angular/current.html.twig
index 392b05d6..6c666b50 100755
--- a/app/Resources/views/logged/angular/current.html.twig
+++ b/app/Resources/views/logged/angular/current.html.twig
@@ -21,18 +21,7 @@
 
        <div>
        <div class="row-fluid">
-                    <i class="fa fa-user"></i> Client actuel:
-                    {{ activeSelling.length }} produit<span ng-if="activeSelling.length>1">s</span>
-                <div>
-                <input id="sellingCommentInput" type="text" ng-model="MainCtrl.sellingComment" placeholder="nom ou commentaire">
-                <button class="btn btn-default" ng-click="clearSellingComment()">
-                    <i class="fa fa-times"></i>
-                </button>
-</div>
 
-                <button class="btn btn-default" ng-click="MainCtrl.sellingComment = 'boobbbbbb'">
-                    <i class="fa fa-arrow-right"></i>
-                </button>
             </div>
        </div>
 
diff --git a/app/Resources/views/logged/angular/listing-products.html.twig b/app/Resources/views/logged/angular/listing-products.html.twig
index d1764eca..c11f7803 100755
--- a/app/Resources/views/logged/angular/listing-products.html.twig
+++ b/app/Resources/views/logged/angular/listing-products.html.twig
@@ -1,9 +1,5 @@
 {% verbatim %}
-<button
-title="la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail"
-class="btn" ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSelling}" ng-click="expressSelling = !expressSelling"><i class="fa fa-shopping-cart"></i> mode vente express
-<span ng-if=expressSelling>activé</span>
-</button>
+
 <div class="category-listing well" ng-repeat="c in categories">
 
     <h2>
diff --git a/app/Resources/views/logged/dashboard.html.twig b/app/Resources/views/logged/dashboard.html.twig
index 76b64479..acf2235f 100755
--- a/app/Resources/views/logged/dashboard.html.twig
+++ b/app/Resources/views/logged/dashboard.html.twig
@@ -3,15 +3,48 @@
 {% block body %}
     <div id="wrapper">
         <div id="container" class="container">
-
             <div id="caisse-now" class="tab-pane fade in active">
                 <div class="caisse-main row"
                         ng-app="caisse"
                         ng-controller="CaisseCtrl as MainCtrl"
                 >
+                    <div class="row marged-v">
+                        <div class="col-xs-6">
+                            <button
+                                    title="la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail"
+                                    class="btn"
+                                    ng-class="{'btn-success': expressSelling, 'btn-disabled':!expressSelling}"
+                                    ng-click="expressSelling = !expressSelling">
+                                <i class="fa fa-shopping-cart"></i>
+                                mode vente express
+                                <span ng-if=expressSelling>activé</span>
+                            </button>
+                        </div>
+                        <div class="col-xs-6">
+                            <div class="client-now text-right">
+                                <i class="fa fa-user"></i>
+                                Client actuel:
+                                {% verbatim %}
+                    {{ activeSelling.length }} produit<span ng-if="activeSelling.length!=1">s</span>
+                    <div>
+                        <input type="text" ng-model="sellingComment" placeholder="nom ou commentaire">
+
+                        <button class="btn btn-default" ng-click="sellingComment = ''">
+                            <i class="fa fa-times"></i>
+                        </button>
+{% endverbatim %}
+                                {#<button class="btn btn-default" ng-click="sellingComment = 'boobbbbbb'">#}
+                                {#<i class="fa fa-arrow-right"></i>#}
+                                {#</button>#}
+                                {#<button class="btn btn-default"#}
+                                {#ng-click="logger(MainCtrl.sellingComment ) ; logger( sellingComment)">#}
+                                {#<i class="fa fa-arrow-down"></i>#}
+                                {#</button>#}
+                            </div>
+                        </div>
+                    </div>
+
 
-                    sellingComment:
-                    {% verbatim %} {{ MainCtrl.sellingComment }}{% endverbatim %}
                     {% include 'logged/caisse-main.html.twig' %}
                 </div>
             </div>
@@ -26,4 +59,5 @@
             </div>
         </div>
     </div>
+    </div>
 {% endblock %}
diff --git a/assets/js/parts/main.js b/assets/js/parts/main.js
index c9c7a848..fd1148dc 100755
--- a/assets/js/parts/main.js
+++ b/assets/js/parts/main.js
@@ -127,6 +127,9 @@ angular
           $scope.sendForm();
       };
       $scope.recentId = 0;
+      $scope.logger = function (stuff) {
+          console.log('logger', stuff);
+      }
       $scope.sendForm = function () {
           console.log('$scope.sellingComment', this.sellingComment);
           let lesParams = {