From 77f0b9c73af902e58899a10e6398d9d0daa892a0 Mon Sep 17 00:00:00 2001 From: Kayn Ty 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 @@
- Client actuel: - {{ activeSelling.length }} produits -
- - -
-
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 %} - +

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 %}
-
+
+
+ +
+
+
+ + Client actuel: + {% verbatim %} + {{ activeSelling.length }} produits +
+ + + +{% endverbatim %} + {##} + {##} +
+
+
+ - sellingComment: - {% verbatim %} {{ MainCtrl.sellingComment }}{% endverbatim %} {% include 'logged/caisse-main.html.twig' %}
@@ -26,4 +59,5 @@
+

{% 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 = {