tykayn/caisse-bliss
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

noting client name in scope

Browse Source
This commit is contained in:
Kayn Ty 2018-04-20 12:30:58 +02:00
parent 502bcea117
commit 77f0b9c73a
4 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Resources/views/logged/angular/current.html.twig
View File

@ -21,18 +21,7 @@
<div> <div>
<div class="row-fluid"> <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>
</div> </div>

6
app/Resources/views/logged/angular/listing-products.html.twig
View File

@ -1,9 +1,5 @@
{% verbatim %} {% 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"> <div class="category-listing well" ng-repeat="c in categories">
<h2> <h2>

40
app/Resources/views/logged/dashboard.html.twig
View File

@ -3,15 +3,48 @@
{% block body %} {% block body %}
<div id="wrapper"> <div id="wrapper">
<div id="container" class="container"> <div id="container" class="container">
<div id="caisse-now" class="tab-pane fade in active"> <div id="caisse-now" class="tab-pane fade in active">
<div class="caisse-main row" <div class="caisse-main row"
ng-app="caisse" ng-app="caisse"
ng-controller="CaisseCtrl as MainCtrl" 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' %} {% include 'logged/caisse-main.html.twig' %}
</div> </div>
</div> </div>
@ -26,4 +59,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

3
assets/js/parts/main.js
View File

@ -127,6 +127,9 @@ angular
$scope.sendForm(); $scope.sendForm();
}; };
$scope.recentId = 0; $scope.recentId = 0;
$scope.logger = function (stuff) {
console.log('logger', stuff);
}
$scope.sendForm = function () { $scope.sendForm = function () {
console.log('$scope.sellingComment', this.sellingComment); console.log('$scope.sellingComment', this.sellingComment);
let lesParams = { let lesParams = {