BenoitCier
/
Opendistrib
форкнуто от Laclic/Souke
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Page d'accueil 

Amélioration de la page d'accueil (textes clients, boulanger) + intégration de la tarification.
master
keun 8 лет назад
Родитель
53cf002841
Сommit
b23e1a456b
6 измененных файлов: 190 добавлений и 73 удалений
Разделённый вид Показать статистику Diff
  1. +2
    -2
      backend/views/etablissement/facturation.php
  2. +1
    -1
      common/models/Etablissement.php
  3. +73
    -12
      frontend/views/site/index.php
  4. Двоичные данные
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  5. +76
    -48
      frontend/web/css/screen.css
  6. +38
    -10
      frontend/web/sass/screen.scss

+ 2
- 2
backend/views/etablissement/facturation.php Просмотреть файл

@@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title;
<p class="alert alert-warning">Suivez ici l'évolution de votre facture tout au long du mois.<br />
Les factures sont générées au début de chaque mois en fonction du chiffre d'affaire du mois précédent. <br />
&RightArrow; S'il est inférieur à 500€, rien n'est facturé. <br />
&RightArrow; S'il est supérieur à 500€, une commission de 1% du chiffre d'affaire est facturée.</p>
&RightArrow; S'il est supérieur à 500€, une commission de 2% du chiffre d'affaire est facturée.</p>
<div id="estimation-facture">
<div class="col-md-6">
<h2>Chiffre d'affaire<br />du mois en cours</h2>
@@ -25,7 +25,7 @@ $this->params['breadcrumbs'][] = $this->title;

<div class="col-md-6">
<?php $montant = $etablissement->getMontantFacturer(date('Y-m'), 0); ?>
<h2>Commission<br /><em>La boîte à pain</em> (1%)</h2>
<h2>Commission<br /><em>La boîte à pain</em> (2%)</h2>
<div class="montant"><span><?php if($montant): echo number_format($montant,2).' €' ; else: echo 'Gratuit' ; endif; ?></span></div>
</div>
<div class="clr"></div>

+ 1
- 1
common/models/Etablissement.php Просмотреть файл

@@ -192,7 +192,7 @@ class Etablissement extends \yii\db\ActiveRecord
$montant = 0 ;
}
else {
$montant = $ca * 0.01 ;
$montant = $ca * 0.02 ;
}
if($format)

+ 73
- 12
frontend/views/site/index.php Просмотреть файл

@@ -23,33 +23,49 @@ $this->title = 'Plateforme de réservation de pain';
<div class="row" id="row-presentation">
<div class="col-md-12">
<h1 id="title-site">La boîte à pain</h1>
<p><strong>Plateforme de réservation de pain</strong>.<br /><br />
<em>Réservez votre pain en ligne et récupérez votre commande<br />
dans votre boulangerie ou dans un dépôt près de chez vous.</em></p>
<!--<img src="./img/four.jpg" alt="Baguettes" id="main-img" />-->
<p><strong>Plateforme de réservation de pain</strong></p>
<div class="clr"></div>
</div>
</div>
<div class="row" id="row-clients-boulanger">
<div class="col-md-6" id="clients">
<h2><img src="./img/clients.png" id="img-clients" /><br />
<h2>
<img src="./img/clients.png" id="img-clients" /><br />
Clients
</h2>
</h2>
<p><em>Réservez votre pain en ligne et récupérez votre commande<br />
dans votre boulangerie ou dans un dépôt près de chez vous.</em></p>
<ul>
<li>Moyen simple de commander</li>
<li>Garantie d'avoir du pain</li>
<li>Possibilité de choisir un dépôt proche de chez soi</li>
</ul>
<div class="prix">
<span>Gratuit</span>
</div>
</div>
<div class="col-md-6">
<h2><img src="./img/boulanger1.png" id="img-boulanger" /><br />
<div class="col-md-6 boulanger">
<h2>
<img src="./img/boulanger1.png" id="img-boulanger" /><br />
Boulanger
</h2>
</h2>
<p><em>Simplifiez la gestion de vos commandes<br /> et optimisez votre production.</em></p>
<ul>
<li>Prise de commande automatisée</li>
<li>Optimisation de la production</li>
<li>Prise de commande en ligne automatisée</li>
<li>Gestion de vos points de vente (dépôts, AMAP, boîte à pain etc.)</li>
<li>Réception de vos commandes par email</li>
<li>Mise en place de comptes prépayés possible pour vos clients</li>
</ul>
<div class="prix">
<span><a data-toggle="modal" data-target="#modal-tarifs" href="javascript:void(0);">Voir les tarifs</a></span>
</div>
</div>
</div>
<?php if(Yii::$app->user->isGuest): ?>
@@ -84,4 +100,49 @@ $this->title = 'Plateforme de réservation de pain';
<?php ActiveForm::end(); ?>
</div>
</div>

<!-- tarifs -->
<div class="modal fade" id="modal-tarifs" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Tarifs</h4>
</div>
<div class="modal-body">
<table class="table table-bordered">
<thead>
<tr>
<th>Chiffre d'affaire</th>
<th>Prix</th>
</tr>
</thead>
<tbody>
<div class="alert alert-warning"><em>La boîte à pain</em> fonctionne grâce à un système de <strong>facturation mensuelle</strong> basée
sur le chiffre d'affaire réalisé à partir des commandes enregistrées sur la plateforme. Fonctionner ainsi permet de faire contribuer chaque
boulangerie à la hauteur de son utilisation de la plateforme.</div>
<tr>
<td>&lt; 500 €</td>
<td>
<strong>Gratuit</strong>
<div class="exemple">Cette tranche vous permet de tester le site sans frais.</div>
</td>
</tr>
<tr>
<td>&gt;= 500 €</td>
<td>
<strong>2 %</strong> du chiffre d'affaire TTC<br />
<div class="exemple">Exemple : si pour un mois donné, vous avez comptabilisé <em>2500 € TTC</em> de chiffre d'affaire,
vous recevrez une facture d'un montant de <em>50 € TTC</em> pour ce mois.</div>
</td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>
</div>
</div>
</div>
</div>

Двоичные данные
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Просмотреть файл


+ 76
- 48
frontend/web/css/screen.css Просмотреть файл

@@ -297,63 +297,85 @@ ul li {
#content #row-presentation {
text-align: center;
}
/* line 278, ../sass/screen.scss */
/* line 276, ../sass/screen.scss */
#content #row-presentation h1 {
color: black;
}
/* line 279, ../sass/screen.scss */
#content #row-presentation strong {
font-family: "myriadpro-light";
font-size: 20px;
color: #B17A48;
}
/* line 286, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
}
/* line 282, ../sass/screen.scss */
/* line 290, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 13px 32px;
font-size: 25px;
}
/* line 288, ../sass/screen.scss */
/* line 296, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
text-align: center;
}
/* line 290, ../sass/screen.scss */
/* line 299, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 294, ../sass/screen.scss */
/* line 303, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 300, ../sass/screen.scss */
/* line 309, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: center;
}
/* line 302, ../sass/screen.scss */
/* line 311, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: none;
color: #BB8757;
}
/* line 307, ../sass/screen.scss */
/* line 317, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 311, ../sass/screen.scss */
/* line 323, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span {
background-color: #F8F1DD;
}
/* line 326, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span a {
color: #BB8757;
text-decoration: none;
}
/* line 334, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
text-align: center;
}
/* line 316, ../sass/screen.scss */
/* line 339, ../sass/screen.scss */
#content #row-clients-boulanger .prix span {
color: #BB8757;
background-color: #F8F1DD;
border: solid 1px #e0e0e0;
border: solid 1px #BB8757;
font-weight: normal;
font-size: 22px;
font-family: "comfortaaregular";
font-family: "myriadpro-regular";
padding: 5px 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
padding-bottom: 3px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 330, ../sass/screen.scss */
/* line 353, ../sass/screen.scss */
#content #row-clients-boulanger #periode-essai {
margin-top: 8px;
text-align: center;
@@ -361,58 +383,64 @@ ul li {
color: gray;
font-family: "comfortaaregular";
}
/* line 363, ../sass/screen.scss */
#content #modal-tarifs .exemple {
color: gray;
}

/* line 342, ../sass/screen.scss */
/* line 370, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 346, ../sass/screen.scss */
/* line 374, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 355, ../sass/screen.scss */
/* line 383, ../sass/screen.scss */
#content #contact .form-control:focus {
/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
border-color: $jaune ;*/
}
/* line 360, ../sass/screen.scss */
/* line 388, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 364, ../sass/screen.scss */
/* line 392, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 367, ../sass/screen.scss */
/* line 395, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 374, ../sass/screen.scss */
/* line 402, ../sass/screen.scss */
.form-control:focus {
/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
border-color: $jaune ;*/
}

/* line 379, ../sass/screen.scss */
/* line 407, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
left: 0px;
width: 100%;
height: 50px;
background-color: #515151;
background-color: white;
text-align: center;
border-top: 1px solid #e0e0e0;
padding-top: 30px;
padding-bottom: 60px;
}
/* line 395, ../sass/screen.scss */
/* line 421, ../sass/screen.scss */
#footer a {
font-family: "myriadpro-regular";
color: #7e7e7e;
color: white;
color: #999;
text-transform: uppercase;
text-decoration: none;
padding-left: 10px;
@@ -420,29 +448,29 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 404, ../sass/screen.scss */
/* line 432, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 408, ../sass/screen.scss */
/* line 436, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 414, ../sass/screen.scss */
/* line 442, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 417, ../sass/screen.scss */
/* line 445, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 422, ../sass/screen.scss */
/* line 450, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 426, ../sass/screen.scss */
/* line 454, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -450,7 +478,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 434, ../sass/screen.scss */
/* line 462, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -459,58 +487,58 @@ ul li {
color: black;
}

/* line 445, ../sass/screen.scss */
/* line 473, ../sass/screen.scss */
.mentions #main, .mentions body {
background-color: white;
}

/* line 450, ../sass/screen.scss */
/* line 478, ../sass/screen.scss */
.vegas-loading {
display: none;
}

/* line 457, ../sass/screen.scss */
/* line 485, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 461, ../sass/screen.scss */
/* line 489, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 466, ../sass/screen.scss */
/* line 494, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 469, ../sass/screen.scss */
/* line 497, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 475, ../sass/screen.scss */
/* line 503, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* login */
/* line 484, ../sass/screen.scss */
/* line 512, ../sass/screen.scss */
.site-login .col-lg-5 {
margin: 0px auto;
float: none;
}

/* signup */
/* line 492, ../sass/screen.scss */
/* line 520, ../sass/screen.scss */
.modal-backdrop {
z-index: -1;
}

/* line 497, ../sass/screen.scss */
/* line 525, ../sass/screen.scss */
.site-signup .col-lg-5 {
margin: 0px auto;
float: none;
}

/* line 507, ../sass/screen.scss */
/* line 535, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -518,20 +546,20 @@ ul li {
margin-top: 0px;
}

/* line 517, ../sass/screen.scss */
/* line 545, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 522, ../sass/screen.scss */
/* line 550, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 528, ../sass/screen.scss */
/* line 556, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 532, ../sass/screen.scss */
/* line 560, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

+ 38
- 10
frontend/web/sass/screen.scss Просмотреть файл

@@ -273,6 +273,14 @@ ul {
#row-presentation {
text-align: center ;
h1 {
color: black ;
}
strong {
font-family: 'myriadpro-light' ;
font-size: 20px ;
color: #B17A48 ;
}
}
#row-signup {
@@ -287,6 +295,7 @@ ul {

#row-clients-boulanger {
margin-bottom: 50px ;
text-align: center ;
h2 {
text-align: center ;
margin-bottom: 15px ;
@@ -301,6 +310,7 @@ ul {
text-align: center ;
li {
list-style-type: none ;
color: $color1 ;
}
}
@@ -308,6 +318,19 @@ ul {
border-right: dotted 1px gray ;
}
.boulanger {
.prix {
span {
background-color: $color2 ;
a {
color: $color1 ;
text-decoration: none ;
}
}
}
}
.prix {
padding-top: 15px ;
font-size: 18px ;
@@ -315,15 +338,15 @@ ul {
span {
color: $color1 ;
background-color: $color2 ;
border: solid 1px #e0e0e0 ;
//background-color: $color2 ;
border: solid 1px $color1 ;
font-weight: normal ;
font-size: 22px ;
font-family: 'comfortaaregular' ;
font-family: 'myriadpro-regular' ;
padding: 5px 10px ;
@include border-radius(10px) ;
padding-bottom: 3px ;
@include border-radius(5px) ;
}
}
@@ -335,7 +358,12 @@ ul {
font-family: 'comfortaaregular' ;
}
}
#modal-tarifs {
.exemple {
color: gray ;
}
}
}


@@ -383,18 +411,18 @@ ul {
width: 100% ;
height: 50px ;
background-color: #515151 ;
background-color: white ;
text-align: center ;
border-top: 1px solid #e0e0e0 ;
padding-top: 30px ;
padding-bottom: 60px ;
//position: relative ;
a {
font-family: 'myriadpro-regular' ;
color: #7e7e7e;
color: white ;
color: #999 ;
text-transform: uppercase ;
text-decoration: none ;
padding-left: 10px ;

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить