columning
This commit is contained in:
parent
41119d8777
commit
8fbd0a2bae
|
@ -36,7 +36,7 @@
|
|||
<hr>
|
||||
<div ng-repeat="p in activeSelling track by $index">
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<div class="input-group">
|
||||
<input type="text" ng-model="p.name">
|
||||
<span class="btn btn-warning input-group-addon remove-item"
|
||||
|
@ -45,7 +45,7 @@
|
|||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 text-right">
|
||||
<div class="col-xs-12 col-sm-6 text-right">
|
||||
<strong>
|
||||
<input type="number" ng-model="p.price">
|
||||
€ </strong>
|
||||
|
@ -54,10 +54,10 @@
|
|||
</div>
|
||||
<div class="text-right">
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<h3>Total: </h3>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<h3>
|
||||
<strong>
|
||||
|
||||
|
@ -66,10 +66,10 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
Le client paie:
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<input type="number" id="paid_amount" ng-model="paidAmount">
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -5,18 +5,17 @@
|
|||
<!--caisse IHM-->
|
||||
<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/listing-products.html.twig' %}
|
||||
|
||||
|
||||
</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 }">
|
||||
|
||||
{% include 'logged/angular/validate-button.html.twig' %}
|
||||
{% if app.user.products |length %}
|
||||
|
||||
{% include 'logged/angular/current.html.twig' %}
|
||||
{% endif %}
|
||||
|
||||
|
@ -25,8 +24,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="other_time">
|
||||
|
||||
|
||||
{% include 'logged/angular/recent.html.twig' %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
<i class="fa fa-check"></i>
|
||||
|
||||
<span ng-if="paidAmount && CurrentSellingTotal() - paidAmount <=0">
|
||||
Valider
|
||||
</span>
|
||||
Valider
|
||||
</span>
|
||||
<span ng-if="paidAmount && CurrentSellingTotal() - paidAmount >0">
|
||||
<i class="fa fa-warning"></i>
|
||||
</span>
|
||||
<i class="fa fa-warning"></i>
|
||||
</span>
|
||||
</button>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
ng-controller="CaisseCtrl as MainCtrl"
|
||||
>
|
||||
<div class="row marged-v">
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-md-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"
|
||||
|
@ -42,7 +42,7 @@
|
|||
</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div class="client-now text-right">
|
||||
<i class="fa fa-user"></i>
|
||||
Client actuel:
|
||||
|
|
Loading…
Reference in New Issue