Browse Source

Finalisation intégration système de commande

refactoring
keun 6 years ago
parent
commit
267c65f6ba
10 changed files with 205 additions and 100 deletions
  1. +2
    -2
      producer/views/commande/_form.php
  2. +1
    -1
      producer/views/layouts/main.php
  3. +19
    -19
      producer/views/producer/index.php
  4. BIN
      producer/web/.sass-cache/02dccb5f9955880bcb6e5ad5d1fece2607a7ff62/_form.scssc
  5. BIN
      producer/web/.sass-cache/75fcaf1b4852ceb732871195e41567cc2a7d8997/home/keun/NetBeansProjects/laboiteapain/producer/web/sass/_layout.scssc
  6. BIN
      producer/web/.sass-cache/df296f4d5446ec0f190b7ff1f23eb998ea1b56e7/_layout.scssc
  7. +118
    -66
      producer/web/css/screen.css
  8. +6
    -4
      producer/web/js/lechatdesnoisettes.js
  9. +50
    -2
      producer/web/sass/_layout.scss
  10. +9
    -6
      producer/web/sass/commande/_form.scss

+ 2
- 2
producer/views/commande/_form.php View File

<div class="clr"></div> <div class="clr"></div>


<div id="depots"> <div id="depots">
<h2 id="step-choix-depot">Je choisis un dépôt</h2>
<h3 id="step-choix-depot"><span>Points de vente</span></h3>
<?= <?=
$form->field($model, 'id_point_vente') $form->field($model, 'id_point_vente')
->label('') ->label('')
<div id="produits"> <div id="produits">
<h2 id="step-choix-produits">Mes produits</h2>
<h3 id="step-choix-produits"><span>Produits</span></h3>


<?php // confiance ?> <?php // confiance ?>
<input type="hidden" id="confiance" value="<?php echo (int) Yii::$app->user->identity->confiance; ?>" /> <input type="hidden" id="confiance" value="<?php echo (int) Yii::$app->user->identity->confiance; ?>" />

+ 1
- 1
producer/views/layouts/main.php View File

<title><?= Html::encode($producer->nom); ?> &bull; <?= $this->getTitle(); ?></title> <title><?= Html::encode($producer->nom); ?> &bull; <?= $this->getTitle(); ?></title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="base-url" content="<?= Yii::$app->urlManager->baseUrl ; ?>">
<?= Html::csrfMetaTags() ?> <?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" /> <link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<?php $this->head() ?> <?php $this->head() ?>
</footer> </footer>


<?php $this->endBody() ?> <?php $this->endBody() ?>

</body> </body>
</html> </html>
<?php $this->endPage() ?> <?php $this->endPage() ?>

+ 19
- 19
producer/views/producer/index.php View File



<?php if(is_array($points_vente) && count($points_vente)): ?> <?php if(is_array($points_vente) && count($points_vente)): ?>
<section id="points-vente"> <section id="points-vente">
<h2>Points de vente</h2>
<table class="table table-bordered">
<thead>
<tr>
<th>Nom</th>
<th>Localisation</th>
<th>Jours de livraison</th>
</tr>
</thead>
<tbody>
<?php foreach($points_vente as $pv): ?>
<tr>
<td><?= Html::encode($pv->nom); ?></td>
<td><?= Html::encode($pv->localite); ?></td>
<td><?= Html::encode($pv->strJoursLivraison()); ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<h3><span>Points de vente</span></h3>
<table class="table table-bordered">
<thead>
<tr>
<th>Nom</th>
<th>Localisation</th>
<th>Jours de livraison</th>
</tr>
</thead>
<tbody>
<?php foreach($points_vente as $pv): ?>
<tr>
<td><?= Html::encode($pv->nom); ?></td>
<td><?= Html::encode($pv->localite); ?></td>
<td><?= Html::encode($pv->strJoursLivraison()); ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</section> </section>
<?php endif; ?> <?php endif; ?>

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


BIN
producer/web/.sass-cache/75fcaf1b4852ceb732871195e41567cc2a7d8997/home/keun/NetBeansProjects/laboiteapain/producer/web/sass/_layout.scssc View File


BIN
producer/web/.sass-cache/df296f4d5446ec0f190b7ff1f23eb998ea1b56e7/_layout.scssc View File


+ 118
- 66
producer/web/css/screen.css View File

} }


/* line 17, ../sass/_layout.scss */ /* line 17, ../sass/_layout.scss */
.modal-backdrop.in {
z-index: 10;
}

/* line 22, ../sass/_layout.scss */
#main .btn-primary {
background-color: #BB8757;
border: solid 1px #BB8757;
color: white;
}
/* line 27, ../sass/_layout.scss */
#main .btn-primary:hover, #main .btn-primary:active, #main .btn-primary:focus {
background-color: #b17a48;
border: solid 1px #BB8757;
color: white;
}

/* line 36, ../sass/_layout.scss */
.btn {
background-image: none;
}

/* line 40, ../sass/_layout.scss */
#main .alert {
background-image: none;
background-color: white;
border-bottom-width: 3px;
}

/* line 48, ../sass/_layout.scss */
.alert.alert-warning a {
color: #8a6d3b;
}

/* line 54, ../sass/_layout.scss */
#header-bap { #header-bap {
background-color: #F8F1DD; background-color: #F8F1DD;
padding-top: 7px; padding-top: 7px;
padding-bottom: 7px; padding-bottom: 7px;
} }
/* line 22, ../sass/_layout.scss */
/* line 59, ../sass/_layout.scss */
#header-bap .container { #header-bap .container {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
} }
/* line 27, ../sass/_layout.scss */
/* line 64, ../sass/_layout.scss */
#header-bap #logo { #header-bap #logo {
color: black; color: black;
text-decoration: none; text-decoration: none;
position: relative; position: relative;
top: 3px; top: 3px;
} }
/* line 33, ../sass/_layout.scss */
/* line 70, ../sass/_layout.scss */
#header-bap #logo img { #header-bap #logo img {
width: 25px; width: 25px;
} }
/* line 36, ../sass/_layout.scss */
/* line 73, ../sass/_layout.scss */
#header-bap #logo .text { #header-bap #logo .text {
font-size: 17px; font-size: 17px;
font-family: "comfortaalight"; font-family: "comfortaalight";
bottom: 6px; bottom: 6px;
left: 3px; left: 3px;
} }
/* line 45, ../sass/_layout.scss */
/* line 82, ../sass/_layout.scss */
#header-bap ul#nav-bap { #header-bap ul#nav-bap {
float: right; float: right;
} }
/* line 48, ../sass/_layout.scss */
/* line 85, ../sass/_layout.scss */
#header-bap ul#nav-bap li { #header-bap ul#nav-bap li {
float: right; float: right;
} }
/* line 50, ../sass/_layout.scss */
/* line 87, ../sass/_layout.scss */
#header-bap ul#nav-bap li a { #header-bap ul#nav-bap li a {
color: black; color: black;
font-size: 15px; font-size: 15px;
color: #BB8757; color: #BB8757;
} }
/* line 55, ../sass/_layout.scss */
/* line 92, ../sass/_layout.scss */
#header-bap ul#nav-bap li a:hover, #header-bap ul#nav-bap li a:focus { #header-bap ul#nav-bap li a:hover, #header-bap ul#nav-bap li a:focus {
color: #333; color: #333;
color: #BB8757; color: #BB8757;
background: none; background: none;
} }
/* line 62, ../sass/_layout.scss */
/* line 99, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul { #header-bap ul#nav-bap li ul {
background-color: #F8F1DD; background-color: #F8F1DD;
border-top: solid 2px #BB8757; border-top: solid 2px #BB8757;
} }
/* line 66, ../sass/_layout.scss */
/* line 103, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a { #header-bap ul#nav-bap li ul li a {
text-transform: uppercase; text-transform: uppercase;
font-size: 13px; font-size: 13px;
} }


/* line 76, ../sass/_layout.scss */
/* line 113, ../sass/_layout.scss */
#header { #header {
background-color: #BB8757; background-color: #BB8757;
text-align: center; text-align: center;
padding-bottom: 70px; padding-bottom: 70px;
border-bottom: solid 1px #e0e0e0; border-bottom: solid 1px #e0e0e0;
} }
/* line 83, ../sass/_layout.scss */
/* line 120, ../sass/_layout.scss */
#header .container { #header .container {
position: relative; position: relative;
padding: 0px; padding: 0px;
} }
/* line 88, ../sass/_layout.scss */
/* line 125, ../sass/_layout.scss */
#header h1, #header h2 { #header h1, #header h2 {
color: white; color: white;
} }
/* line 92, ../sass/_layout.scss */
/* line 129, ../sass/_layout.scss */
#header h1 { #header h1 {
text-transform: uppercase; text-transform: uppercase;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
padding-bottom: 20px; padding-bottom: 20px;
font-weight: bold; font-weight: bold;
} }
/* line 100, ../sass/_layout.scss */
/* line 137, ../sass/_layout.scss */
#header h2 { #header h2 {
font-family: "myriadpro-it"; font-family: "myriadpro-it";
font-size: 18px; font-size: 18px;
padding-bottom: 15px; padding-bottom: 15px;
} }
/* line 106, ../sass/_layout.scss */
/* line 143, ../sass/_layout.scss */
#header #credit { #header #credit {
position: absolute; position: absolute;
top: 0px; top: 0px;
border-bottom: solid 1px white; border-bottom: solid 1px white;
padding: 7px 0px; padding: 7px 0px;
} }
/* line 115, ../sass/_layout.scss */
/* line 152, ../sass/_layout.scss */
#header #credit span { #header #credit span {
font-family: "myriadpro-light"; font-family: "myriadpro-light";
} }


/* line 121, ../sass/_layout.scss */
/* line 158, ../sass/_layout.scss */
#main { #main {
background-color: #F8F1DD; background-color: #F8F1DD;
} }
/* line 124, ../sass/_layout.scss */
/* line 161, ../sass/_layout.scss */
#main #main-nav { #main #main-nav {
width: 100%; width: 100%;
position: relative; position: relative;
background-color: white; background-color: white;
border-bottom: solid 1px #e0e0e0; border-bottom: solid 1px #e0e0e0;
} }
/* line 133, ../sass/_layout.scss */
/* line 170, ../sass/_layout.scss */
#main #main-nav ul li a { #main #main-nav ul li a {
color: #BB8757; color: #BB8757;
text-transform: uppercase; text-transform: uppercase;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
border-right: solid 1px #e0e0e0; border-right: solid 1px #e0e0e0;
} }
/* line 140, ../sass/_layout.scss */
/* line 177, ../sass/_layout.scss */
#main #main-nav ul li a:hover, #main #main-nav ul li.active a { #main #main-nav ul li a:hover, #main #main-nav ul li.active a {
background: none; background: none;
border-bottom: solid 1px #BB8757; border-bottom: solid 1px #BB8757;
-webkit-border-radius: 0px; -webkit-border-radius: 0px;
border-radius: 0px; border-radius: 0px;
} }
/* line 147, ../sass/_layout.scss */
/* line 184, ../sass/_layout.scss */
#main #main-nav ul li#btn-administration { #main #main-nav ul li#btn-administration {
background-color: #F8F1DD; background-color: #F8F1DD;
float: right; float: right;
} }
/* line 154, ../sass/_layout.scss */
/* line 191, ../sass/_layout.scss */
#main #main-nav #user { #main #main-nav #user {
color: #BB8757; color: #BB8757;
float: right; float: right;
padding: 10px; padding: 10px;
} }
/* line 161, ../sass/_layout.scss */
/* line 198, ../sass/_layout.scss */
#main #page-title { #main #page-title {
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
top: -10px; top: -10px;
text-align: center; text-align: center;
} }
/* line 174, ../sass/_layout.scss */
/* line 211, ../sass/_layout.scss */
#main .container { #main .container {
padding: 0px; padding: 0px;
background-color: white; background-color: white;
border-left: solid 1px #e0e0e0; border-left: solid 1px #e0e0e0;
border-right: solid 1px #e0e0e0; border-right: solid 1px #e0e0e0;
} }
/* line 182, ../sass/_layout.scss */
/* line 219, ../sass/_layout.scss */
#main #content { #main #content {
padding-bottom: 20px;
padding: 0px 20px 20px 20px; padding: 0px 20px 20px 20px;
} }
/* line 185, ../sass/_layout.scss */
/* line 223, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 { #main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
margin-top: 30px; margin-top: 30px;
margin-bottom: 20px; margin-bottom: 20px;
} }
/* line 190, ../sass/_layout.scss */
/* line 228, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first { #main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px; margin-top: 0px;
} }
/* line 195, ../sass/_layout.scss */
/* line 233, ../sass/_layout.scss */
#main #content h1 { #main #content h1 {
font-size: 30px; font-size: 30px;
} }
/* line 199, ../sass/_layout.scss */
/* line 237, ../sass/_layout.scss */
#main #content h2 { #main #content h2 {
font-size: 25px; font-size: 25px;
} }
/* line 204, ../sass/_layout.scss */
/* line 242, ../sass/_layout.scss */
#main #content h3 { #main #content h3 {
font-size: 22px;
font-family: "myriadpro-light";
text-transform: uppercase;
font-size: 23px;
padding: 10px 0px 10px 10px;
color: white;
text-align: center;
}
/* line 249, ../sass/_layout.scss */
#main #content h3 span {
background-color: #BB8757;
padding: 10px 20px;
padding-top: 14px;
} }
/* line 208, ../sass/_layout.scss */
/* line 256, ../sass/_layout.scss */
#main #content h4 { #main #content h4 {
font-size: 20px; font-size: 20px;
} }
/* line 212, ../sass/_layout.scss */
/* line 260, ../sass/_layout.scss */
#main #content h5 { #main #content h5 {
font-size: 18px; font-size: 18px;
} }
/* line 216, ../sass/_layout.scss */
/* line 264, ../sass/_layout.scss */
#main #content h6 { #main #content h6 {
font-size: 16px; font-size: 16px;
} }


/* line 222, ../sass/_layout.scss */
/* line 270, ../sass/_layout.scss */
#footer { #footer {
background-color: #BB8757; background-color: #BB8757;
height: 100px; height: 100px;
} }
/* line 226, ../sass/_layout.scss */
/* line 274, ../sass/_layout.scss */
#footer .container { #footer .container {
padding: 0px; padding: 0px;
} }
/* line 228, ../sass/_layout.scss */
/* line 276, ../sass/_layout.scss */
#footer .container .overflow { #footer .container .overflow {
height: 30px; height: 30px;
background-color: white; background-color: white;
border-right: solid 1px #e0e0e0; border-right: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0; border-bottom: solid 1px #e0e0e0;
} }
/* line 236, ../sass/_layout.scss */
/* line 284, ../sass/_layout.scss */
#footer .container .content { #footer .container .content {
padding-top: 20px; padding-top: 20px;
color: white; color: white;
} }
/* line 240, ../sass/_layout.scss */
/* line 288, ../sass/_layout.scss */
#footer .container .content a { #footer .container .content a {
color: white; color: white;
text-decoration: underline; text-decoration: underline;
.commande-update .commande-form .blocs .bloc .nom { .commande-update .commande-form .blocs .bloc .nom {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 20px; font-size: 20px;
padding-bottom: 10px;
} }
/* line 129, ../sass/commande/_form.scss */ /* line 129, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .adresse, .commande-create .commande-form .blocs .bloc .adresse,
.commande-update .commande-form .blocs .bloc .adresse { .commande-update .commande-form .blocs .bloc .adresse {
color: gray; color: gray;
font-size: 13px;
line-height: 16px;
font-size: 15px;
line-height: 20px;
} }
/* line 135, ../sass/commande/_form.scss */ /* line 135, ../sass/commande/_form.scss */
.commande-create .commande-form .blocs .bloc .horaires, .commande-create .commande-form .blocs .bloc .horaires,
.commande-create .commande-form #bar-fixed, .commande-create .commande-form #bar-fixed,
.commande-update .commande-form #bar-fixed { .commande-update .commande-form #bar-fixed {
display: none; display: none;
width: 100%;
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px;
z-index: 100; z-index: 100;
background-color: white; background-color: white;
padding: 15px; padding: 15px;
-moz-box-shadow: 0 0 5px gray; -moz-box-shadow: 0 0 5px gray;
-webkit-box-shadow: 0 0 5px gray; -webkit-box-shadow: 0 0 5px gray;
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; background-color: #F8F1DD;
text-align: center; text-align: center;
} }
/* line 287, ../sass/commande/_form.scss */
/* line 286, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .container, .commande-create .commande-form #bar-fixed .container,
.commande-update .commande-form #bar-fixed .container { .commande-update .commande-form #bar-fixed .container {
min-height: auto; min-height: auto;
background: none; background: none;
border: 0px none; border: 0px none;
} }
/* line 293, ../sass/commande/_form.scss */
/* line 292, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.not-fixed, .commande-create .commande-form #bar-fixed.not-fixed,
.commande-update .commande-form #bar-fixed.not-fixed { .commande-update .commande-form #bar-fixed.not-fixed {
position: relative; position: relative;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
padding-right: 20px; padding-right: 20px;
} }
/* line 302, ../sass/commande/_form.scss */
/* line 299, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.not-fixed .container,
.commande-update .commande-form #bar-fixed.not-fixed .container {
width: auto;
}
/* line 305, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande, .commande-create .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande,
.commande-update .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande { .commande-update .commande-form #bar-fixed.no-credit-pain #bloc-valider-commande {
margin-top: 0px; margin-top: 0px;
float: right; float: right;
} }
/* line 308, ../sass/commande/_form.scss */
/* line 311, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #total-commande-bottom, .commande-create .commande-form #bar-fixed #total-commande-bottom,
.commande-update .commande-form #bar-fixed #total-commande-bottom { .commande-update .commande-form #bar-fixed #total-commande-bottom {
background-color: white; background-color: white;
padding: 5px 25px; padding: 5px 25px;
border: solid 1px #e0e0e0; border: solid 1px #e0e0e0;
} }
/* line 315, ../sass/commande/_form.scss */
/* line 318, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-commentaire, .commande-create .commande-form #bar-fixed .btn-commentaire,
.commande-update .commande-form #bar-fixed .btn-commentaire { .commande-update .commande-form #bar-fixed .btn-commentaire {
float: left; float: left;
} }
/* line 323, ../sass/commande/_form.scss */
/* line 326, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-commentaire, .commande-create .commande-form #bar-fixed .btn-commentaire,
.commande-update .commande-form #bar-fixed .btn-commentaire { .commande-update .commande-form #bar-fixed .btn-commentaire {
margin-right: 10px; margin-right: 10px;
} }
/* line 327, ../sass/commande/_form.scss */
/* line 330, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #bloc-valider-commande, .commande-create .commande-form #bar-fixed #bloc-valider-commande,
.commande-update .commande-form #bar-fixed #bloc-valider-commande { .commande-update .commande-form #bar-fixed #bloc-valider-commande {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
} }
/* line 331, ../sass/commande/_form.scss */
/* line 334, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #bloc-valider-commande button, .commande-create .commande-form #bar-fixed #bloc-valider-commande button,
.commande-update .commande-form #bar-fixed #bloc-valider-commande button { .commande-update .commande-form #bar-fixed #bloc-valider-commande button {
width: 340px; width: 340px;
margin-right: 10px; margin-right: 10px;
} }
/* line 337, ../sass/commande/_form.scss */
/* line 340, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain, .commande-create .commande-form #bar-fixed #checkbox-credit-pain,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain { .commande-update .commande-form #bar-fixed #checkbox-credit-pain {
float: right; float: right;
-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 348, ../sass/commande/_form.scss */
/* line 351, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible, .commande-create .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible { .commande-update .commande-form #bar-fixed #checkbox-credit-pain.paiement-impossible {
background-color: #e0e0e0; background-color: #e0e0e0;
} }
/* line 352, ../sass/commande/_form.scss */
/* line 355, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .info, .commande-create .commande-form #bar-fixed #checkbox-credit-pain .info,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .info { .commande-update .commande-form #bar-fixed #checkbox-credit-pain .info {
color: gray; color: gray;
font-weight: normal; font-weight: normal;
} }
/* line 357, ../sass/commande/_form.scss */
/* line 360, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .the-credit, .commande-create .commande-form #bar-fixed #checkbox-credit-pain .the-credit,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .the-credit { .commande-update .commande-form #bar-fixed #checkbox-credit-pain .the-credit {
background-color: #BB8757; background-color: #BB8757;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
/* line 364, ../sass/commande/_form.scss */
/* line 367, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain .montant-paye, .commande-create .commande-form #bar-fixed #checkbox-credit-pain .montant-paye,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain .montant-paye { .commande-update .commande-form #bar-fixed #checkbox-credit-pain .montant-paye {
color: #BB8757; color: #BB8757;
} }
/* line 368, ../sass/commande/_form.scss */
/* line 371, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide, .commande-create .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide { .commande-update .commande-form #bar-fixed #checkbox-credit-pain #info-credit-vide {
font-size: 12px; font-size: 12px;
} }
/* line 372, ../sass/commande/_form.scss */
/* line 375, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled, .commande-create .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled,
.commande-update .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled { .commande-update .commande-form #bar-fixed #checkbox-credit-pain #credit-pain-disabled {
display: none; display: none;
font-size: 12px; font-size: 12px;
} }
/* line 378, ../sass/commande/_form.scss */
/* line 381, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .btn-retour, .commande-create .commande-form #bar-fixed .annuler-commande, .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 .btn-retour,
.commande-update .commande-form #bar-fixed .annuler-commande { .commande-update .commande-form #bar-fixed .annuler-commande {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
} }
/* line 383, ../sass/commande/_form.scss */
/* line 386, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .annuler-commande, .commande-create .commande-form #bar-fixed .annuler-commande,
.commande-update .commande-form #bar-fixed .annuler-commande { .commande-update .commande-form #bar-fixed .annuler-commande {
color: #b92c28; color: #b92c28;
background-color: white; background-color: white;
} }
/* line 388, ../sass/commande/_form.scss */
/* line 391, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed #total-commande-bottom, .commande-create .commande-form #bar-fixed #total-commande-bottom,
.commande-update .commande-form #bar-fixed #total-commande-bottom { .commande-update .commande-form #bar-fixed #total-commande-bottom {
display: none; display: none;
font-family: "comfortaalight"; font-family: "comfortaalight";
font-size: 24px; font-size: 24px;
} }
/* line 395, ../sass/commande/_form.scss */
/* line 398, ../sass/commande/_form.scss */
.commande-create .commande-form #bar-fixed .field-commande-commentaire, .commande-create .commande-form #bar-fixed .field-commande-commentaire,
.commande-update .commande-form #bar-fixed .field-commande-commentaire { .commande-update .commande-form #bar-fixed .field-commande-commentaire {
display: none; display: none;
} }
/* line 403, ../sass/commande/_form.scss */
/* line 406, ../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 411, ../sass/commande/_form.scss */
/* line 414, ../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,

+ 6
- 4
producer/web/js/lechatdesnoisettes.js View File

}) ;*/ }) ;*/
} }


function chat_base_url() {
return $('meta[name=base-url]').attr('content')+'/' ;
}

function chat_systeme_commande() { function chat_systeme_commande() {
if($('.commande-form').size()) { if($('.commande-form').size()) {
$('#modal-code form').submit(function() { $('#modal-code form').submit(function() {
var id_pv = $('#modal-code #id-point-vente').val() ; var id_pv = $('#modal-code #id-point-vente').val() ;
var code = $('#modal-code #code').val() ; var code = $('#modal-code #code').val() ;
$.get('index.php',{
r: 'commande/verif-code-point-vente',
$.get(chat_base_url()+'commande/verif-code-point-vente',{
id_point_vente: id_pv, id_point_vente: id_pv,
code: code code: code
}, function(ok) { }, function(ok) {


function chat_systeme_commande_produits_dispos(str_date, date) { function chat_systeme_commande_produits_dispos(str_date, date) {
// produits dispos à la vente à cette date // produits dispos à la vente à cette date
$.get('index.php',{
r: 'commande/infos-production',
$.get(chat_base_url()+'commande/infos-production',{
id_production: $('#commande-id_production').val() id_production: $('#commande-id_production').val()
}, function(data) { }, function(data) {

+ 50
- 2
producer/web/sass/_layout.scss View File

clear: both ; clear: both ;
} }


.modal-backdrop.in {
z-index: 10 ;
}

#main {
.btn-primary {
background-color: $color1 ;
border: solid 1px $color1 ;
color: white ;

&:hover, &:active, &:focus {
background-color: darken($color1, 5) ;
border: solid 1px $color1 ;
color: white ;
}
}
}


.btn {
background-image: none ;
}

#main .alert {
background-image: none;
background-color: white ;
border-bottom-width: 3px ;
}

.alert {
&.alert-warning {
a {
color: #8a6d3b ;
}
}
}

#header-bap { #header-bap {
background-color: $color2 ; background-color: $color2 ;
padding-top: 7px ; padding-top: 7px ;
} }
#content { #content {
padding: 0px 20px 20px 20px ;
padding-bottom: 20px ;
padding: 0px 20px 20px 20px ;
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-family: 'myriadpro-regular' ; font-family: 'myriadpro-regular' ;
} }
h3 { h3 {
font-size: 22px ;
font-family: 'myriadpro-light' ;
text-transform: uppercase ;
font-size: 23px ;
padding: 10px 0px 10px 10px ;
color: white ;
text-align: center ;
span {
background-color: $color1 ;
padding: 10px 20px ;
padding-top: 14px ;
}
} }
h4 { h4 {

+ 9
- 6
producer/web/sass/commande/_form.scss View File

border: 1px solid #d8d8d8 ; border: 1px solid #d8d8d8 ;


.nom { .nom {
//text-align: center ;
font-family: "comfortaalight" ; font-family: "comfortaalight" ;
font-size: 20px ; font-size: 20px ;
padding-bottom: 10px ;
} }


.adresse { .adresse {
color: gray ; color: gray ;
font-size: 13px ;
line-height: 16px ;
font-size: 15px ;
line-height: 20px ;
} }


.horaires { .horaires {


#bar-fixed { #bar-fixed {
display: none ; display: none ;
width: 100% ;
position: fixed ; position: fixed ;
bottom: 0px ; bottom: 0px ;
//left: 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 ;
@include box-shadow(0 0 5px gray) ; @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 ; background-color: $color2 ;
@include border-radius(0px) ; @include border-radius(0px) ;
border: solid 1px #e0e0e0 ; border: solid 1px #e0e0e0 ;
padding-right: 20px ; padding-right: 20px ;
.container {
width: auto ;
}
} }


&.no-credit-pain { &.no-credit-pain {

Loading…
Cancel
Save