BenoitCier
/
Opendistrib
forked from Laclic/Souke
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Système de commentaires pour les points de vente (boites à pain) 

Le boulanger peut spécifier un commentaire pour chaque utilisateur sélectionné dans les points de vente à accès restreint. L'utilisateur retrouve ce commentaire au niveau du choix des points de vente et dans le récapitulatif des commandes. Le boulanger, quant à lui, retrouve ce commentaire dans l'export des commandes en PDF.
master
keun 8 years ago
parent
03e025b10d
commit
02abcb4211
19 changed files with 272 additions and 86 deletions
Unified View Show Diff Stats
  1. +1
    -1
      backend/controllers/CommandeController.php
  2. +1
    -0
      backend/controllers/PointVenteController.php
  3. +5
    -0
      backend/views/commande/report.php
  4. +18
    -5
      backend/views/point-vente/_form.php
  5. BIN
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  6. +8
    -2
      backend/web/css/screen.css
  7. +18
    -0
      backend/web/js/lechatdesnoisettes.js
  8. +5
    -0
      backend/web/sass/screen.scss
  9. +2
    -2
      common/models/Commande.php
  10. +18
    -2
      common/models/PointVente.php
  11. +2
    -0
      common/models/PointVenteUser.php
  12. +17
    -0
      console/migrations/m161215_071544_add_champs_commentaire_points_vente.php
  13. +17
    -0
      console/migrations/m161215_084317_champs_commentaire_point_vente_commande.php
  14. +10
    -0
      frontend/controllers/CommandeController.php
  15. +16
    -3
      frontend/views/commande/_form.php
  16. +11
    -1
      frontend/views/commande/index.php
  17. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc
  18. +100
    -70
      frontend/web/css/screen.css
  19. +23
    -0
      frontend/web/sass/_systeme_commandes.scss

+ 1
- 1
backend/controllers/CommandeController.php View File

$id_etablissement = Yii::$app->user->identity->id_etablissement ; $id_etablissement = Yii::$app->user->identity->id_etablissement ;
$commandes = Commande::find() $commandes = Commande::find()
->with('commandeProduits', 'user', 'creditHistorique')
->with('commandeProduits', 'user', 'creditHistorique', 'pointVente')
->joinWith('production') ->joinWith('production')
->where(['production.date' => $date]) ->where(['production.date' => $date])
->andWhere(['production.id_etablissement' => $id_etablissement]) ->andWhere(['production.id_etablissement' => $id_etablissement])

+ 1
- 0
backend/controllers/PointVenteController.php View File

foreach($model->pointVenteUser as $u) foreach($model->pointVenteUser as $u)
{ {
$model->users[] = $u->id_user ; $model->users[] = $u->id_user ;
$model->users_commentaire[$u->id_user] = $u->commentaire ;
} }
if ($model->load(Yii::$app->request->post()) && $model->save()) { if ($model->load(Yii::$app->request->post()) && $model->save()) {

+ 5
- 0
backend/views/commande/report.php View File

$str_user = $c->username; //.' - '.date('d/m', strtotime($c->date)) ; $str_user = $c->username; //.' - '.date('d/m', strtotime($c->date)) ;
} }
if(strlen($c->commentaire_point_vente))
{
$str_user .= '<br /><em>'.$c->commentaire_point_vente.'</em>' ;
}
// téléphone // téléphone
if (isset($c->user) && strlen($c->user->telephone)) { if (isset($c->user) && strlen($c->user->telephone)) {
$str_user .= '<br />' . $c->user->telephone . ''; $str_user .= '<br />' . $c->user->telephone . '';

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

<?php $form = ActiveForm::begin(); ?> <?php $form = ActiveForm::begin(); ?>


<div class="col-md-8"> <div class="col-md-8">
<?= $form->field($model, 'point_fabrication')->checkbox()->hint('Cochez cette case si ce point de vente correspond à votre lieu de production.') ?>
<?= $form->field($model, 'point_fabrication')
->checkbox()
->hint('Cochez cette case si ce point de vente correspond à votre lieu de production.') ?>
<?= $form->field($model, 'nom')->textInput(['maxlength' => 255]) ?> <?= $form->field($model, 'nom')->textInput(['maxlength' => 255]) ?>
<?= $form->field($model, 'localite')->textInput(['maxlength' => 255]) ?> <?= $form->field($model, 'localite')->textInput(['maxlength' => 255]) ?>
<?= $form->field($model, 'adresse')->textarea(['rows' => 6]) ?> <?= $form->field($model, 'adresse')->textarea(['rows' => 6]) ?>
<?= $form->field($model, 'horaires_dimanche')->textarea(['rows' => 3]) ?> <?= $form->field($model, 'horaires_dimanche')->textarea(['rows' => 3]) ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?= $form->field($model, 'acces_restreint')->checkbox()->hint('Cochez cette case si seulement un groupe restreint d\'utilisateurs peuvent accéder à ce point de vente.') ?>
<?= $form->field($model, 'acces_restreint')
->checkbox()
->hint('Cochez cette case si seulement un groupe restreint d\'utilisateurs peuvent accéder à ce point de vente.<br />'
. 'Dans le cas des boîtes à pain, il vous est possible de spécifier un commentaire pour chaque utilisateur sélectionné afin de lui renseigner son numéro de boîte ou son code.') ?>
<div id="users"> <div id="users">
<?= Html::activeCheckboxList($model, 'users', ArrayHelper::map($users, 'id', function($model, $defaultValue) {
return Html::encode($model->nom.' '.$model->prenom) ;
} )) ?>
<?= Html::activeCheckboxList($model, 'users', ArrayHelper::map($users, 'id', function($model_user, $defaultValue) use ($model) {
return Html::encode($model_user->nom.' '.$model_user->prenom).'<br />'
.Html::activeTextInput(
$model,
'users_commentaire['.$model_user->id.']',
[
'class' => 'form-control commentaire',
'placeholder' => 'Commentaire',
'value' => (isset($model->users_commentaire[$model_user->id])) ? Html::encode($model->users_commentaire[$model_user->id]) : ''
]);
} ), ['encode' => false, 'class' => '']) ?>
</div> </div>
</div> </div>
<div class="clr"></div> <div class="clr"></div>

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


+ 8
- 2
backend/web/css/screen.css View File

font-weight: normal; font-weight: normal;
display: block; display: block;
} }
/* line 985, ../sass/screen.scss */
.point-vente-form #pointvente-users .commentaire {
display: none;
margin-left: 17px;
width: 200px;
}


/* utilisateurs */ /* utilisateurs */
/* line 991, ../sass/screen.scss */
/* line 996, ../sass/screen.scss */
.user-index .input-group { .user-index .input-group {
width: 180px; width: 180px;
} }
/* line 994, ../sass/screen.scss */
/* line 999, ../sass/screen.scss */
.user-index .input-group .input-credit { .user-index .input-group .input-credit {
text-align: center; text-align: center;
} }

+ 18
- 0
backend/web/js/lechatdesnoisettes.js View File

} }


function chat_points_vente_acces() { function chat_points_vente_acces() {
// affichage du bloc acces restreint
$('#pointvente-acces_restreint').change(function() { $('#pointvente-acces_restreint').change(function() {
chat_points_vente_acces_event() ; chat_points_vente_acces_event() ;
}) ; }) ;
chat_points_vente_acces_event() ; chat_points_vente_acces_event() ;
// affichage du champs commentaire
$('#pointvente-users input[type=checkbox]').change(function() {
chat_points_vente_commentaire_event() ;
}) ;
chat_points_vente_commentaire_event() ;
}

function chat_points_vente_commentaire_event() {
$('#pointvente-users input[type=checkbox]').each(function() {
if($(this).prop('checked')) {
$(this).parent().find('.commentaire').fadeIn() ;
}
else {
$(this).parent().find('.commentaire').hide() ;
}
}) ;
} }


function chat_points_vente_acces_event() { function chat_points_vente_acces_event() {

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

font-weight: normal ; font-weight: normal ;
display: block ; display: block ;
} }
.commentaire {
display: none ;
margin-left: 17px ;
width: 200px ;
}
} }
} }



+ 2
- 2
common/models/Commande.php View File

} }
public function getPointVente() { public function getPointVente() {
return $this->hasOne(PointVente::className(), ['id'=>'id_point_vente']) ;
return $this->hasOne(PointVente::className(), ['id'=>'id_point_vente'])->with('pointVenteUser') ;
} }
public function getCreditHistorique() public function getCreditHistorique()
return [ return [
[['id_user', 'date', 'id_point_vente','id_production'], 'required','message'=>''], [['id_user', 'date', 'id_point_vente','id_production'], 'required','message'=>''],
[['id_user', 'id_point_vente', 'id_production'], 'integer'], [['id_user', 'id_point_vente', 'id_production'], 'integer'],
[['date', 'date_update','commentaire'], 'safe']
[['date', 'date_update','commentaire', 'commentaire_point_vente'], 'safe']
]; ];
} }



+ 18
- 2
common/models/PointVente.php View File

var $data_select_commandes ; var $data_select_commandes ;
var $data_options_commandes ; var $data_options_commandes ;
var $users = [] ; var $users = [] ;
var $users_commentaire = [] ;
/** /**
* @inheritdoc * @inheritdoc
['point_fabrication', 'default','value'=>0], ['point_fabrication', 'default','value'=>0],
['id_etablissement','integer'], ['id_etablissement','integer'],
['id_etablissement','required'], ['id_etablissement','required'],
['users','safe']
[['users','users_commentaire'],'safe']
]; ];
} }


$point_vente_user = new PointVenteUser ; $point_vente_user = new PointVenteUser ;
$point_vente_user->id_user = $val ; $point_vente_user->id_user = $val ;
$point_vente_user->id_point_vente = $this->id ; $point_vente_user->id_point_vente = $this->id ;
if(isset($this->users_commentaire[$val]) && strlen($this->users_commentaire[$val]))
$point_vente_user->commentaire = $this->users_commentaire[$val] ;
$point_vente_user->save() ; $point_vente_user->save() ;
} }
} }
} }
}
public function getCommentaire()
{
if(isset($this->pointVenteUser))
{
foreach($this->pointVenteUser as $pvu)
{
if($pvu->id_user == Yii::$app->user->identity->id)
{
return $pvu->commentaire ;
}
}
}
} }
} }

+ 2
- 0
common/models/PointVenteUser.php View File

return [ return [
[['id_point_vente', 'id_user'], 'required'], [['id_point_vente', 'id_user'], 'required'],
[['id_point_vente', 'id_user'], 'integer'], [['id_point_vente', 'id_user'], 'integer'],
[['commentaire'], 'string'],
]; ];
} }


return [ return [
'id_point_vente' => 'Id Point Vente', 'id_point_vente' => 'Id Point Vente',
'id_user' => 'Id User', 'id_user' => 'Id User',
'commentaire' => 'Commentaire'
]; ];
} }
} }

+ 17
- 0
console/migrations/m161215_071544_add_champs_commentaire_points_vente.php View File

<?php

use yii\db\Migration;
use yii\db\Schema;

class m161215_071544_add_champs_commentaire_points_vente extends Migration
{
public function up()
{
$this->addColumn('point_vente_user', 'commentaire', Schema::TYPE_TEXT) ;
}

public function down()
{
$this->dropColumn('point_vente_user', 'commentaire') ;
}
}

+ 17
- 0
console/migrations/m161215_084317_champs_commentaire_point_vente_commande.php View File

<?php

use yii\db\Migration;
use yii\db\Schema;

class m161215_084317_champs_commentaire_point_vente_commande extends Migration
{
public function up()
{
$this->addColumn('commande', 'commentaire_point_vente', Schema::TYPE_TEXT) ;
}

public function down()
{
$this->dropColumn('commande', 'commentaire_point_vente') ;
}
}

+ 10
- 0
frontend/controllers/CommandeController.php View File

// points de vente // points de vente
$points_vente = PointVente::find() $points_vente = PointVente::find()
->with('pointVenteUser')
->where(['id_etablissement'=>$id_etablissement]) ->where(['id_etablissement'=>$id_etablissement])
->andWhere('acces_restreint = 0 OR (acces_restreint = 1 AND (SELECT COUNT(*) FROM point_vente_user WHERE point_vente.id = point_vente_user.id_point_vente AND point_vente_user.id_user = :id_user) > 0)') ->andWhere('acces_restreint = 0 OR (acces_restreint = 1 AND (SELECT COUNT(*) FROM point_vente_user WHERE point_vente.id = point_vente_user.id_point_vente AND point_vente_user.id_user = :id_user) > 0)')
->params([':id_user' => Yii::$app->user->identity->id]) ->params([':id_user' => Yii::$app->user->identity->id])
} }
if ($commande->validate() && count($produits) && !$err_nb_produits && !$err_date) { if ($commande->validate() && count($produits) && !$err_nb_produits && !$err_date) {
// gestion point de vente
$pv = PointVente::find()
->with('pointVenteUser')
->where(['id' => $commande->id_point_vente])
->one() ;
if($pv && strlen($pv->getCommentaire()))
$commande->commentaire_point_vente = $pv->getCommentaire() ;
// sauvegarde de la commande // sauvegarde de la commande
$commande->save(); $commande->save();



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



<ul id="points-vente" class="blocs"> <ul id="points-vente" class="blocs">
<?php <?php
//$points_vente = PointVente::find()->all() ;
foreach ($points_vente as $pv) { foreach ($points_vente as $pv) {
//print_r($pv) ;
$commentaire = '' ;
if(isset($pv->pointVenteUser) && is_array($pv->pointVenteUser) && count($pv->pointVenteUser))
{
foreach($pv->pointVenteUser as $pvu)
{
if($pvu->id_user == Yii::$app->user->identity->id && strlen($pvu->commentaire))
{
$commentaire = '<div class="commentaire"><span>'.Html::encode($pvu->commentaire).'</span></div>' ;
}
}
}
echo '<li class="bloc point-vente point-vente-' . $pv->id . '" data-vrac="' . (int) $pv->vrac . '" data-pain="' . (int) $pv->pain . '"><div class="contenu">' . echo '<li class="bloc point-vente point-vente-' . $pv->id . '" data-vrac="' . (int) $pv->vrac . '" data-pain="' . (int) $pv->pain . '"><div class="contenu">' .
'<span style="display:none;" class="id">' . $pv->id . '</span>' . '<span style="display:none;" class="id">' . $pv->id . '</span>' .
'<div class="nom">' . Html::encode($pv->nom) . '</div>' . '<div class="nom">' . Html::encode($pv->nom) . '</div>' .
'<div class="jour jour-5">' . (strlen($pv->horaires_vendredi) ? nl2br(Html::encode($pv->horaires_vendredi)) : '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-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 class="jour jour-0">' . (strlen($pv->horaires_dimanche) ? nl2br(Html::encode($pv->horaires_dimanche)) : 'Fermé') . '</div>' .
'</div>' .
'</div>'
. $commentaire .
'</div></li>'; '</div></li>';
} }
?> ?>

+ 11
- 1
frontend/views/commande/index.php View File

<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?></td> <?php endforeach; ?></td>
<td><?php echo '<span class="nom-point-vente">'.Html::encode($c->pointVente->nom) .'</span><br /><span class="localite">'.Html::encode($c->pointVente->localite).'</span>' ; ?></td>
<td>
<?php if(isset($c->pointVente)): ?>
<?php echo '<span class="nom-point-vente">'.Html::encode($c->pointVente->nom) .'</span>'
. '<br /><span class="localite">'.Html::encode($c->pointVente->localite).'</span>' ; ?>
<?php if(strlen($c->commentaire_point_vente)): ?>
<div class="commentaire"><span><?= Html::encode($c->commentaire_point_vente) ?></span></div>
<?php endif; ?>
<?php else: ?>
Point de vente supprimé
<?php endif; ?>
</td>
<td class="montant"> <td class="montant">
<?php echo number_format($c->montant,2) ; ?> €<br /> <?php echo number_format($c->montant,2) ; ?> €<br />
<?php if($c->montant_paye): ?> <?php if($c->montant_paye): ?>

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


+ 100
- 70
frontend/web/css/screen.css View File

#index-commande #historique-commandes a { #index-commande #historique-commandes a {
text-decoration: none; text-decoration: none;
} }
/* line 238, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .commentaire {
margin-top: 5px;
}
/* line 240, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .commentaire span {
font-size: 12px;
background-color: white;
color: #BB8757;
font-weight: bold;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
padding: 5px 10px;
border: solid 1px #ccc;
}


/* line 241, ../sass/_systeme_commandes.scss */
/* line 253, ../sass/_systeme_commandes.scss */
.commande-form { .commande-form {
min-height: 600px; min-height: 600px;
padding-bottom: 60px; padding-bottom: 60px;
} }
/* line 246, ../sass/_systeme_commandes.scss */
/* line 258, ../sass/_systeme_commandes.scss */
.commande-form h2 { .commande-form h2 {
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
} }
/* line 250, ../sass/_systeme_commandes.scss */
/* line 262, ../sass/_systeme_commandes.scss */
.commande-form #infos-importantes.alert-warning { .commande-form #infos-importantes.alert-warning {
float: right; float: right;
} }
/* line 256, ../sass/_systeme_commandes.scss */
/* line 268, ../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;
font-size: 20px; font-size: 20px;
} }
/* line 262, ../sass/_systeme_commandes.scss */
/* line 274, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-header { .commande-form #datepicker-production .ui-datepicker-header {
background-color: #BB8757; background-color: #BB8757;
} }
/* line 266, ../sass/_systeme_commandes.scss */
/* line 278, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-title { .commande-form #datepicker-production .ui-datepicker-title {
color: white; color: white;
} }
/* line 272, ../sass/_systeme_commandes.scss */
/* line 284, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-prev:hover, .commande-form #datepicker-production .ui-datepicker-prev:hover,
.commande-form #datepicker-production .ui-datepicker-next:hover { .commande-form #datepicker-production .ui-datepicker-next:hover {
border: 0px none; border: 0px none;
background: none; background: none;
} }
/* line 278, ../sass/_systeme_commandes.scss */
/* line 290, ../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 283, ../sass/_systeme_commandes.scss */
/* line 295, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-calendar a { .commande-form #datepicker-production .ui-datepicker-calendar a {
text-decoration: none; text-decoration: none;
background-color: #F8F1DD; background-color: #F8F1DD;
} }
/* line 286, ../sass/_systeme_commandes.scss */
/* line 298, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover, .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-active { .commande-form #datepicker-production .ui-datepicker-calendar a.ui-state-hover, .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 295, ../sass/_systeme_commandes.scss */
/* line 307, ../sass/_systeme_commandes.scss */
.commande-form .date-commande { .commande-form .date-commande {
margin-bottom: 53px; margin-bottom: 53px;
} }
/* line 297, ../sass/_systeme_commandes.scss */
/* line 309, ../sass/_systeme_commandes.scss */
.commande-form .date-commande span { .commande-form .date-commande span {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
font-size: 20px; font-size: 20px;
} }
/* line 307, ../sass/_systeme_commandes.scss */
/* line 319, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours { .commande-form #has-commande-en-cours {
margin-top: 15px; margin-top: 15px;
} }
/* line 310, ../sass/_systeme_commandes.scss */
/* line 322, ../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 317, ../sass/_systeme_commandes.scss */
/* line 329, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production { .commande-form .field-commande-id_production {
display: none; display: none;
} }
/* line 321, ../sass/_systeme_commandes.scss */
/* line 333, ../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 325, ../sass/_systeme_commandes.scss */
/* line 337, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production { .commande-form .field-commande-id_production {
margin-bottom: 0px; margin-bottom: 0px;
} }
/* line 327, ../sass/_systeme_commandes.scss */
/* line 339, ../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 331, ../sass/_systeme_commandes.scss */
/* line 343, ../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 336, ../sass/_systeme_commandes.scss */
/* line 348, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente { .commande-form .field-commande-id_point_vente {
display: none; display: none;
} }
/* line 340, ../sass/_systeme_commandes.scss */
/* line 352, ../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 345, ../sass/_systeme_commandes.scss */
/* line 357, ../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 360, ../sass/_systeme_commandes.scss */
/* line 372, ../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 366, ../sass/_systeme_commandes.scss */
/* line 378, ../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 372, ../sass/_systeme_commandes.scss */
/* line 384, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires { .commande-form .blocs .bloc .horaires {
margin-top: 7px; margin-top: 7px;
} }
/* line 374, ../sass/_systeme_commandes.scss */
/* line 386, ../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 381, ../sass/_systeme_commandes.scss */
/* line 393, ../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 384, ../sass/_systeme_commandes.scss */
/* line 396, ../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 390, ../sass/_systeme_commandes.scss */
/* line 402, ../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 395, ../sass/_systeme_commandes.scss */
/* line 407, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.disabled { .commande-form .blocs .bloc.disabled {
display: none; display: none;
} }
/* line 402, ../sass/_systeme_commandes.scss */
/* line 412, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .commentaire {
margin-top: 5px;
}
/* line 414, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .commentaire span {
background-color: #BB8757;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
color: white;
font-weight: bold;
padding: 3px 10px;
}
/* line 425, ../sass/_systeme_commandes.scss */
.commande-form #produits { .commande-form #produits {
margin-top: 15px; margin-top: 15px;
} }
/* line 405, ../sass/_systeme_commandes.scss */
/* line 428, ../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 410, ../sass/_systeme_commandes.scss */
/* line 433, ../sass/_systeme_commandes.scss */
.commande-form #produits .table { .commande-form #produits .table {
margin-top: 7px; margin-top: 7px;
} }
/* line 413, ../sass/_systeme_commandes.scss */
/* line 436, ../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 420, ../sass/_systeme_commandes.scss */
/* line 443, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .photo { .commande-form #produits .table .photo {
padding: 0px; padding: 0px;
width: 120px; width: 120px;
} }
/* line 425, ../sass/_systeme_commandes.scss */
/* line 448, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .th-photo, .commande-form #produits .table .td-photo { .commande-form #produits .table .th-photo, .commande-form #produits .table .td-photo {
width: 120px; width: 120px;
} }
/* line 429, ../sass/_systeme_commandes.scss */
/* line 452, ../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 436, ../sass/_systeme_commandes.scss */
/* line 459, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .description { .commande-form #produits .table .description {
font-style: italic; font-style: italic;
} }
/* line 440, ../sass/_systeme_commandes.scss */
/* line 463, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .recette { .commande-form #produits .table .recette {
font-size: 12px; font-size: 12px;
} }
/* line 444, ../sass/_systeme_commandes.scss */
/* line 467, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group { .commande-form #produits .table .input-group {
width: 133px; width: 133px;
} }
/* line 446, ../sass/_systeme_commandes.scss */
/* line 469, ../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 451, ../sass/_systeme_commandes.scss */
/* line 474, ../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 456, ../sass/_systeme_commandes.scss */
/* line 479, ../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 460, ../sass/_systeme_commandes.scss */
/* line 483, ../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 469, ../sass/_systeme_commandes.scss */
/* line 492, ../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 473, ../sass/_systeme_commandes.scss */
/* line 496, ../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 478, ../sass/_systeme_commandes.scss */
/* line 501, ../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 482, ../sass/_systeme_commandes.scss */
/* line 505, ../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 486, ../sass/_systeme_commandes.scss */
/* line 509, ../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 490, ../sass/_systeme_commandes.scss */
/* line 513, ../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 496, ../sass/_systeme_commandes.scss */
/* line 519, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed { .commande-form #bar-fixed {
display: none; display: none;
position: fixed; position: fixed;
background-color: #F8F1DD; background-color: #F8F1DD;
text-align: center; text-align: center;
} }
/* line 513, ../sass/_systeme_commandes.scss */
/* line 536, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed.not-fixed { .commande-form #bar-fixed.not-fixed {
position: relative; position: relative;
-moz-box-shadow: none; -moz-box-shadow: none;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
padding-right: 20px; padding-right: 20px;
} }
/* line 522, ../sass/_systeme_commandes.scss */
/* line 545, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed.no-credit-pain #bloc-valider-commande { .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande {
margin-top: 0px; margin-top: 0px;
float: right; float: right;
} }
/* line 528, ../sass/_systeme_commandes.scss */
/* line 551, ../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 535, ../sass/_systeme_commandes.scss */
/* line 558, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire { .commande-form #bar-fixed .btn-commentaire {
float: left; float: left;
} }
/* line 543, ../sass/_systeme_commandes.scss */
/* line 566, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire { .commande-form #bar-fixed .btn-commentaire {
margin-right: 10px; margin-right: 10px;
} }
/* line 547, ../sass/_systeme_commandes.scss */
/* line 570, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #bloc-valider-commande { .commande-form #bar-fixed #bloc-valider-commande {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
/* line 551, ../sass/_systeme_commandes.scss */
/* line 574, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #bloc-valider-commande button { .commande-form #bar-fixed #bloc-valider-commande button {
width: 300px; width: 300px;
margin-right: 10px; margin-right: 10px;
} }
/* line 557, ../sass/_systeme_commandes.scss */
/* line 580, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain { .commande-form #bar-fixed #checkbox-credit-pain {
float: right; float: right;
width: 300px; width: 300px;
-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 568, ../sass/_systeme_commandes.scss */
/* line 591, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible { .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible {
background-color: #e0e0e0; background-color: #e0e0e0;
} }
/* line 572, ../sass/_systeme_commandes.scss */
/* line 595, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain .info { .commande-form #bar-fixed #checkbox-credit-pain .info {
color: gray; color: gray;
font-weight: normal; font-weight: normal;
} }
/* line 577, ../sass/_systeme_commandes.scss */
/* line 600, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain .the-credit { .commande-form #bar-fixed #checkbox-credit-pain .the-credit {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
/* line 584, ../sass/_systeme_commandes.scss */
/* line 607, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain .montant-paye { .commande-form #bar-fixed #checkbox-credit-pain .montant-paye {
color: #BB8757; color: #BB8757;
} }
/* line 588, ../sass/_systeme_commandes.scss */
/* line 611, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide { .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide {
font-size: 12px; font-size: 12px;
} }
/* line 593, ../sass/_systeme_commandes.scss */
/* line 616, ../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 598, ../sass/_systeme_commandes.scss */
/* line 621, ../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 603, ../sass/_systeme_commandes.scss */
/* line 626, ../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 610, ../sass/_systeme_commandes.scss */
/* line 633, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .field-commande-commentaire { .commande-form #bar-fixed .field-commande-commentaire {
display: none; display: none;
} }


/* line 618, ../sass/_systeme_commandes.scss */
/* line 641, ../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 626, ../sass/_systeme_commandes.scss */
/* line 649, ../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;

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

text-decoration: none ; text-decoration: none ;
} }
.commentaire {
margin-top: 5px ;
span {
font-size: 12px ;
background-color: white ;
color: $color1 ;
font-weight: bold ;
@include border-radius(5px) ;
padding: 5px 10px ;
border: solid 1px #ccc ;
}
}
} }
} }
display: none ; display: none ;
//color: gray ; //color: gray ;
} }
.commentaire {
margin-top: 5px ;
span {
background-color: $color1 ;
@include border-radius(5px) ;
color: white ;
font-weight: bold ;
padding: 3px 10px ;
}
}
} }
} }

Write Preview
Loading…
Cancel
Save