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

Améliorer page commande (bar-fixed, photos)

prodstable
keun 8 years ago
parent
0b692b9727
commit
5a7ce60900
5 changed files with 142 additions and 64 deletions
Unified View Show Diff Stats
  1. +10
    -3
      frontend/views/commande/_form.php
  2. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc
  3. +86
    -54
      frontend/web/css/screen.css
  4. +15
    -1
      frontend/web/js/lechatdesnoisettes.js
  5. +31
    -6
      frontend/web/sass/_systeme_commandes.scss

+ 10
- 3
frontend/views/commande/_form.php View File

<?= $form->field($model, 'id_production')->label('')->hiddenInput(); ?> <?= $form->field($model, 'id_production')->label('')->hiddenInput(); ?>


<?php if (isset($model->id)): ?> <?php if (isset($model->id)): ?>
<h2><?php echo date('d/m/Y', strtotime($production->date)); ?></h2>
<div class="date-commande"><span><?php echo date('d/m/Y', strtotime($production->date)); ?></span></div>
<?php endif; ?> <?php endif; ?>


<div id="datepicker-production" <?php if (isset($model->id)): ?>style="display:none"<?php endif; ?>> <div id="datepicker-production" <?php if (isset($model->id)): ?>style="display:none"<?php endif; ?>>
</div> </div>
<br />
<?php if (!isset($model->id)): ?>
<br />
<?php endif; ?>
<div id="dates" style="display:none;"> <div id="dates" style="display:none;">
<?php <?php
foreach ($jours_production as $id_production => $j) { foreach ($jours_production as $id_production => $j) {
<table class="table table-bordered" id="table-produits"> <table class="table table-bordered" id="table-produits">
<thead> <thead>
<tr> <tr>
<th class="th-photo">Photo</th>
<th class="produit">Produit</th> <th class="produit">Produit</th>
<th class="prix-unit">Prix unitaire</th> <th class="prix-unit">Prix unitaire</th>
<th class="colonne-quantite">Quantité</th> <th class="colonne-quantite">Quantité</th>
<tbody> <tbody>
<?php foreach ($produits as $p): ?> <?php foreach ($produits as $p): ?>
<tr class="produit-<?php echo $p->id; ?>" <?php if (count($produits_dispos) && !$produits_dispos[$p->id]['actif']): ?>style="display:none;"<?php endif; ?>> <tr class="produit-<?php echo $p->id; ?>" <?php if (count($produits_dispos) && !$produits_dispos[$p->id]['actif']): ?>style="display:none;"<?php endif; ?>>
<td class="td-photo">
<?php if (strlen($p->photo) && file_exists(dirname(__FILE__).'/../../web/uploads/' . $p->photo)): ?><a href="<?= Yii::$app->urlManager->getBaseUrl() . '/uploads/' . $p->photo ?>" data-lightbox="produit-<?php echo $p->id; ?>"><img class="photo img-rounded" src="<?= Yii::$app->urlManager->getBaseUrl() . '/uploads/' . $p->photo ?>" alt="Photo <?= Html::encode($p->nom); ?>" /></a><?php endif; ?>
</td>
<td class="produit"> <td class="produit">
<?php if (strlen($p->photo) && file_exists(dirname(__FILE__).'/../../web/uploads/' . $p->photo)): ?><br /><a href="<?= Yii::$app->urlManager->getBaseUrl() . '/uploads/' . $p->photo ?>" data-lightbox="produit-<?php echo $p->id; ?>"><img class="photo img-rounded img-thumbnail" src="<?= Yii::$app->urlManager->getBaseUrl() . '/uploads/' . $p->photo ?>" alt="Photo <?= Html::encode($p->nom); ?>" /></a><?php endif; ?>
<span class="nom"><?= Html::encode($p->nom); ?></span> - <span class="description"><?= Html::encode($p->getDescription()); ?></span><br /> <span class="nom"><?= Html::encode($p->nom); ?></span> - <span class="description"><?= Html::encode($p->getDescription()); ?></span><br />
<span class="recette"><?= Html::encode($p->recette); ?></span> <span class="recette"><?= Html::encode($p->recette); ?></span>
</td> </td>

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


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

border-color: #cdc3b7; border-color: #cdc3b7;
} }
/* line 232, ../sass/_systeme_commandes.scss */ /* line 232, ../sass/_systeme_commandes.scss */
.commande-form .date-commande {
margin-bottom: 53px;
}
/* line 234, ../sass/_systeme_commandes.scss */
.commande-form .date-commande span {
background-color: #BB8757;
color: white;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding: 10px;
font-family: "myriadpro-regular";
font-size: 20px;
}
/* line 244, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours { .commande-form #has-commande-en-cours {
margin-top: 15px; margin-top: 15px;
} }
/* line 235, ../sass/_systeme_commandes.scss */
/* line 247, ../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 242, ../sass/_systeme_commandes.scss */
/* line 254, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production { .commande-form .field-commande-id_production {
display: none; display: none;
} }
/* line 246, ../sass/_systeme_commandes.scss */
/* line 258, ../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 250, ../sass/_systeme_commandes.scss */
/* line 262, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production { .commande-form .field-commande-id_production {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 252, ../sass/_systeme_commandes.scss */
/* line 264, ../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 256, ../sass/_systeme_commandes.scss */
/* line 268, ../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 261, ../sass/_systeme_commandes.scss */
/* line 273, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente { .commande-form .field-commande-id_point_vente {
display: none; display: none;
} }
/* line 265, ../sass/_systeme_commandes.scss */
/* line 277, ../sass/_systeme_commandes.scss */
.commande-form .blocs { .commande-form .blocs {
list-style-type: none; list-style-type: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
/* line 270, ../sass/_systeme_commandes.scss */
/* line 282, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc { .commande-form .blocs .bloc {
text-decoration: none; text-decoration: none;
width: 268px; width: 268px;
background-color: white; background-color: white;
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
} }
/* line 285, ../sass/_systeme_commandes.scss */
/* line 297, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .nom { .commande-form .blocs .bloc .nom {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 20px; font-size: 20px;
} }
/* line 291, ../sass/_systeme_commandes.scss */
/* line 303, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .adresse { .commande-form .blocs .bloc .adresse {
color: gray; color: gray;
font-size: 13px; font-size: 13px;
line-height: 16px; line-height: 16px;
} }
/* line 297, ../sass/_systeme_commandes.scss */
/* line 309, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires { .commande-form .blocs .bloc .horaires {
margin-top: 7px; margin-top: 7px;
} }
/* line 299, ../sass/_systeme_commandes.scss */
/* line 311, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires .jour { .commande-form .blocs .bloc .horaires .jour {
font-weight: bold; font-weight: bold;
display: none; display: none;
} }
/* line 305, ../sass/_systeme_commandes.scss */
/* line 317, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected { .commande-form .blocs .bloc.selected {
border-left: solid 5px #BB8757; border-left: solid 5px #BB8757;
} }
/* line 309, ../sass/_systeme_commandes.scss */
/* line 321, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected .contenu { .commande-form .blocs .bloc.selected .contenu {
position: relative; position: relative;
left: -4px; left: -4px;
} }
/* line 315, ../sass/_systeme_commandes.scss */
/* line 327, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc:hover { .commande-form .blocs .bloc: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 320, ../sass/_systeme_commandes.scss */
/* line 332, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.disabled { .commande-form .blocs .bloc.disabled {
display: none; display: none;
} }
/* line 327, ../sass/_systeme_commandes.scss */
/* line 339, ../sass/_systeme_commandes.scss */
.commande-form #produits { .commande-form #produits {
margin-top: 15px; margin-top: 15px;
} }
/* line 330, ../sass/_systeme_commandes.scss */
/* line 342, ../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 335, ../sass/_systeme_commandes.scss */
/* line 347, ../sass/_systeme_commandes.scss */
.commande-form #produits .table { .commande-form #produits .table {
margin-top: 7px; margin-top: 7px;
} }
/* line 338, ../sass/_systeme_commandes.scss */
/* line 350, ../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 345, ../sass/_systeme_commandes.scss */
/* line 357, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .photo { .commande-form #produits .table .photo {
float: right;
margin-left: 10px;
width: 200px;
padding: 0px;
width: 120px;
}
/* line 362, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .th-photo, .commande-form #produits .table .td-photo {
width: 120px;
} }
/* line 351, ../sass/_systeme_commandes.scss */
/* line 366, ../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 358, ../sass/_systeme_commandes.scss */
/* line 373, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .description { .commande-form #produits .table .description {
font-style: italic; font-style: italic;
} }
/* line 362, ../sass/_systeme_commandes.scss */
/* line 377, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .recette { .commande-form #produits .table .recette {
font-size: 12px; font-size: 12px;
} }
/* line 366, ../sass/_systeme_commandes.scss */
/* line 381, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group { .commande-form #produits .table .input-group {
width: 133px; width: 133px;
} }
/* line 368, ../sass/_systeme_commandes.scss */
/* line 383, ../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 373, ../sass/_systeme_commandes.scss */
/* line 388, ../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 378, ../sass/_systeme_commandes.scss */
/* line 393, ../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 382, ../sass/_systeme_commandes.scss */
/* line 397, ../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 391, ../sass/_systeme_commandes.scss */
/* line 406, ../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 395, ../sass/_systeme_commandes.scss */
/* line 410, ../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 400, ../sass/_systeme_commandes.scss */
/* line 415, ../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 404, ../sass/_systeme_commandes.scss */
/* line 419, ../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 408, ../sass/_systeme_commandes.scss */
/* line 423, ../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 412, ../sass/_systeme_commandes.scss */
/* line 427, ../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 418, ../sass/_systeme_commandes.scss */
/* line 433, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed { .commande-form #bar-fixed {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px;
z-index: 100; z-index: 100;
width: 100%;
background-color: white; background-color: white;
padding: 15px; padding: 15px;
margin-bottom: 0px; margin-bottom: 0px;
-moz-box-shadow: 0 0 5px #e0e0e0;
-webkit-box-shadow: 0 0 5px #e0e0e0;
box-shadow: 0 0 5px #e0e0e0;
-moz-box-shadow: 0 0 5px gray;
-webkit-box-shadow: 0 0 5px gray;
box-shadow: 0 0 5px gray;
-moz-border-radius: 10px 10px 0px 0px;
-webkit-border-radius: 10px;
border-radius: 10px 10px 0px 0px;
border-top: solid 1px #e0e0e0; border-top: solid 1px #e0e0e0;
background-color: #F9F9F9; background-color: #F9F9F9;
background-color: #F8F1DD;
text-align: center; text-align: center;
} }
/* line 432, ../sass/_systeme_commandes.scss */
/* line 449, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed.not-fixed {
position: relative;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
border: solid 1px #e0e0e0;
padding-right: 20px;
}
/* line 457, ../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 439, ../sass/_systeme_commandes.scss */
/* line 464, ../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 443, ../sass/_systeme_commandes.scss */
/* line 468, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire { .commande-form #bar-fixed .btn-commentaire {
margin-right: 10px; margin-right: 10px;
} }
/* line 447, ../sass/_systeme_commandes.scss */
/* line 472, ../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 452, ../sass/_systeme_commandes.scss */
/* line 477, ../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 457, ../sass/_systeme_commandes.scss */
/* line 482, ../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 464, ../sass/_systeme_commandes.scss */
/* line 489, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .field-commande-commentaire { .commande-form #bar-fixed .field-commande-commentaire {
display: none; display: none;
} }


/* line 472, ../sass/_systeme_commandes.scss */
/* line 497, ../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 480, ../sass/_systeme_commandes.scss */
/* line 505, ../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;

+ 15
- 1
frontend/web/js/lechatdesnoisettes.js View File

return false ; return false ;
}) ; }) ;
// bar fixed
if($('#bar-fixed').size()) {
$(window).scroll(function (event) {
var scroll = $(window).scrollTop() + $(window).height();
var pos_bottom_produits = $('#table-produits').offset().top + $('#table-produits').height() + 100 ;
if(scroll > pos_bottom_produits) {
if(!$('#bar-fixed').hasClass('not-fixed')) {
$('#bar-fixed').addClass('not-fixed') ;
}
}
else {
$('#bar-fixed').removeClass('not-fixed') ;
}
});
}
} }


function chat_systeme_commande_produits_dispos(str_date, date) { function chat_systeme_commande_produits_dispos(str_date, date) {

+ 31
- 6
frontend/web/sass/_systeme_commandes.scss View File

} }
} }
} }
.date-commande {
margin-bottom: 53px ;
span {
background-color: $color1 ;
color: white ;
@include border-radius(10px) ;
padding: 10px ;
font-family: "myriadpro-regular";
font-size: 20px ;
}
}
#has-commande-en-cours { #has-commande-en-cours {
margin-top: 15px ; margin-top: 15px ;
} }
.photo { .photo {
float: right ;
margin-left: 10px ;
width: 200px ;
padding: 0px ;
width: 120px ;
} }
.th-photo, .td-photo {
width: 120px ;
}
.nom { .nom {
font-family: "comfortaalight" ; font-family: "comfortaalight" ;
#bar-fixed { #bar-fixed {
position: fixed ; position: fixed ;
bottom: 0px ; bottom: 0px ;
left: 0px ;
//left: 0px ;
z-index: 100 ; z-index: 100 ;
width: 100% ;
//width: 100% ;
background-color: white ; background-color: white ;
padding: 15px ; padding: 15px ;
margin-bottom: 0px ; margin-bottom: 0px ;
@include box-shadow(0 0 5px #e0e0e0) ;
@include box-shadow(0 0 5px gray) ;
@include border-radius(10px 10px 0px 0px) ;
border-top: solid 1px #e0e0e0 ; border-top: solid 1px #e0e0e0 ;
background-color: #F9F9F9 ; background-color: #F9F9F9 ;
background-color: $color2 ;
text-align: center ; text-align: center ;
&.not-fixed {
position: relative ;
@include box-shadow(none) ;
@include border-radius(0px) ;
border: solid 1px #e0e0e0 ;
padding-right: 20px ;
}
#total-commande-bottom { #total-commande-bottom {
background-color: white ; background-color: white ;
@include border-radius(20px) ; @include border-radius(20px) ;

Write Preview
Loading…
Cancel
Save