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

Merge branch 'feature/amelioration_infos_depot' into dev

refactoring
keun 6 years ago
parent
2e152b097d f577c4a906
commit
c4d22fa599
7 changed files with 300 additions and 263 deletions
Unified View Show Diff Stats
  1. +1
    -1
      backend/views/point-vente/_form.php
  2. +11
    -0
      common/models/PointVente.php
  3. +20
    -10
      producer/views/commande/_form.php
  4. BIN
      producer/web/.sass-cache/02dccb5f9955880bcb6e5ad5d1fece2607a7ff62/_form.scssc
  5. +229
    -213
      producer/web/css/screen.css
  6. +15
    -26
      producer/web/js/lechatdesnoisettes.js
  7. +24
    -13
      producer/web/sass/commande/_form.scss

+ 1
- 1
backend/views/point-vente/_form.php View File

</div> </div>
<div class="clr"></div> <div class="clr"></div>
<h2>Horaires</h2>
<h2>Informations</h2>
<?= $form->field($model, 'horaires_lundi')->textarea(['rows' => 3]) ?> <?= $form->field($model, 'horaires_lundi')->textarea(['rows' => 3]) ?>
<?= $form->field($model, 'horaires_mardi')->textarea(['rows' => 3]) ?> <?= $form->field($model, 'horaires_mardi')->textarea(['rows' => 3]) ?>
<?= $form->field($model, 'horaires_mercredi')->textarea(['rows' => 3]) ?> <?= $form->field($model, 'horaires_mercredi')->textarea(['rows' => 3]) ?>

+ 11
- 0
common/models/PointVente.php View File

else else
return '' ; return '' ;
} }
public function strInfos($jour) {
$str = '' ;
$champs = 'horaires_'.$jour ;
if(strlen($this->$champs)) {
$str = nl2br(Html::encode($this->$champs)) ;
$str = preg_replace('/\[select_previous_day\](.*?)\[\/select_previous_day\]/', '<a href="javascript:void(0);" class="select-previous-day">$1</a>' , $str) ;
}
return $str ;
}


} }

+ 20
- 10
producer/views/commande/_form.php View File

'<span style="display:none;" class="id">' . $pv->id . '</span>' . '<span style="display:none;" class="id">' . $pv->id . '</span>' .
'<div class="nom">' .$html_code. Html::encode($pv->nom) . '</div>' . '<div class="nom">' .$html_code. Html::encode($pv->nom) . '</div>' .
'<div class="adresse">à ' . Html::encode($pv->localite) . '</div>' . '<div class="adresse">à ' . Html::encode($pv->localite) . '</div>' .
'<div class="horaires">' .
'<div class="jour jour-1">' . (strlen($pv->horaires_lundi) ? nl2br(Html::encode($pv->horaires_lundi)) : 'Fermé') . '</div>' .
'<div class="jour jour-2">' . (strlen($pv->horaires_mardi) ? nl2br(Html::encode($pv->horaires_mardi)) : 'Fermé') . '</div>' .
'<div class="jour jour-3">' . (strlen($pv->horaires_mercredi) ? nl2br(Html::encode($pv->horaires_mercredi)) : 'Fermé') . '</div>' .
'<div class="jour jour-4">' . (strlen($pv->horaires_jeudi) ? nl2br(Html::encode($pv->horaires_jeudi)) : 'Fermé') . '</div>' .
'<div class="jour jour-5">' . (strlen($pv->horaires_vendredi) ? nl2br(Html::encode($pv->horaires_vendredi)) : 'Fermé') . '</div>' .
'<div class="jour jour-6">' . (strlen($pv->horaires_samedi) ? nl2br(Html::encode($pv->horaires_samedi)) : 'Fermé') . '</div>' .
'<div class="jour jour-0">' . (strlen($pv->horaires_dimanche) ? nl2br(Html::encode($pv->horaires_dimanche)) : 'Fermé') . '</div>' .
'</div>'
. $commentaire .
$commentaire .
'<input type="hidden" name="code_point_vente_'.$pv->id.'" value="'.$code.'" />'. '<input type="hidden" name="code_point_vente_'.$pv->id.'" value="'.$code.'" />'.
'</div></li>'; '</div></li>';
} }
?> ?>
</ul> </ul>
<div class="clr"></div>
<div id="step-infos-pv">
<?php
foreach ($points_vente as $pv) {
echo '<div class="alert alert-warning infos-pv infos-pv-'.$pv->id.'"><h4>Infos : <span>'.Html::encode($pv->nom).'</span></h4>' .
'<div class="jour jour-1">' . $pv->strInfos('lundi') . '</div>' .
'<div class="jour jour-2">' . $pv->strInfos('mardi') . '</div>' .
'<div class="jour jour-3">' . $pv->strInfos('mercredi') . '</div>' .
'<div class="jour jour-4">' . $pv->strInfos('jeudi') . '</div>' .
'<div class="jour jour-5">' . $pv->strInfos('vendredi') . '</div>' .
'<div class="jour jour-6">' . $pv->strInfos('samedi') . '</div>' .
'<div class="jour jour-0">' . $pv->strInfos('dimanche') . '</div>' .
'</div>' ;
}
?>
</div>
<div class="clr"></div> <div class="clr"></div>
</div> </div>

BIN
producer/web/.sass-cache/02dccb5f9955880bcb6e5ad5d1fece2607a7ff62/_form.scssc View File


+ 229
- 213
producer/web/css/screen.css View File

} }


/* line 4, ../sass/commande/_form.scss */ /* line 4, ../sass/commande/_form.scss */
.commande-create .commande-form,
.commande-update .commande-form {
.commande-create #main #content .commande-form,
.commande-update #main #content .commande-form {
min-height: 600px; min-height: 600px;
padding-bottom: 60px; padding-bottom: 60px;
} }
/* line 9, ../sass/commande/_form.scss */ /* line 9, ../sass/commande/_form.scss */
.commande-create .commande-form h2,
.commande-update .commande-form h2 {
.commande-create #main #content .commande-form h2,
.commande-update #main #content .commande-form h2 {
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
} }
/* line 13, ../sass/commande/_form.scss */ /* line 13, ../sass/commande/_form.scss */
.commande-create .commande-form #infos-importantes.alert-warning,
.commande-update .commande-form #infos-importantes.alert-warning {
.commande-create #main #content .commande-form #infos-importantes.alert-warning,
.commande-update #main #content .commande-form #infos-importantes.alert-warning {
float: right; float: right;
} }
/* line 19, ../sass/commande/_form.scss */ /* line 19, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker,
.commande-update .commande-form #datepicker-production .ui-datepicker {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
font-size: 20px; font-size: 20px;
} }
/* line 25, ../sass/commande/_form.scss */ /* line 25, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker-header,
.commande-update .commande-form #datepicker-production .ui-datepicker-header {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-header,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-header {
background-color: #BB8757; background-color: #BB8757;
} }
/* line 29, ../sass/commande/_form.scss */ /* line 29, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker-title,
.commande-update .commande-form #datepicker-production .ui-datepicker-title {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-title,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-title {
color: white; color: white;
} }
/* line 35, ../sass/commande/_form.scss */ /* line 35, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-create .commande-form #datepicker-production .ui-datepicker-next:hover,
.commande-update .commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-update .commande-form #datepicker-production .ui-datepicker-next:hover {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-next:hover,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-next:hover {
border: 0px none; border: 0px none;
background: none; background: none;
} }
/* line 41, ../sass/commande/_form.scss */ /* line 41, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-helper-clearfix:after,
.commande-update .commande-form #datepicker-production .ui-helper-clearfix:after {
.commande-create #main #content .commande-form #datepicker-production .ui-helper-clearfix:after,
.commande-update #main #content .commande-form #datepicker-production .ui-helper-clearfix:after {
clear: none; clear: none;
} }
/* line 46, ../sass/commande/_form.scss */ /* line 46, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker-calendar a,
.commande-update .commande-form #datepicker-production .ui-datepicker-calendar a {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-calendar a,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-calendar a {
text-decoration: none; text-decoration: none;
background-color: #F8F1DD; background-color: #F8F1DD;
} }
/* line 49, ../sass/commande/_form.scss */ /* line 49, ../sass/commande/_form.scss */
.commande-create .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover, .commande-create .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active,
.commande-update .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover,
.commande-update .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active {
.commande-create #main #content .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover, .commande-create #main #content .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover,
.commande-update #main #content .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
border-color: #cdc3b7; border-color: #cdc3b7;
} }
/* line 58, ../sass/commande/_form.scss */ /* line 58, ../sass/commande/_form.scss */
.commande-create .commande-form .date-commande,
.commande-update .commande-form .date-commande {
.commande-create #main #content .commande-form .date-commande,
.commande-update #main #content .commande-form .date-commande {
margin-bottom: 53px; margin-bottom: 53px;
} }
/* line 60, ../sass/commande/_form.scss */ /* line 60, ../sass/commande/_form.scss */
.commande-create .commande-form .date-commande span,
.commande-update .commande-form .date-commande span {
.commande-create #main #content .commande-form .date-commande span,
.commande-update #main #content .commande-form .date-commande span {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
-moz-border-radius: 10px; -moz-border-radius: 10px;
font-size: 20px; font-size: 20px;
} }
/* line 70, ../sass/commande/_form.scss */ /* line 70, ../sass/commande/_form.scss */
.commande-create .commande-form #has-commande-en-cours,
.commande-update .commande-form #has-commande-en-cours {
.commande-create #main #content .commande-form #has-commande-en-cours,
.commande-update #main #content .commande-form #has-commande-en-cours {
margin-top: 15px; margin-top: 15px;
} }
/* line 73, ../sass/commande/_form.scss */ /* line 73, ../sass/commande/_form.scss */
.commande-create .commande-form #has-commande-en-cours a,
.commande-update .commande-form #has-commande-en-cours a {
.commande-create #main #content .commande-form #has-commande-en-cours a,
.commande-update #main #content .commande-form #has-commande-en-cours a {
color: #a94442; color: #a94442;
text-decoration: none; text-decoration: none;
font-weight: bold; font-weight: bold;
} }
/* line 80, ../sass/commande/_form.scss */ /* line 80, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_production,
.commande-update .commande-form .field-commande-id_production {
.commande-create #main #content .commande-form .field-commande-id_production,
.commande-update #main #content .commande-form .field-commande-id_production {
display: none; display: none;
} }
/* line 84, ../sass/commande/_form.scss */ /* line 84, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_point_vente,
.commande-update .commande-form .field-commande-id_point_vente {
.commande-create #main #content .commande-form .field-commande-id_point_vente,
.commande-update #main #content .commande-form .field-commande-id_point_vente {
margin-top: 30px; margin-top: 30px;
} }
/* line 88, ../sass/commande/_form.scss */ /* line 88, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_production,
.commande-update .commande-form .field-commande-id_production {
.commande-create #main #content .commande-form .field-commande-id_production,
.commande-update #main #content .commande-form .field-commande-id_production {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 90, ../sass/commande/_form.scss */ /* line 90, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_production label,
.commande-update .commande-form .field-commande-id_production label {
.commande-create #main #content .commande-form .field-commande-id_production label,
.commande-update #main #content .commande-form .field-commande-id_production label {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 94, ../sass/commande/_form.scss */ /* line 94, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_production .help-block,
.commande-update .commande-form .field-commande-id_production .help-block {
.commande-create #main #content .commande-form .field-commande-id_production .help-block,
.commande-update #main #content .commande-form .field-commande-id_production .help-block {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 99, ../sass/commande/_form.scss */ /* line 99, ../sass/commande/_form.scss */
.commande-create .commande-form .field-commande-id_point_vente,
.commande-update .commande-form .field-commande-id_point_vente {
.commande-create #main #content .commande-form .field-commande-id_point_vente,
.commande-update #main #content .commande-form .field-commande-id_point_vente {
display: none; display: none;
} }
/* line 103, ../sass/commande/_form.scss */ /* line 103, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs,
.commande-update .commande-form .blocs {
.commande-create #main #content .commande-form .blocs,
.commande-update #main #content .commande-form .blocs {
list-style-type: none; list-style-type: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
/* line 108, ../sass/commande/_form.scss */ /* line 108, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc,
.commande-update .commande-form .blocs .bloc {
.commande-create #main #content .commande-form .blocs .bloc,
.commande-update #main #content .commande-form .blocs .bloc {
text-decoration: none; text-decoration: none;
width: 268px; width: 268px;
height: 130px; height: 130px;
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;
} }
/* line 123, ../sass/commande/_form.scss */ /* line 123, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .nom,
.commande-update .commande-form .blocs .bloc .nom {
.commande-create #main #content .commande-form .blocs .bloc .nom,
.commande-update #main #content .commande-form .blocs .bloc .nom {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 20px; font-size: 20px;
padding-bottom: 10px; padding-bottom: 10px;
} }
/* line 129, ../sass/commande/_form.scss */ /* line 129, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .adresse,
.commande-update .commande-form .blocs .bloc .adresse {
.commande-create #main #content .commande-form .blocs .bloc .adresse,
.commande-update #main #content .commande-form .blocs .bloc .adresse {
color: gray; color: gray;
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
} }
/* line 135, ../sass/commande/_form.scss */ /* line 135, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .horaires,
.commande-update .commande-form .blocs .bloc .horaires {
margin-top: 7px;
}
/* line 137, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .horaires .jour,
.commande-update .commande-form .blocs .bloc .horaires .jour {
font-weight: bold;
display: none;
}
/* line 144, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc.selected,
.commande-update .commande-form .blocs .bloc.selected {
.commande-create #main #content .commande-form .blocs .bloc.selected,
.commande-update #main #content .commande-form .blocs .bloc.selected {
border-left: solid 5px #BB8757; border-left: solid 5px #BB8757;
} }
/* line 147, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc.selected .contenu,
.commande-update .commande-form .blocs .bloc.selected .contenu {
/* line 137, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .blocs .bloc.selected .contenu,
.commande-update #main #content .commande-form .blocs .bloc.selected .contenu {
position: relative; position: relative;
left: -4px; left: -4px;
} }
/* line 153, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc:hover,
.commande-update .commande-form .blocs .bloc:hover {
/* line 143, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .blocs .bloc:hover,
.commande-update #main #content .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 158, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc.disabled,
.commande-update .commande-form .blocs .bloc.disabled {
/* line 147, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .blocs .bloc.disabled,
.commande-update #main #content .commande-form .blocs .bloc.disabled {
display: none; display: none;
} }
/* line 163, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .commentaire,
.commande-update .commande-form .blocs .bloc .commentaire {
/* line 151, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .blocs .bloc .commentaire,
.commande-update #main #content .commande-form .blocs .bloc .commentaire {
margin-top: 5px; margin-top: 5px;
} }
/* line 165, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .commentaire span,
.commande-update .commande-form .blocs .bloc .commentaire span {
/* line 153, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .blocs .bloc .commentaire span,
.commande-update #main #content .commande-form .blocs .bloc .commentaire span {
background-color: #BB8757; background-color: #BB8757;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
font-weight: bold; font-weight: bold;
padding: 3px 10px; padding: 3px 10px;
} }
/* line 164, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .infos-pv,
.commande-update #main #content .commande-form .infos-pv {
display: none;
margin-top: 15px;
}
/* line 168, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .infos-pv h4,
.commande-update #main #content .commande-form .infos-pv h4 {
margin-top: 0px;
padding-top: 0px;
text-align: left;
text-transform: uppercase;
font-weight: bold;
font-family: "myriadpro-semibold";
}
/* line 176, ../sass/commande/_form.scss */ /* line 176, ../sass/commande/_form.scss */
.commande-create .commande-form #produits,
.commande-update .commande-form #produits {
.commande-create #main #content .commande-form .infos-pv h4 span,
.commande-update #main #content .commande-form .infos-pv h4 span {
font-family: "myriadpro-regular";
text-transform: none;
}
/* line 182, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form .infos-pv a,
.commande-update #main #content .commande-form .infos-pv a {
text-decoration: underline;
}
/* line 187, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits,
.commande-update #main #content .commande-form #produits {
margin-top: 15px; margin-top: 15px;
} }
/* line 179, ../sass/commande/_form.scss */
.commande-create .commande-form #produits #label-produits,
.commande-update .commande-form #produits #label-produits {
/* line 190, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits #label-produits,
.commande-update #main #content .commande-form #produits #label-produits {
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
} }
/* line 184, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table,
.commande-update .commande-form #produits .table {
/* line 195, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table,
.commande-update #main #content .commande-form #produits .table {
margin-top: 7px; margin-top: 7px;
} }
/* line 187, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .illu,
.commande-update .commande-form #produits .table .illu {
/* line 198, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .illu,
.commande-update #main #content .commande-form #produits .table .illu {
float: left; float: left;
height: auto; height: auto;
width: 70px; width: 70px;
margin-right: 15px; margin-right: 15px;
} }
/* line 194, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .photo,
.commande-update .commande-form #produits .table .photo {
/* line 205, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .photo,
.commande-update #main #content .commande-form #produits .table .photo {
padding: 0px; padding: 0px;
width: 120px; width: 120px;
} }
/* line 199, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .th-photo, .commande-create .commande-form #produits .table .td-photo,
.commande-update .commande-form #produits .table .th-photo,
.commande-update .commande-form #produits .table .td-photo {
/* line 210, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .th-photo, .commande-create #main #content .commande-form #produits .table .td-photo,
.commande-update #main #content .commande-form #produits .table .th-photo,
.commande-update #main #content .commande-form #produits .table .td-photo {
width: 120px; width: 120px;
} }
/* line 203, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .nom,
.commande-update .commande-form #produits .table .nom {
/* line 214, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .nom,
.commande-update #main #content .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/commande/_form.scss */
.commande-create .commande-form #produits .table .description,
.commande-update .commande-form #produits .table .description {
/* line 221, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .description,
.commande-update #main #content .commande-form #produits .table .description {
font-style: italic; font-style: italic;
} }
/* line 214, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .recette,
.commande-update .commande-form #produits .table .recette {
/* line 225, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .recette,
.commande-update #main #content .commande-form #produits .table .recette {
font-size: 12px; font-size: 12px;
} }
/* line 218, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .input-group,
.commande-update .commande-form #produits .table .input-group {
/* line 229, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .input-group,
.commande-update #main #content .commande-form #produits .table .input-group {
width: 133px; width: 133px;
} }
/* line 220, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .input-group .quantity,
.commande-update .commande-form #produits .table .input-group .quantity {
/* line 231, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .input-group .quantity,
.commande-update #main #content .commande-form #produits .table .input-group .quantity {
text-align: center; text-align: center;
} }
/* line 225, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .colonne-quantite, .commande-create .commande-form #produits .table .prix-unit, .commande-create .commande-form #produits .table .total,
.commande-update .commande-form #produits .table .colonne-quantite,
.commande-update .commande-form #produits .table .prix-unit,
.commande-update .commande-form #produits .table .total {
/* line 236, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .colonne-quantite, .commande-create #main #content .commande-form #produits .table .prix-unit, .commande-create #main #content .commande-form #produits .table .total,
.commande-update #main #content .commande-form #produits .table .colonne-quantite,
.commande-update #main #content .commande-form #produits .table .prix-unit,
.commande-update #main #content .commande-form #produits .table .total {
width: 150px; width: 150px;
text-align: center; text-align: center;
} }
/* line 230, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table td#total-commande, .commande-create .commande-form #produits .table td#total-commande-vrac, .commande-create .commande-form #produits .table td.total,
.commande-update .commande-form #produits .table td#total-commande,
.commande-update .commande-form #produits .table td#total-commande-vrac,
.commande-update .commande-form #produits .table td.total {
/* line 241, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table td#total-commande, .commande-create #main #content .commande-form #produits .table td#total-commande-vrac, .commande-create #main #content .commande-form #produits .table td.total,
.commande-update #main #content .commande-form #produits .table td#total-commande,
.commande-update #main #content .commande-form #produits .table td#total-commande-vrac,
.commande-update #main #content .commande-form #produits .table td.total {
text-align: center; text-align: center;
} }
/* line 234, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .epuise,
.commande-update .commande-form #produits .table .epuise {
/* line 245, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .epuise,
.commande-update #main #content .commande-form #produits .table .epuise {
display: none; display: none;
text-transform: uppercase; text-transform: uppercase;
color: #B32815; color: #B32815;
font-size: 16px; font-size: 16px;
text-align: center; text-align: center;
} }
/* line 243, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .quantite-restante,
.commande-update .commande-form #produits .table .quantite-restante {
/* line 254, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .quantite-restante,
.commande-update #main #content .commande-form #produits .table .quantite-restante {
font-size: 12px; font-size: 12px;
margin-top: 8px; margin-top: 8px;
} }
/* line 247, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table .quantite-restante .nb,
.commande-update .commande-form #produits .table .quantite-restante .nb {
/* line 258, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table .quantite-restante .nb,
.commande-update #main #content .commande-form #produits .table .quantite-restante .nb {
font-weight: bold; font-weight: bold;
} }
/* line 252, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table td.produit, .commande-create .commande-form #produits .table th.produit,
.commande-update .commande-form #produits .table td.produit,
.commande-update .commande-form #produits .table th.produit {
/* line 263, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table td.produit, .commande-create #main #content .commande-form #produits .table th.produit,
.commande-update #main #content .commande-form #produits .table td.produit,
.commande-update #main #content .commande-form #produits .table th.produit {
width: 70%; width: 70%;
} }
/* line 256, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table td.prix-unit, .commande-create .commande-form #produits .table th.prix-unit,
.commande-update .commande-form #produits .table td.prix-unit,
.commande-update .commande-form #produits .table th.prix-unit {
/* line 267, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table td.prix-unit, .commande-create #main #content .commande-form #produits .table th.prix-unit,
.commande-update #main #content .commande-form #produits .table td.prix-unit,
.commande-update #main #content .commande-form #produits .table th.prix-unit {
width: 10%; width: 10%;
} }
/* line 260, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table td.colonne-quantite, .commande-create .commande-form #produits .table th.colonne-quantite,
.commande-update .commande-form #produits .table td.colonne-quantite,
.commande-update .commande-form #produits .table th.colonne-quantite {
/* line 271, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table td.colonne-quantite, .commande-create #main #content .commande-form #produits .table th.colonne-quantite,
.commande-update #main #content .commande-form #produits .table td.colonne-quantite,
.commande-update #main #content .commande-form #produits .table th.colonne-quantite {
width: 10%; width: 10%;
} }
/* line 264, ../sass/commande/_form.scss */
.commande-create .commande-form #produits .table td.total, .commande-create .commande-form #produits .table th.total,
.commande-update .commande-form #produits .table td.total,
.commande-update .commande-form #produits .table th.total {
/* line 275, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #produits .table td.total, .commande-create #main #content .commande-form #produits .table th.total,
.commande-update #main #content .commande-form #produits .table td.total,
.commande-update #main #content .commande-form #produits .table th.total {
width: 10%; width: 10%;
} }
/* line 270, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed,
.commande-update .commande-form #bar-fixed {
/* line 281, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed,
.commande-update #main #content .commande-form #bar-fixed {
display: none; display: none;
width: 100%; width: 100%;
position: fixed; position: fixed;
background-color: #F8F1DD; background-color: #F8F1DD;
text-align: center; text-align: center;
} }
/* line 286, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .container,
.commande-update .commande-form #bar-fixed .container {
/* line 297, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .container,
.commande-update #main #content .commande-form #bar-fixed .container {
min-height: auto; min-height: auto;
background: none; background: none;
border: 0px none; border: 0px none;
} }
/* line 292, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.not-fixed,
.commande-update .commande-form #bar-fixed.not-fixed {
/* line 303, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed.not-fixed,
.commande-update #main #content .commande-form #bar-fixed.not-fixed {
position: relative; position: relative;
-moz-box-shadow: none; -moz-box-shadow: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
padding-right: 20px; padding-right: 20px;
} }
/* line 299, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.not-fixed .container,
.commande-update .commande-form #bar-fixed.not-fixed .container {
/* line 310, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed.not-fixed .container,
.commande-update #main #content .commande-form #bar-fixed.not-fixed .container {
width: auto; width: auto;
} }
/* line 305, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande,
.commande-update .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande {
/* line 316, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande,
.commande-update #main #content .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande {
margin-top: 0px; margin-top: 0px;
float: right; float: right;
} }
/* line 311, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #total-commande-bottom,
.commande-update .commande-form #bar-fixed #total-commande-bottom {
/* line 322, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #total-commande-bottom,
.commande-update #main #content .commande-form #bar-fixed #total-commande-bottom {
background-color: white; background-color: white;
-moz-border-radius: 20px; -moz-border-radius: 20px;
-webkit-border-radius: 20px; -webkit-border-radius: 20px;
padding: 5px 25px; padding: 5px 25px;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
} }
/* line 318, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-commentaire,
.commande-update .commande-form #bar-fixed .btn-commentaire {
/* line 329, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .btn-commentaire,
.commande-update #main #content .commande-form #bar-fixed .btn-commentaire {
float: left; float: left;
} }
/* line 326, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-commentaire,
.commande-update .commande-form #bar-fixed .btn-commentaire {
/* line 337, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .btn-commentaire,
.commande-update #main #content .commande-form #bar-fixed .btn-commentaire {
margin-right: 10px; margin-right: 10px;
} }
/* line 330, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #bloc-valider-commande,
.commande-update .commande-form #bar-fixed #bloc-valider-commande {
/* line 341, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #bloc-valider-commande,
.commande-update #main #content .commande-form #bar-fixed #bloc-valider-commande {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
/* line 334, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #bloc-valider-commande button,
.commande-update .commande-form #bar-fixed #bloc-valider-commande button {
/* line 345, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #bloc-valider-commande button,
.commande-update #main #content .commande-form #bar-fixed #bloc-valider-commande button {
width: 340px; width: 340px;
margin-right: 10px; margin-right: 10px;
} }
/* line 340, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain {
/* line 351, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain {
float: right; float: right;
width: 340px; width: 340px;
padding: 3px 11px; padding: 3px 11px;
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 1px rgba(0, 0, 0, 0.075);
} }
/* line 351, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible {
/* line 362, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible {
background-color: #e0e0e0; background-color: #e0e0e0;
} }
/* line 355, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .info,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .info {
/* line 366, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain .info,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain .info {
color: gray; color: gray;
font-weight: normal; font-weight: normal;
} }
/* line 360, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .the-credit,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .the-credit {
/* line 371, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain .the-credit,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain .the-credit {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
padding: 2px 8px; padding: 2px 8px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
/* line 367, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .montant-paye,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .montant-paye {
/* line 378, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain .montant-paye,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain .montant-paye {
color: #BB8757; color: #BB8757;
} }
/* line 371, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide {
/* line 382, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide {
font-size: 12px; font-size: 12px;
} }
/* line 375, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled {
/* line 386, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled,
.commande-update #main #content .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled {
display: none; display: none;
font-size: 12px; font-size: 12px;
} }
/* line 381, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-retour, .commande-create .commande-form #bar-fixed .annuler-commande,
.commande-update .commande-form #bar-fixed .btn-retour,
.commande-update .commande-form #bar-fixed .annuler-commande {
/* line 392, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .btn-retour, .commande-create #main #content .commande-form #bar-fixed .annuler-commande,
.commande-update #main #content .commande-form #bar-fixed .btn-retour,
.commande-update #main #content .commande-form #bar-fixed .annuler-commande {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
} }
/* line 386, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .annuler-commande,
.commande-update .commande-form #bar-fixed .annuler-commande {
/* line 397, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .annuler-commande,
.commande-update #main #content .commande-form #bar-fixed .annuler-commande {
color: #b92c28; color: #b92c28;
background-color: white; background-color: white;
} }
/* line 391, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #total-commande-bottom,
.commande-update .commande-form #bar-fixed #total-commande-bottom {
/* line 402, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed #total-commande-bottom,
.commande-update #main #content .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 398, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .field-commande-commentaire,
.commande-update .commande-form #bar-fixed .field-commande-commentaire {
/* line 409, ../sass/commande/_form.scss */
.commande-create #main #content .commande-form #bar-fixed .field-commande-commentaire,
.commande-update #main #content .commande-form #bar-fixed .field-commande-commentaire {
display: none; display: none;
} }
/* line 406, ../sass/commande/_form.scss */
/* line 417, ../sass/commande/_form.scss */
.commande-create .ui-datepicker .ui-widget-header, .commande-create .ui-datepicker .ui-widget-header,
.commande-update .ui-datepicker .ui-widget-header { .commande-update .ui-datepicker .ui-widget-header {
background: none; background: none;
color: black; color: black;
font-weight: normal; font-weight: normal;
} }
/* line 414, ../sass/commande/_form.scss */
/* line 425, ../sass/commande/_form.scss */
.commande-create .ui-datepicker .ui-datepicker-current-day a, .commande-create .ui-datepicker .ui-datepicker-current-day a,
.commande-create .ui-datepicker a.ui-state-hover, .commande-create .ui-datepicker a.ui-state-hover,
.commande-update .ui-datepicker .ui-datepicker-current-day a, .commande-update .ui-datepicker .ui-datepicker-current-day a,

+ 15
- 26
producer/web/js/lechatdesnoisettes.js View File

chat_systeme_commande_credit_pain_event(chat_systeme_commande_maj_table_prix()) ; chat_systeme_commande_credit_pain_event(chat_systeme_commande_maj_table_prix()) ;


// scroll // scroll
if(!force)
boulange_scroll('step-choix-produits') ;
if(!force) {
boulange_scroll('step-infos-pv') ;
}


// infos point de vente
$('.infos-pv').hide() ;
$('.infos-pv-'+id).fadeIn() ;
} }
} }


function chat_init_horaire_point_vente(date) { function chat_init_horaire_point_vente(date) {
$('#points-vente .horaires .jour').hide() ;
var selector_jour = '#points-vente .horaires .jour-'+date.getDay() ;
$(selector_jour).show() ;
// on cache les points de vente si la livraison n'est pas cochée
/*$('#points-vente .point-vente').show() ;
if($('#livraison').val() == 0) {
$('#points-vente .point-vente').hide() ;
$('#points-vente .point-vente').each(function() {
if($(this).find('.nom').html() == 'Le Chat des Noisettes') {
$(this).show() ;
}
}) ;
}*/
// on cache les points de vente qui sont fermés
//$('#points-vente .point-vente').removeClass('disabled') ;
/*$(selector_jour).each(function() {
if($(this).html() == 'Fermé') {
//$(this).parent().parent().parent().addClass('disabled') ;
$(this).parent().parent().parent().hide() ;
}
}) ;*/
$('.infos-pv .jour').hide() ;
var selector_jour = '.infos-pv .jour-'+date.getDay() ;
$(selector_jour).show() ;
$('.select-previous-day').unbind('click').click(function() {
$('.ui-datepicker-current-day').prev().find('a').click() ;
}) ;
} }


function chat_base_url(with_slug) { function chat_base_url(with_slug) {
}, },
onSelect: function(selectedDate) { onSelect: function(selectedDate) {
$('.infos-pv').hide() ;
// on remet tout les prix à zéro // on remet tout les prix à zéro
chat_systeme_commande_reset_table_prix() ; chat_systeme_commande_reset_table_prix() ;

+ 24
- 13
producer/web/sass/commande/_form.scss View File

.commande-create, .commande-create,
.commande-update { .commande-update {
.commande-form {
#main #content .commande-form {


min-height: 600px ; min-height: 600px ;
padding-bottom: 60px ; padding-bottom: 60px ;
line-height: 20px ; line-height: 20px ;
} }


.horaires {
margin-top: 7px ;
.jour {
font-weight: bold ;
display: none ;
}
}


&.selected { &.selected {
border-left: solid 5px $color1 ; border-left: solid 5px $color1 ;
//@include box-shadow(0px 0px 5px #d8d8d8) ;
.contenu { .contenu {
position: relative ; position: relative ;
left: -4px ; left: -4px ;


&:hover { &:hover {
@include box-shadow(0px 0px 5px #d8d8d8) ; @include box-shadow(0px 0px 5px #d8d8d8) ;
//@include box-shadow(none) ;
} }


&.disabled { &.disabled {
display: none ; display: none ;
//color: gray ;
} }


.commentaire { .commentaire {
} }
} }
} }
.infos-pv {
display: none;
margin-top: 15px ;
h4 {
margin-top: 0px ;
padding-top: 0px ;
text-align: left ;
text-transform: uppercase ;
font-weight: bold ;
font-family: 'myriadpro-semibold' ;
span {
font-family: 'myriadpro-regular' ;
text-transform: none ;
}
}
a {
text-decoration: underline ;
}
}


#produits { #produits {
margin-top: 15px ; margin-top: 15px ;

Write Preview
Loading…
Cancel
Save