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

fix comment display

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Resources/views/logged/angular/loaded-caisse.html.twig
View File

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

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

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

7
app/Resources/views/logged/festival-infos.html.twig
View File

@ -3,10 +3,11 @@
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
Festival: Festival:
</a>
{% verbatim %} {% verbatim %}
<input type="text" ng-model="activeFestival.name" placeholder="nom du festival"> {{activeFestival.name}}
<input class="pull-right" type="text" ng-model="activeFestival.commentaire" placeholder="commentaire"> </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}"> <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> <i class="fa fa-archive"></i>
{{ activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire}} € {{ activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire}} €

2
app/Resources/views/logged/listing-options.html.twig
View File

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

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