tykayn
/
caisse-bliss
mirror of https://forge.chapril.org/tykayn/caisse-bliss.git
1
0
Fork 0
Code Issues Releases Activity

columning

This commit is contained in:
Kayn Ty 2018-06-04 13:01:38 +02:00
parent 41119d8777
commit 8fbd0a2bae
No known key found for this signature in database
GPG Key ID: 55B09AA0ED327CD3
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
<hr> <hr>
<div ng-repeat="p in activeSelling track by $index"> <div ng-repeat="p in activeSelling track by $index">
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-12 col-sm-6">
<div class="input-group"> <div class="input-group">
<input type="text" ng-model="p.name"> <input type="text" ng-model="p.name">
<span class="btn btn-warning input-group-addon remove-item" <span class="btn btn-warning input-group-addon remove-item"
@ -45,7 +45,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="col-xs-6 text-right"> <div class="col-xs-12 col-sm-6 text-right">
<strong> <strong>
<input type="number" ng-model="p.price"> <input type="number" ng-model="p.price">
€ </strong> € </strong>
@ -54,10 +54,10 @@
</div> </div>
<div class="text-right"> <div class="text-right">
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-12 col-sm-6">
<h3>Total: </h3> <h3>Total: </h3>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-12 col-sm-6">
<h3> <h3>
<strong> <strong>
@ -66,10 +66,10 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-12 col-sm-6">
Le client paie: Le client paie:
</div> </div>
<div class="col-xs-6"> <div class="col-xs-12 col-sm-6">
<input type="number" id="paid_amount" ng-model="paidAmount"> <input type="number" id="paid_amount" ng-model="paidAmount">
</div> </div>
</div> </div>

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

@ -5,18 +5,17 @@
<!--caisse IHM--> <!--caisse IHM-->
<div id="load_ok"> <div id="load_ok">
<div class="listing-products col-xs-7"> <div class="listing-products col-xs-12 col-sm-7">
{% 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' %}
</div> </div>
<div class="sellings col-xs-5"> <div class="sellings col-xs-12 col-sm-5">
<div class="well" ng-class="{'bg-success text-success': sellingOk }"> <div class="well" ng-class="{'bg-success text-success': sellingOk }">
{% include 'logged/angular/validate-button.html.twig' %} {% include 'logged/angular/validate-button.html.twig' %}
{% if app.user.products |length %} {% if app.user.products |length %}
{% include 'logged/angular/current.html.twig' %} {% include 'logged/angular/current.html.twig' %}
{% endif %} {% endif %}
@ -25,8 +24,6 @@
</div> </div>
</div> </div>
<div id="other_time"> <div id="other_time">
{% include 'logged/angular/recent.html.twig' %} {% include 'logged/angular/recent.html.twig' %}
</div> </div>
</div> </div>

8
app/Resources/views/logged/angular/validate-button.html.twig
View File

@ -3,9 +3,9 @@
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
<span ng-if="paidAmount && CurrentSellingTotal() - paidAmount <=0"> <span ng-if="paidAmount && CurrentSellingTotal() - paidAmount <=0">
Valider Valider
</span> </span>
<span ng-if="paidAmount && CurrentSellingTotal() - paidAmount >0"> <span ng-if="paidAmount && CurrentSellingTotal() - paidAmount >0">
<i class="fa fa-warning"></i> <i class="fa fa-warning"></i>
</span> </span>
</button> </button>

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

@ -9,7 +9,7 @@
ng-controller="CaisseCtrl as MainCtrl" ng-controller="CaisseCtrl as MainCtrl"
> >
<div class="row marged-v"> <div class="row marged-v">
<div class="col-xs-6"> <div class="col-xs-12 col-md-6">
<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,7 +42,7 @@
</span> </span>
</button> </button>
</div> </div>
<div class="col-xs-6"> <div class="col-xs-12 col-md-6">
<div class="client-now text-right"> <div class="client-now text-right">
<i class="fa fa-user"></i> <i class="fa fa-user"></i>
Client actuel: Client actuel: