fix comment display

This commit is contained in:
tykayn 2019-07-06 18:14:27 +02:00
parent 22817ec553
commit 07b4665c71
5 changed files with 34 additions and 39 deletions

View File

@ -1,12 +1,7 @@
<!--ok loading done-->
<div id="loaded" ng-if="initLoadDone">
<!--caisse IHM-->
<div id="load_ok">
{% verbatim %}
( {{sellingComment}} )
{% endverbatim %}
<div id="listing-products" class="listing-products col-xs-12 col-md-8">
{% include 'logged/angular/messages.html.twig' %}
{% include 'logged/angular/listing-products.html.twig' %}

View File

@ -6,23 +6,20 @@
ng-controller="CaisseCtrl as MainCtrl">
<div class="caisse-main row-fluid" >
<div class="col-xs-12 col-sm-6">
<div class="col-xs-12 ">
<!-- ligne d'informations-->
{% endverbatim %}
{% include 'logged/listing-options.html.twig' %}
{% verbatim %}
{% endverbatim %}
{% include 'logged/festival-infos.html.twig' %}
{% verbatim %}
</div>
<div class="col-xs-12 col-sm-6">
{% endverbatim %}
{# </div>#}
<div class="col-xs-12">
{% include 'logged/customer.html.twig' %}
{% verbatim %}
</div>
</div>
<!--états de sauvegarde-->
<div class="selling-ok alert-success alert block" ng-if="sellingOk" ng-click="sellingOk = false">
<i class="fa fa-save"></i>
@ -37,5 +34,5 @@
{% verbatim %}
{% endverbatim %}
</div>
{% endblock %}

View File

@ -3,10 +3,11 @@
<i class="fa fa-th-large"></i>
Festival:
</a>
{% verbatim %}
<input type="text" ng-model="activeFestival.name" placeholder="nom du festival">
<input class="pull-right" type="text" ng-model="activeFestival.commentaire" placeholder="commentaire">
{{activeFestival.name}}
</a>
<!-- <input type="text" ng-model="activeFestival.name" placeholder="nom du festival">-->
<!-- <input class="pull-right" type="text" ng-model="activeFestival.commentaire" placeholder="commentaire">-->
<span class="badge" title="fond de caisse + chiffre d'affaire. veillez à vider votre fond de caisse ailleurs lorsqu'il devient trop important, par exemple au dela de 200€" ng-class="{'badge-warning': activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire > 200}">
<i class="fa fa-archive"></i>
{{ activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire}} €

View File

@ -42,5 +42,7 @@
<i class="fa fa-check-circle"></i>
</span>
</button>
</div>
</div>
{% endverbatim %}
</div>

0
web/config.php Executable file → Normal file
View File