Laclic
/
Souke
Watch 5
Star 0
Fork 1
Code Issues 1 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Améliorer l'affichage des boulangeries sur le tableau de bord

prodstable
keun 8 years ago
parent
f1edb4e6a6
commit
deb163ce44
4 changed files with 94 additions and 57 deletions
Unified View Show Diff Stats
  1. +22
    -3
      frontend/views/commande/index.php
  2. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc
  3. +62
    -54
      frontend/web/css/screen.css
  4. +10
    -0
      frontend/web/sass/_systeme_commandes.scss

+ 22
- 3
frontend/views/commande/index.php View File



<h2>Boulangeries</h2> <h2>Boulangeries</h2>
<?php if(count($boulangeries)): ?> <?php if(count($boulangeries)): ?>
<ul>
<div id="liste-boulangeries">
<?php foreach($boulangeries as $b): ?> <?php foreach($boulangeries as $b): ?>
<li><?php echo Html::encode($b['nom_magasin']); ?></li>
<div class="">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><?php echo Html::encode($b['nom_magasin']); ?></h3>
</div>
<div class="panel-body">
<?php if(strlen($b['logo'])): ?>
<img class="logo" src="uploads/<?= Html::encode($b['logo']); ?>" />
<?php endif; ?>
<a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl('commande/create') ?>">Commander</a>
<?php //nl2br(Html::encode($b['description'])); ?>
</div>
</div>
</div>
<?php endforeach; ?> <?php endforeach; ?>
</ul>
<div class="">
<a class="btn btn-default" href="javascript:void(0);"><span class="glyphicon glyphicon-plus"></span> Ajouter une boulangerie</a>
</div>
</div>
<div class="clr"></div>
<?php else: ?> <?php else: ?>
<div class="alert alert-info">Aucune boulangerie</div> <div class="alert alert-info">Aucune boulangerie</div>
<?php endif; ?> <?php endif; ?>

BIN
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc View File


+ 62
- 54
frontend/web/css/screen.css View File

padding-bottom: 20px; padding-bottom: 20px;
} }
/* line 44, ../sass/_systeme_commandes.scss */ /* line 44, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .logo {
width: 30%;
max-width: 200px;
float: left;
padding-right: 20px;
padding-bottom: 20px;
}
/* line 54, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .statut, #index-commande #historique-commandes .montant { #index-commande #historique-commandes .statut, #index-commande #historique-commandes .montant {
width: 175px; width: 175px;
} }
/* line 47, ../sass/_systeme_commandes.scss */
/* line 57, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .montant { #index-commande #historique-commandes .montant {
width: 100px; width: 100px;
} }
/* line 54, ../sass/_systeme_commandes.scss */
/* line 64, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .localite { #index-commande #historique-commandes .localite {
font-size: 11px; font-size: 11px;
lin-height: 11px; lin-height: 11px;
} }
/* line 59, ../sass/_systeme_commandes.scss */
/* line 69, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes a { #index-commande #historique-commandes a {
text-decoration: none; text-decoration: none;
} }


/* line 66, ../sass/_systeme_commandes.scss */
/* line 76, ../sass/_systeme_commandes.scss */
.commande-form { .commande-form {
min-height: 600px; min-height: 600px;
} }
/* line 70, ../sass/_systeme_commandes.scss */
/* line 80, ../sass/_systeme_commandes.scss */
.commande-form h2 { .commande-form h2 {
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
} }
/* line 74, ../sass/_systeme_commandes.scss */
/* line 84, ../sass/_systeme_commandes.scss */
.commande-form #infos-importantes.alert-warning { .commande-form #infos-importantes.alert-warning {
float: right; float: right;
} }
/* line 80, ../sass/_systeme_commandes.scss */
/* line 90, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker { .commande-form #datepicker-production .ui-datepicker {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
/* line 85, ../sass/_systeme_commandes.scss */
/* line 95, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-helper-clearfix:after { .commande-form #datepicker-production .ui-helper-clearfix:after {
clear: none; clear: none;
} }
/* line 89, ../sass/_systeme_commandes.scss */
/* line 99, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .alert-info { .commande-form #datepicker-production .alert-info {
float: left; float: left;
} }
/* line 94, ../sass/_systeme_commandes.scss */
/* line 104, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours { .commande-form #has-commande-en-cours {
margin-top: 15px; margin-top: 15px;
} }
/* line 97, ../sass/_systeme_commandes.scss */
/* line 107, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours a { .commande-form #has-commande-en-cours a {
color: #a94442; color: #a94442;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
} }
/* line 104, ../sass/_systeme_commandes.scss */
/* line 114, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente { .commande-form .field-commande-id_point_vente {
margin-top: 30px; margin-top: 30px;
} }
/* line 108, ../sass/_systeme_commandes.scss */
/* line 118, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production { .commande-form .field-commande-id_production {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 110, ../sass/_systeme_commandes.scss */
/* line 120, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production label { .commande-form .field-commande-id_production label {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 114, ../sass/_systeme_commandes.scss */
/* line 124, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production .help-block { .commande-form .field-commande-id_production .help-block {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 119, ../sass/_systeme_commandes.scss */
/* line 129, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente { .commande-form ul#points-vente {
list-style-type: none; list-style-type: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
/* line 124, ../sass/_systeme_commandes.scss */
/* line 134, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente { .commande-form ul#points-vente .point-vente {
width: 268px; width: 268px;
height: 130px; height: 130px;
background-color: #f9f9f9; background-color: #f9f9f9;
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
} }
/* line 137, ../sass/_systeme_commandes.scss */
/* line 147, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente .nom { .commande-form ul#points-vente .point-vente .nom {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 20px; font-size: 20px;
} }
/* line 143, ../sass/_systeme_commandes.scss */
/* line 153, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente .adresse { .commande-form ul#points-vente .point-vente .adresse {
color: gray; color: gray;
font-size: 13px; font-size: 13px;
line-height: 16px; line-height: 16px;
} }
/* line 149, ../sass/_systeme_commandes.scss */
/* line 159, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente .horaires { .commande-form ul#points-vente .point-vente .horaires {
margin-top: 7px; margin-top: 7px;
} }
/* line 151, ../sass/_systeme_commandes.scss */
/* line 161, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente .horaires .jour { .commande-form ul#points-vente .point-vente .horaires .jour {
font-weight: bold; font-weight: bold;
display: none; display: none;
} }
/* line 157, ../sass/_systeme_commandes.scss */
/* line 167, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente.selected { .commande-form ul#points-vente .point-vente.selected {
border-left: solid 5px black; border-left: solid 5px black;
-moz-box-shadow: 0px 0px 5px #d8d8d8; -moz-box-shadow: 0px 0px 5px #d8d8d8;
-webkit-box-shadow: 0px 0px 5px #d8d8d8; -webkit-box-shadow: 0px 0px 5px #d8d8d8;
box-shadow: 0px 0px 5px #d8d8d8; box-shadow: 0px 0px 5px #d8d8d8;
} }
/* line 161, ../sass/_systeme_commandes.scss */
/* line 171, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente.selected .contenu { .commande-form ul#points-vente .point-vente.selected .contenu {
position: relative; position: relative;
left: -4px; left: -4px;
} }
/* line 167, ../sass/_systeme_commandes.scss */
/* line 177, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente:hover { .commande-form ul#points-vente .point-vente:hover {
-moz-box-shadow: 0px 0px 5px #d8d8d8; -moz-box-shadow: 0px 0px 5px #d8d8d8;
-webkit-box-shadow: 0px 0px 5px #d8d8d8; -webkit-box-shadow: 0px 0px 5px #d8d8d8;
box-shadow: 0px 0px 5px #d8d8d8; box-shadow: 0px 0px 5px #d8d8d8;
} }
/* line 172, ../sass/_systeme_commandes.scss */
/* line 182, ../sass/_systeme_commandes.scss */
.commande-form ul#points-vente .point-vente.disabled { .commande-form ul#points-vente .point-vente.disabled {
display: none; display: none;
} }
/* line 179, ../sass/_systeme_commandes.scss */
/* line 189, ../sass/_systeme_commandes.scss */
.commande-form #produits { .commande-form #produits {
margin-top: 15px; margin-top: 15px;
} }
/* line 182, ../sass/_systeme_commandes.scss */
/* line 192, ../sass/_systeme_commandes.scss */
.commande-form #produits #label-produits { .commande-form #produits #label-produits {
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
} }
/* line 187, ../sass/_systeme_commandes.scss */
/* line 197, ../sass/_systeme_commandes.scss */
.commande-form #produits .table { .commande-form #produits .table {
margin-top: 7px; margin-top: 7px;
} }
/* line 190, ../sass/_systeme_commandes.scss */
/* line 200, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .illu { .commande-form #produits .table .illu {
float: left; float: left;
height: auto; height: auto;
width: 70px; width: 70px;
margin-right: 15px; margin-right: 15px;
} }
/* line 197, ../sass/_systeme_commandes.scss */
/* line 207, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .photo { .commande-form #produits .table .photo {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
width: 200px; width: 200px;
} }
/* line 203, ../sass/_systeme_commandes.scss */
/* line 213, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .nom { .commande-form #produits .table .nom {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
font-size: 18px; font-size: 18px;
} }
/* line 210, ../sass/_systeme_commandes.scss */
/* line 220, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .description { .commande-form #produits .table .description {
font-style: italic; font-style: italic;
} }
/* line 214, ../sass/_systeme_commandes.scss */
/* line 224, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .recette { .commande-form #produits .table .recette {
font-size: 12px; font-size: 12px;
} }
/* line 218, ../sass/_systeme_commandes.scss */
/* line 228, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group { .commande-form #produits .table .input-group {
width: 133px; width: 133px;
} }
/* line 220, ../sass/_systeme_commandes.scss */
/* line 230, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group .quantity { .commande-form #produits .table .input-group .quantity {
text-align: center; text-align: center;
} }
/* line 225, ../sass/_systeme_commandes.scss */
/* line 235, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .colonne-quantite, .commande-form #produits .table .prix-unit, .commande-form #produits .table .total { .commande-form #produits .table .colonne-quantite, .commande-form #produits .table .prix-unit, .commande-form #produits .table .total {
width: 150px; width: 150px;
text-align: center; text-align: center;
} }
/* line 230, ../sass/_systeme_commandes.scss */
/* line 240, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td#total-commande, .commande-form #produits .table td#total-commande-vrac, .commande-form #produits .table td.total { .commande-form #produits .table td#total-commande, .commande-form #produits .table td#total-commande-vrac, .commande-form #produits .table td.total {
text-align: center; text-align: center;
} }
/* line 234, ../sass/_systeme_commandes.scss */
/* line 244, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .epuise { .commande-form #produits .table .epuise {
display: none; display: none;
text-transform: uppercase; text-transform: uppercase;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
} }
/* line 243, ../sass/_systeme_commandes.scss */
/* line 253, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante { .commande-form #produits .table .quantite-restante {
font-size: 12px; font-size: 12px;
margin-top: 8px; margin-top: 8px;
} }
/* line 247, ../sass/_systeme_commandes.scss */
/* line 257, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante .nb { .commande-form #produits .table .quantite-restante .nb {
font-weight: bold; font-weight: bold;
} }
/* line 252, ../sass/_systeme_commandes.scss */
/* line 262, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.produit, .commande-form #produits .table th.produit { .commande-form #produits .table td.produit, .commande-form #produits .table th.produit {
width: 70%; width: 70%;
} }
/* line 256, ../sass/_systeme_commandes.scss */
/* line 266, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.prix-unit, .commande-form #produits .table th.prix-unit { .commande-form #produits .table td.prix-unit, .commande-form #produits .table th.prix-unit {
width: 10%; width: 10%;
} }
/* line 260, ../sass/_systeme_commandes.scss */
/* line 270, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.colonne-quantite, .commande-form #produits .table th.colonne-quantite { .commande-form #produits .table td.colonne-quantite, .commande-form #produits .table th.colonne-quantite {
width: 10%; width: 10%;
} }
/* line 264, ../sass/_systeme_commandes.scss */
/* line 274, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.total, .commande-form #produits .table th.total { .commande-form #produits .table td.total, .commande-form #produits .table th.total {
width: 10%; width: 10%;
} }
/* line 270, ../sass/_systeme_commandes.scss */
/* line 280, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed { .commande-form #bar-fixed {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
background-color: #F9F9F9; background-color: #F9F9F9;
text-align: center; text-align: center;
} }
/* line 284, ../sass/_systeme_commandes.scss */
/* line 294, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom { .commande-form #bar-fixed #total-commande-bottom {
background-color: white; background-color: white;
-moz-border-radius: 20px; -moz-border-radius: 20px;
padding: 5px 25px; padding: 5px 25px;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
} }
/* line 291, ../sass/_systeme_commandes.scss */
/* line 301, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .valider-commande, .commande-form #bar-fixed .btn-commentaire { .commande-form #bar-fixed .valider-commande, .commande-form #bar-fixed .btn-commentaire {
float: right; float: right;
} }
/* line 295, ../sass/_systeme_commandes.scss */
/* line 305, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire { .commande-form #bar-fixed .btn-commentaire {
margin-right: 10px; margin-right: 10px;
} }
/* line 299, ../sass/_systeme_commandes.scss */
/* line 309, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-retour, .commande-form #bar-fixed .annuler-commande { .commande-form #bar-fixed .btn-retour, .commande-form #bar-fixed .annuler-commande {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
} }
/* line 304, ../sass/_systeme_commandes.scss */
/* line 314, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .annuler-commande { .commande-form #bar-fixed .annuler-commande {
color: #b92c28; color: #b92c28;
background-color: white; background-color: white;
} }
/* line 309, ../sass/_systeme_commandes.scss */
/* line 319, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom { .commande-form #bar-fixed #total-commande-bottom {
display: none; display: none;
font-weight: bold; font-weight: bold;
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 24px; font-size: 24px;
} }
/* line 316, ../sass/_systeme_commandes.scss */
/* line 326, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .field-commande-commentaire { .commande-form #bar-fixed .field-commande-commentaire {
display: none; display: none;
} }


/* line 324, ../sass/_systeme_commandes.scss */
/* line 334, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-widget-header { .ui-datepicker .ui-widget-header {
background: none; background: none;
background-color: gray; background-color: gray;
color: black; color: black;
font-weight: normal; font-weight: normal;
} }
/* line 332, ../sass/_systeme_commandes.scss */
/* line 342, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-datepicker-current-day a, .ui-datepicker .ui-datepicker-current-day a,
.ui-datepicker a.ui-state-hover { .ui-datepicker a.ui-state-hover {
background: none; background: none;

+ 10
- 0
frontend/web/sass/_systeme_commandes.scss View File

text-align: center ; text-align: center ;
padding-bottom: 20px; padding-bottom: 20px;
} }
#liste-boulangeries {
.logo {
width: 30% ;
max-width: 200px ;
float: left ;
padding-right: 20px ;
padding-bottom: 20px ;
}
}
#historique-commandes { #historique-commandes {
.statut, .montant { .statut, .montant {

Write Preview
Loading…
Cancel
Save