Browse Source

Merge branch 'feature/commande_modifiee' into dev

dev
keun 6 years ago
parent
commit
2d102ac77f
4 changed files with 215 additions and 168 deletions
  1. +9
    -3
      backend/views/site/index.php
  2. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc
  3. +185
    -165
      backend/web/css/screen.css
  4. +21
    -0
      backend/web/sass/screen.scss

+ 9
- 3
backend/views/site/index.php View File

<thead> <thead>
<tr> <tr>
<th></th> <th></th>
<th>Historique</th>
<th>Date</th> <th>Date</th>
<th>Client</th> <th>Client</th>
<th>Produits</th> <th>Produits</th>
</thead> </thead>
<tbody> <tbody>
<?php foreach($commandes as $c): ?> <?php foreach($commandes as $c): ?>
<tr>
<td><?= $c->getStrType(true); ?></td>
<tr class="<?php if(!is_null($c->date_update)): ?>commande-update<?php endif; ?>">
<td class="infos"><?= $c->getStrType(true); ?></td>
<td class="historique">
<div class="small"><span class="glyphicon glyphicon-plus"></span> Création <br /> <strong><?= date('d/m/Y à G\hi', strtotime($c->date)) ?></strong></div>
<?php if(!is_null($c->date_update)): ?>
<div class="small"><span class="update"><span class="glyphicon glyphicon-pencil"></span> Dernière modification</span><br /> <strong><?= date('d/m/Y à G\hi', strtotime($c->date_update)) ?></strong></div>
<?php endif; ?>
</td>
<td class="date"> <td class="date">
<div class="bloc-date"> <div class="bloc-date">
<div class="jour"><?= strftime('%A', strtotime($c->production->date)) ?></div> <div class="jour"><?= strftime('%A', strtotime($c->production->date)) ?></div>
</td> </td>
<td> <td>
<?= $c->getStrUser(); ?><br /> <?= $c->getStrUser(); ?><br />
<span class="small">Le <?= date('d/m/Y à G\hi', strtotime($c->date)) ?></span>
</td> </td>
<td><?= $c->getResumePanier() ; ?></td> <td><?= $c->getResumePanier() ; ?></td>
<td><?= $c->getResumePointVente() ; ?></td> <td><?= $c->getResumePointVente() ; ?></td>

BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc View File


+ 185
- 165
backend/web/css/screen.css
File diff suppressed because it is too large
View File


+ 21
- 0
backend/web/sass/screen.scss View File

} }
#dernieres-commandes { #dernieres-commandes {
tr.commande-update {
td {
background-color: $color2 ;
}
}
.small, .localite { .small, .localite {
font-size: 12px ; font-size: 12px ;
color: gray ; color: gray ;
font-size: 12px ; font-size: 12px ;
} }
td.historique {
min-width: 170px ;
.small {
margin-bottom: 7px ;
}
strong {
margin-left: 15px ;
}
.update {
color: $color1 ;
}
}
.date { .date {
text-align: center ; text-align: center ;

Loading…
Cancel
Save