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' %}

27
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 %} {% include 'logged/festival-infos.html.twig' %}
{% endverbatim %} {# </div>#}
{% include 'logged/festival-infos.html.twig' %} <div class="col-xs-12">
{% verbatim %}
</div> {% include 'logged/customer.html.twig' %}
<div class="col-xs-12 col-sm-6"> {% verbatim %}
{% endverbatim %}
{% include 'logged/customer.html.twig' %}
{% 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>
@ -33,9 +30,9 @@
Problème de sauvegarde (pas de réseau ?) Problème de sauvegarde (pas de réseau ?)
</div> </div>
{% endverbatim %} {% endverbatim %}
{% include 'logged/caisse-main.html.twig' %} {% include 'logged/caisse-main.html.twig' %}
{% verbatim %} {% verbatim %}
{% endverbatim %} {% endverbatim %}
</div>
{% endblock %} {% endblock %}

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

@ -3,22 +3,23 @@
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
Festival: Festival:
</a> {% verbatim %}
{% verbatim %} {{activeFestival.name}}
<input type="text" ng-model="activeFestival.name" placeholder="nom du festival"> </a>
<input class="pull-right" type="text" ng-model="activeFestival.commentaire" placeholder="commentaire"> <!-- <input type="text" ng-model="activeFestival.name" placeholder="nom du festival">-->
<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}"> <!-- <input class="pull-right" type="text" ng-model="activeFestival.commentaire" placeholder="commentaire">-->
<i class="fa fa-archive"></i> <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}">
{{ activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire}} € <i class="fa fa-archive"></i>
</span> {{ activeFestival.fondDeCaisseAvant + activeFestival.chiffreAffaire}} €
<span class="badge badge-success"> </span>
CA {{ activeFestival.chiffreAffaire }} € <span class="badge badge-success">
<span ng-if="sellingOk"> CA {{ activeFestival.chiffreAffaire }} €
<i class="fa fa-check-circle-o"></i> <span ng-if="sellingOk">
</span> <i class="fa fa-check-circle-o"></i>
</span> </span>
<span class="badge badge-success"> </span>
{{ activeFestival.clientsCount }} <i class="fa fa-user"></i> <span class="badge badge-success">
</span> {{ activeFestival.clientsCount }} <i class="fa fa-user"></i>
</span>
{% endverbatim %} {% endverbatim %}
</div> </div>

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

@ -9,8 +9,8 @@
<div class="row marged-v" ng-if="! simpleDisplay"> <div class="row marged-v" ng-if="! simpleDisplay">
<div class="col-xs-12 col-md-6" id="main_options"> <div class="col-xs-12 col-md-6" id="main_options">
<button class="btn btn-disabled" ng-click="toggleSimpleDisplay()"> <button class="btn btn-disabled" ng-click="toggleSimpleDisplay()">
<i class="fa fa-bars"></i> Affichage simple <i class="fa fa-bars"></i> Affichage simple
</button> </button>
<button <button
title="la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail" title="la vente express vous permet d'enregistrer une vente pour un seul article sans remplir le formulaire de détail"
class="btn" class="btn"
@ -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