Laclic
/
Souke
Bevaka 5
Stjärnmärk 0
Förgrening 1
Kod Ärenden 1 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge branch 'mail_producteur_credite_compte'

prodstable
keun 6 år sedan
förälder
067e6f3ad1 3310f22f5f
incheckning
a661c081b6
22 ändrade filer med 1064 tillägg och 340 borttagningar
Delad Vy Visa Diff Statistik
  1. +12
    -10
      backend/controllers/UserController.php
  2. +86
    -0
      backend/models/CreditForm.php
  3. +6
    -4
      backend/views/user/credit.php
  4. +2
    -2
      common/controllers/CommonController.php
  5. +19
    -0
      common/helpers/Mail.php
  6. +11
    -0
      common/helpers/Price.php
  7. +16
    -0
      common/mail/creditUser-html.php
  8. +13
    -0
      common/mail/creditUser-text.php
  9. +1
    -0
      common/models/CreditHistorique.php
  10. +41
    -0
      frontend/components/MyView.php
  11. +3
    -0
      frontend/config/main.php
  12. +30
    -0
      frontend/controllers/EtablissementController.php
  13. +2
    -2
      frontend/views/commande/index.php
  14. +22
    -0
      frontend/views/etablissement/index.php
  15. +116
    -79
      frontend/views/layouts/main.php
  16. +3
    -3
      frontend/views/site/_cgv_content.php
  17. +6
    -4
      frontend/views/site/_tarifs_boulanger.php
  18. +1
    -1
      frontend/views/site/cgv.php
  19. +44
    -88
      frontend/views/site/index.php
  20. Binär
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  21. +343
    -105
      frontend/web/css/screen.css
  22. +287
    -42
      frontend/web/sass/screen.scss

+ 12
- 10
backend/controllers/UserController.php Visa fil

@@ -16,7 +16,9 @@ use common\models\UserEtablissement;
use common\models\Etablissement;
use yii\base\UserException;
use common\models\CreditHistorique;
use backend\models\CreditForm;
use common\models\Commande;
use common\helpers\Mail;

/**
* UserController implements the CRUD actions for User model.
@@ -187,15 +189,15 @@ class UserController extends BackendController {

public function actionCredit($id) {
$user = User::find()->with('userEtablissement')->where(['id' => $id])->one();
$user_appartient_etablissement = UserEtablissement::findOne(['id_user' => $id, 'id_etablissement' => Yii::$app->user->identity->id_etablissement]);
if (($user_appartient_etablissement) || Yii::$app->user->identity->status == USER::STATUS_ADMIN) {
$credit_historique = new CreditHistorique;
if ($credit_historique->load(Yii::$app->request->post()) && $credit_historique->validate()) {
$credit_historique->id_user = $user->id;
$credit_historique->id_user_action = Yii::$app->user->identity->id;
$credit_historique->id_etablissement = Yii::$app->user->identity->id_etablissement;
$credit_historique->save();
$credit_historique = new CreditHistorique;
$user_etablissement = UserEtablissement::findOne(['id_user' => $id, 'id_etablissement' => Yii::$app->user->identity->id_etablissement]);
if (($user_etablissement) || Yii::$app->user->identity->status == USER::STATUS_ADMIN) {
$credit_form = new CreditForm;
if ($credit_form->load(Yii::$app->request->post()) && $credit_form->validate()) {
$credit_form->id_user = $id ;
$credit_form->save();
$credit_form = new CreditForm;
}

$historique = CreditHistorique::find()
@@ -209,7 +211,7 @@ class UserController extends BackendController {

return $this->render('credit', [
'user' => $user,
'credit_historique' => $credit_historique,
'credit_form' => $credit_form,
'historique' => $historique
]);
}

+ 86
- 0
backend/models/CreditForm.php Visa fil

@@ -0,0 +1,86 @@
<?php

namespace backend\models;

use Yii;
use yii\base\Model;
use common\models\CreditHistorique ;
use common\models\User ;
use common\models\Etablissement ;
use common\models\UserEtablissement ;
use common\helpers\Mail ;

/**
* ContactForm is the model behind the contact form.
*/
class CreditForm extends Model {

public $id_user ;
public $id_user_action ;
public $id_etablissement ;
public $type ;
public $montant ;
public $moyen_paiement ;
public $commentaire ;
public $send_mail ;

/**
* @inheritdoc
*/
public function rules() {
return [
[['montant'], 'required'],
[['id_user', 'id_user_action', 'id_etablissement'], 'integer'],
[['date','send_mail'], 'safe'],
[['montant'], 'double'],
[['type', 'moyen_paiement', 'commentaire'], 'string', 'max' => 255],
];
}

/**
* @inheritdoc
*/
public function attributeLabels() {
return [
'id_user' => 'Utilisateur',
'id_user_action' => 'Utilisateur',
'date' => 'Date',
'montant' => 'Montant',
'type' => 'Type',
'id_etablissement' => 'Établissement',
'moyen_paiement' => 'Moyen de paiement',
'commentaire' => 'Commentaire',
'send_mail' => 'Prévenir l\'utilisateur',
];
}
public function save() {
if ($this->validate()) {
$credit_historique = new CreditHistorique ;
$credit_historique->id_user = $this->id_user;
$credit_historique->id_user_action = Yii::$app->user->identity->id;
$credit_historique->id_etablissement = Yii::$app->user->identity->id_etablissement;
$credit_historique->type = $this->type ;
$credit_historique->commentaire = $this->commentaire ;
$credit_historique->montant = $this->montant ;
$credit_historique->moyen_paiement = $this->moyen_paiement ;
$credit_historique->save();
// on prévient l'utilisateur que son compte vient d'être crédité
if($this->send_mail) {
$user = User::findOne($this->id_user) ;
$etablissement = Etablissement::findOne(Yii::$app->user->identity->id_etablissement) ;
$user_etablissement = UserEtablissement::findOne(['id_user' => $this->id_user, 'id_etablissement' => Yii::$app->user->identity->id_etablissement]);
Mail::send($user->email, 'Votre compte vient d\'être crédité','creditUser', [
'user' => $user,
'etablissement' => $etablissement,
'user_etablissement' => $user_etablissement,
'credit_form' => $this
]) ;
}
}
}

}

+ 6
- 4
backend/views/user/credit.php Visa fil

@@ -28,18 +28,20 @@ $this->params['breadcrumbs'][] = 'Créditer';
<div class="col-md-12">
<h1><?= $this->title ?></h1>
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($credit_historique, 'type')->dropDownList([
<?= $form->field($credit_form, 'type')->dropDownList([
CreditHistorique::TYPE_CREDIT => 'Crédit',
CreditHistorique::TYPE_DEBIT => 'Débit',
]) ?>
<?= $form->field($credit_historique, 'montant')->textInput() ?>
<?= $form->field($credit_historique, 'moyen_paiement')->dropDownList([
<?= $form->field($credit_form, 'montant')->textInput() ?>
<?= $form->field($credit_form, 'moyen_paiement')->dropDownList([
CreditHistorique::MOYEN_ESPECES => 'Espèces',
CreditHistorique::MOYEN_CB => 'Carte bancaire',
CreditHistorique::MOYEN_CHEQUE => 'Chèque',
CreditHistorique::MOYEN_AUTRE => 'Autre',
]) ?>
<?= $form->field($credit_historique, 'commentaire')->textarea() ?>
<?= $form->field($credit_form, 'commentaire')->textarea() ?>
<?= $form->field($credit_form, 'send_mail')->checkbox() ?>
<div class="form-group">
<?= Html::submitButton( 'Créditer', ['class' => 'btn btn-primary']) ?>
</div>

+ 2
- 2
common/controllers/CommonController.php Visa fil

@@ -12,8 +12,8 @@ class CommonController extends \yii\web\Controller {
}

return parent::beforeAction($event);
}
}
}

?>

+ 19
- 0
common/helpers/Mail.php Visa fil

@@ -0,0 +1,19 @@
<?php

namespace common\helpers;

use Yii;

class Mail {
public static function send($email, $subject, $view, $data) {
$mail = Yii::$app->mailer->compose(
[ 'html' => $view.'-html',
'text' => $view.'-text'
],
$data)
->setTo($email)
->setFrom(['contact@laboiteapain.net' => 'La boîte à pain'])
->setSubject('[La boîte à pain] '.$subject)
->send();
}
}

+ 11
- 0
common/helpers/Price.php Visa fil

@@ -0,0 +1,11 @@
<?php

namespace common\helpers;

class Price {
public static function format($number) {
return number_format($number, 2).' €' ;
}
}

+ 16
- 0
common/mail/creditUser-html.php Visa fil

@@ -0,0 +1,16 @@
<?php

use yii\helpers\Html;
use common\helpers\Price;
use common\models\CreditHistorique;

?>

<p>Bonjour <?= Html::encode($user->prenom); ?>,</p>

<p>Votre producteur <strong><?= Html::encode($etablissement->nom); ?></strong> vient
de <?php if($credit_form->type == CreditHistorique::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <strong><?= Price::format($credit_form->montant); ?></strong> sur le site <a href="http://www.laboiteapain.net/">La boîte à pain</a>.</p>

<p>Votre compte est désormais à <strong><?= Price::format($user_etablissement->credit); ?></strong></p>

<p>À bientôt.</p>

+ 13
- 0
common/mail/creditUser-text.php Visa fil

@@ -0,0 +1,13 @@
<?php

use common\helpers\Price ;
use common\models\CreditHistorique;

?>
Bonjour <?= $user->prenom; ?>,</p>

Votre producteur <?= $etablissement->nom; ?> vient de <?php if($credit_form->type == CreditHistorique::TYPE_CREDIT): ?>créditer<?php else: ?>débiter<?php endif; ?> votre compte de <?= Price::format($credit_form->montant); ?> sur le site http://www.laboiteapain.net/

Votre compte est désormais à : <?= Price::format($user_etablissement->credit); ?>.

À bientôt

+ 1
- 0
common/models/CreditHistorique.php Visa fil

@@ -27,6 +27,7 @@ class CreditHistorique extends ActiveRecord {
const TYPE_PAIEMENT = 'paiement';
const TYPE_REMBOURSEMENT = 'remboursement';
const TYPE_DEBIT = 'debit';
const MOYEN_CB = 'cb';
const MOYEN_ESPECES = 'especes';
const MOYEN_CHEQUE = 'cheque';

+ 41
- 0
frontend/components/MyView.php Visa fil

@@ -0,0 +1,41 @@
<?php

namespace frontend\components ;

class MyView extends \yii\web\View {
var $icon ;
var $page_title ;
var $subtitle ;
public function setTitle($title, $icon = '') {
$this->title = $title ;
$this->page_title = $title ;
$this->icon = $icon ;
}
public function getTitle() {
return $this->title ;
}
public function setPageTitle($page_title) {
$this->page_title = $page_title ;
}
public function getPageTitle() {
return $this->page_title ;
}
public function setSubtitle($subtitle) {
$this->subtitle = $subtitle ;
}
public function getSubtitle() {
return $this->subtitle ;
}

public function getTitleIcon() {
return $this->icon ;
}
}

+ 3
- 0
frontend/config/main.php Visa fil

@@ -41,6 +41,9 @@ return [
],
],
],
'view' => [
'class' => 'frontend\components\MyView',
]
],
'params' => $params,
];

+ 30
- 0
frontend/controllers/EtablissementController.php Visa fil

@@ -0,0 +1,30 @@
<?php

namespace frontend\controllers;

use Yii;
use yii\filters\AccessControl;
use frontend\controllers\FrontendController;

class EtablissementController extends FrontendController {

public function behaviors() {
return [
'access' => [
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'roles' => ['@'],
]
],
],
];
}
public function actionIndex() {
return $this->render('index') ;
}
}

+ 2
- 2
frontend/views/commande/index.php Visa fil

@@ -7,12 +7,12 @@ use common\models\Commande ;

$this->title = 'Commande' ;

$this->setTitle('Tableau de bord', 'glyphicon-th-list') ;

?>

<div id="index-commande">

<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-th-list"></span> Tableau de bord</h1>

<h2>Producteurs</h2>

<?php if($commande_ok): ?>

+ 22
- 0
frontend/views/etablissement/index.php Visa fil

@@ -0,0 +1,22 @@
<?php

$this->title = 'Établissement' ;

?>

<div class="header-etablissement">
<div id="block-main-img">
<img id="main-img" src="http://www.laboiteapain.net/uploads/Four_Le_Chat_des_Noisettes-582049376a029.jpg" />
<h1><span>Le Chat des Noisettes</span></h1>
</div>
</div>

<nav id="menu-etablissement">
<ul class="nav nav-pills">
<li><a href="#"><span class="glyphicon glyphicon-heart-empty"></span> Présentation</a></li>
<li><a href="#"><span class="glyphicon glyphicon-plus"></span> Commander</a></li>
<li><a href="#"><span class="glyphicon glyphicon-folder-open"></span> Historique</a></li>
<li><a href="#"><span class="glyphicon glyphicon-euro"></span> Crédit pain</a></li>
</ul>
</nav>


+ 116
- 79
frontend/views/layouts/main.php Visa fil

@@ -17,98 +17,135 @@ AppAsset::register($this);
<?php $this->beginPage() ?>
<!DOCTYPE html>
<head>
<title><?php if($is_home): ?>La boîte à pain &bull; <?= Html::encode($this->title) ?> <?php else: ?><?= Html::encode($this->title) ?> &bull; La boîte à pain<?php endif; ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php if($is_home): ?>La boîte à pain &bull; <?= Html::encode($this->getPageTitle()) ?> <?php else: ?><?= Html::encode($this->getPageTitle()) ?> &bull; La boîte à pain<?php endif; ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="./img/favicon.ico" /><![endif]-->
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="./img/favicon.ico" /><![endif]-->
<?php $this->head() ?>
<!--[if lt IE 9]>
<script src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/js/html5shiv.min.js"></script>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 7]>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie7.css" rel="stylesheet">
<![endif]-->
<script src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/js/html5shiv.min.js"></script>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 7]>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie7.css" rel="stylesheet">
<![endif]-->
</head>
<body class="<?php if($is_home): echo 'home' ; endif; ?><?php if(!Yii::$app->user->isGuest): ?> connected<?php endif; ?>">
<?php $this->beginBody() ?>
<div id="back"></div>
<?php if(YII_ENV == 'demo'): ?>
<div id="block-demo">
<div class="container">
<span class="glyphicon glyphicon-eye-open"></span> <strong>Espace de démonstration</strong> :
Testez la plateforme sans avoir à vous inscrire. Les données sont réinitialisées quotidiennement &bull; <?= Html::a('Retour', Url::env('prod', 'frontend')) ?>
<?php $this->beginBody() ?>
<?php if(YII_ENV == 'demo'): ?>
<div id="block-demo">
<div class="container">
<span class="glyphicon glyphicon-eye-open"></span> <strong>Espace de démonstration</strong> :
Testez la plateforme sans avoir à vous inscrire. Les données sont réinitialisées quotidiennement &bull; <?= Html::a('Retour', Url::env('prod', 'frontend')) ?>
</div>
</div>
<?php endif; ?>
<div id="main">
<div class="col-md-3" id="col-left">
<div class="affix">
<section id="logo">
<a id="link-home" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo Yii::$app->urlManager->createUrl('commande/index') ; endif; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<div class="text">
<div class="bap">La boîte à pain</div>
<div class="plateforme">Plateforme de réservation
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?><?php if(YII_ENV == 'dev'): ?><?php elseif(YII_ENV == 'demo'): ?><?php endif; ?></div><?php endif; ?>
</div>
</div>
<?php endif; ?>
<header id="header">
<div class="container">
<a id="link-home" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo Yii::$app->urlManager->createUrl('commande/index') ; endif; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<div class="text">
<div class="bap">La boîte à pain</div>
<div class="plateforme">Plateforme de réservation
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?><?php if(YII_ENV == 'dev'): ?>(dév)<?php elseif(YII_ENV == 'demo'): ?>(démo)<?php endif; ?></div><?php endif; ?></div>
</div>
</a>
<nav class="">
<ul class="nav nav-pills">
<div class="clr"></div>
</a>
</section>

<section id="links">
<nav>
<ul class="">
<?php if(!Yii::$app->user->isGuest):?>
<li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'index'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/index') ; ?>"><span class="glyphicon glyphicon-th-list"></span> Tableau de bord</a></li>
<li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'create'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/create') ; ?>"><span class="glyphicon glyphicon-plus"></span> Commander</a></li>
<li><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'update'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/update') ; ?>"><span class="glyphicon glyphicon-user"></span> Profil</a></li>
<li><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> Déconnexion<br /><span class="nom"><?php echo Html::encode(Yii::$app->user->identity->prenom .' '. substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?></span></a></li>
<?php if(Yii::$app->user->identity->isBoulanger()): ?><li><a class="" id="link-espace-boulanger" href="<?php echo Url::backend(); ?>"><span class="glyphicon glyphicon-grain"></span> Espace boulanger</a></li><?php endif; ?>
<li class="col-md-3"><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'index'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/index') ; ?>"><span class="glyphicon glyphicon-th-list"></span><span class="libelle">Tableau de bord</span></a></li>
<li class="col-md-3"><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'update'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/update') ; ?>"><span class="glyphicon glyphicon-user"></span><span class="libelle">Profil</span></a></li>
<?php if(Yii::$app->user->identity->isBoulanger()): ?><li class="col-md-3"><a class="" id="link-espace-boulanger" href="<?php echo Url::backend(); ?>"><span class="glyphicon glyphicon-grain"></span> <span class="libelle">Espace boulanger</span></a></li><?php endif; ?>
<li class="col-md-3"><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> <span class="libelle">Déconnexion</span><br /><span class="nom"><?php echo Html::encode(Yii::$app->user->identity->prenom .' '. substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?></span></a></li>
<?php else: ?>
<li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'login'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/login') ; ?>"><span class="glyphicon glyphicon-log-in"></span> Connexion</a></li>
<li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'signup'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>"><span class="glyphicon glyphicon-user"></span> Inscription</a></li>
<li class="col-md-6"><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'login'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/login') ; ?>"><span class="glyphicon glyphicon-log-in"></span> Connexion</a></li>
<li class="col-md-6"><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'signup'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>"><span class="glyphicon glyphicon-user"></span> Inscription</a></li>
<?php endif;?>
</ul>
</nav>
</ul>
</nav>
<div class="clr"></div>
</section>

<?php if(Yii::$app->user->isGuest):?>
<p>&#10149; Connectez-vous ou créez un compte pour passer commande chez votre producteur.</p>
<p>&#10149; Producteurs, vous pouvez tester l'outil avant de créer votre compte : <a class="btn btn-default btn-xs" id="btn-demo" href="http://demo.laboiteapain.net/"><span class="glyphicon glyphicon-eye-open"></span> Espace de démo</a>
</p>
<?php else: ?>
<section id="producteurs">
<h2>Producteurs</h2>
<nav class="nav-producteurs">
<ul>
<li>
<a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">
<span class="name">Le Chat des Noisettes</span>
</a>
</li>
<li><a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">Ferme de Coucourdon</a></li>
<li><a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">Terre de Pains</a></li>
<li><a href="#"><span class="glyphicon glyphicon-plus"></span> Ajouter un producteur</a></li>
</ul>
</nav>
</section>
<?php endif; ?>

<footer id="footer">
<div class="">
<a href="<?php echo Yii::$app->urlManager->createUrl('site/contact') ; ?>">Contact</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/mentions') ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/cgv') ; ?>">CGS</a>
</div>
</header>
<div id="main">
<section class="<?php if(!$is_home): ?>container<?php endif;?>" id="content">
<?php if(Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if(Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php endif; ?>
<?= $content ?>
</section>
</div>
<footer id="footer">
<div class="container">
<a href="<?php echo Yii::$app->urlManager->createUrl('site/contact') ; ?>">Contact</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/mentions') ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/cgv') ; ?>">CGS</a>
</div>
</footer>
</footer>
</div>
</div>
<section class="col-md-9 col-lg-offset-3" id="content">
<?php if(strlen($this->getTitle())): ?>
<div class="header-title">
<h1><?php if(strlen($this->getTitleIcon())): ?><span class="glyphicon <?= $this->getTitleIcon(); ?>"></span><?php endif; ?> <?= $this->getTitle(); ?></h1>
<?php if(strlen($this->getSubtitle())): ?><h2><?= $this->getSubtitle(); ?></h2><?php endif; ?>
</div>
<?php endif; ?>

<div id="the-content">
<?php if(Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if(Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php endif; ?>
<?= $content ?>
</div>
</section>
<div class="clr"></div>
</div>
<?php $this->endBody() ?>
<?php $this->endBody() ?>
<!-- analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
<!-- analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-86917043-1', 'auto');
ga('send', 'pageview');
</script>
ga('create', 'UA-86917043-1', 'auto');
ga('send', 'pageview');
</script>
</body>
</html>
<?php $this->endPage() ?>

+ 3
- 3
frontend/views/site/_cgv_content.php Visa fil

@@ -63,9 +63,9 @@

<h2>8. Redevances d'utilisation du Site</h2>
<p>La création d’un compte et l’utilisation de la partie du Site réservée aux Boulangers
implique le paiement mensuel par les Boulangers d'un montant défini par eux-même dans
la section Facturation. Si ce montant est supérieur à 0€, la Société émettra à l’issue
de chaque mois une facture au Boulanger, payable
implique le paiement mensuel par les Boulangers d’un montant équivalent à deux (2) %
du chiffre d’affaires mensuel réalisé à partir des commandes enregistrées sur le Site.
La Société émettra à l’issue de chaque mois une facture au Boulanger, payable
par virement bancaire ou par chèque dans les trente (30) jours à compter
de la date d’émission de la facture. Tout défaut ou retard de paiement emportera
immédiatement application de pénalités de retard à un taux qui est de trois fois

+ 6
- 4
frontend/views/site/_tarifs_boulanger.php Visa fil

@@ -7,10 +7,12 @@
<h4 class="modal-title" id="myModalLabel">Tarifs</h4>
</div>
<div class="modal-body">
<div class="alert alert-warning"><em>La boîte à pain</em> fonctionne grâce à un système de <strong>prix libre</strong>.
Chaque producteur définit lui-même le prix mensuel de son abonnement à la plateforme, selon son intérêt et le soutien qu'il
veut apporter.<br /><br />
Ce montant est modifiable à tout moment dans la section <em>Facturation</em> de l'interface d'administration.</div>
<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>
<div class="commission"><span><strong>2 %</strong> du chiffre d'affaire TTC</span></div>
<div class="exemple">Exemple : si pour un mois donné, vous avez comptabilisé <em>2500 € TTC</em> de chiffre d'affaire réalisé sur la plateforme,
vous recevrez une facture d'un montant de <em>50 € TTC</em> pour ce mois.</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Fermer</button>

+ 1
- 1
frontend/views/site/cgv.php Visa fil

@@ -2,7 +2,7 @@
$this->title = 'Conditions générales de service';
?>

<div class="container content-text">
<div class="content-text">
<h1>Conditions générales de service</h1>


+ 44
- 88
frontend/views/site/index.php Visa fil

@@ -13,100 +13,56 @@ use dosamigos\leaflet\widgets\Map;
use common\helpers\Url ;

/* @var $this yii\web\View */
$this->title = 'Plateforme de réservation de pain';
?>

<?php

$this->setTitle('Bienvenue sur la boîte à pain') ;
$this->setSubtitle('Des outils numériques pour les circuits courts') ;
$this->setPageTitle('Plateforme de réservation de pain') ;
?>
<div class="item" id="presentation">
<div class="container">
<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</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 />
Clients
</h2>
<p><em>Réservez votre pain en ligne et récupérez votre commande<br />
chez votre producteur ou dans un dépôt près de chez vous.</em></p>
<ul>
<li>Garantie d'avoir du pain</li>
<li>Moyen simple de commander</li>
<li>Possibilité de choisir un dépôt proche de chez soi</li>
</ul>
<div class="prix">
<span>Gratuit</span>
</div>
<div id="presentation">
<div class="row" id="row-clients-boulanger">
<div class="col-md-6" id="clients">
<h2>
<img class="img" src="./img/clients.png" id="img-clients" />
<span>Clients</span>
</h2>
<p><em>Réservez votre pain en ligne et récupérez votre commande<br />
chez votre producteur ou dans un dépôt près de chez vous.</em></p>
<ul>
<li>Garantie d'avoir vos produits</li>
<li>Moyen simple de commander</li>
<li>Possibilité de choisir un dépôt proche de chez soi</li>
</ul>
<div class="prix">
<span>Gratuit</span>
</div>
<div class="col-md-6 boulanger">
<h2>
<img src="./img/boulanger1.png" id="img-boulanger" /><br />
Producteur
</h2>
<p><em>Simplifiez la gestion de vos commandes<br /> et optimisez votre production.</em></p>
<ul>
<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);">Prix libre</a></span>
</div>
</div>
<div class="col-md-6 boulanger">
<h2>
<img class="img" src="./img/boulanger1.png" id="img-boulanger" />
<span>Producteur</span>
</h2>

<p><em>Simplifiez la gestion de vos commandes<br /> et optimisez votre production.</em></p>

<ul>
<li>Prise de commande en ligne automatisée</li>
<li>Gestion de vos points de vente (dépôts, AMAP 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);">Commission : 2% du CA</a></span>
</div>
</div>
<?php if(Yii::$app->user->isGuest): ?>
<div class="row" id="row-signup">
<?php if(YII_ENV == 'demo'): ?>
<a class="btn btn-primary btn-lg" href="<?= Url::env('prod','frontend'); ?>"><span class="glyphicon glyphicon-circle-arrow-left"></span> Retour sur le site</a>
<?php else: ?>
<a class="btn btn-primary btn-lg" href="<?= Yii::$app->urlManager->createUrl('site/signup'); ?>"><span class="glyphicon glyphicon-circle-arrow-right"></span> Je m'inscris</a><br /><br />
<a class="btn btn-default btn-lg" id="btn-demo" href="http://demo.laboiteapain.net/"><span class="glyphicon glyphicon-eye-open"></span> Espace de démo</a>;
<?php endif; ?>
</div>
<?php endif; ?>
</div>
</div>

<div class="item back1" id="contact">
<div class="container">
<div class="separateur"></div>
<h2><img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl() ; ?>/img/icon_53324.png" alt="" /> Contact</h2>
<?php if(Yii::$app->session->getFlash('success')): ?>
<div class="alert alert-success"><div class="icon"></div><?= Yii::$app->session->getFlash('success'); ?></div>
<?php endif; ?>
<?php $form = ActiveForm::begin(['id' => 'contact-form', 'action'=> '#par-telephone', 'layout' => 'horizontal',]); ?>
<?= $form->field($model, 'name') ?>
<?= $form->field($model, 'email') ?>
<?= $form->field($model, 'subject') ?>
<?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
]) ?>
<div class="form-group">
<?= Html::submitButton('Envoyer', ['class' => 'btn btn-default', 'name' => 'contact-button']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
<?php if(Yii::$app->user->isGuest): ?>
<div class="row" id="row-signup">
<?php if(YII_ENV == 'demo'): ?>
<a class="btn btn-primary btn-lg" href="<?= Url::env('prod','frontend'); ?>"><span class="glyphicon glyphicon-circle-arrow-left"></span> Retour sur le site</a>
<?php endif; ?>
</div>
<?php endif; ?>
</div>

<!-- Tarifs -->

Binär
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Visa fil


+ 343
- 105
frontend/web/css/screen.css Visa fil

@@ -152,22 +152,21 @@ ul li {
/* line 121, ../sass/screen.scss */
#main {
position: relative;
padding-bottom: 150px;
}
/* line 124, ../sass/screen.scss */
/* line 123, ../sass/screen.scss */
#main .inner {
width: 960px;
margin: 0px auto;
}

/* line 131, ../sass/screen.scss */
/* line 130, ../sass/screen.scss */
#content .content-text h1 {
font-family: "myriadpro-regular";
font-size: 30px;
color: black;
text-transform: uppercase;
}
/* line 138, ../sass/screen.scss */
/* line 137, ../sass/screen.scss */
#content .content-text h2 {
font-family: "comfortaaregular";
font-size: 20px;
@@ -178,30 +177,39 @@ ul li {
}

/* line 148, ../sass/screen.scss */
#content #the-content {
padding-top: 100px;
padding-left: 30px;
padding-right: 30px;
padding-bottom: 50px;
}

/* line 156, ../sass/screen.scss */
#block-demo {
padding: 10px 0px;
background-color: #BB8757;
color: white;
text-align: center;
}
/* line 154, ../sass/screen.scss */
/* line 162, ../sass/screen.scss */
#block-demo a {
color: white;
text-decoration: underline;
}

/* line 160, ../sass/screen.scss */
/* line 168, ../sass/screen.scss */
#header {
display: none;
z-index: 100;
border-bottom: solid 1px #e0e0e0;
background-color: #f8f1dd;
height: 86px;
}
/* line 166, ../sass/screen.scss */
/* line 175, ../sass/screen.scss */
#header .container {
position: relative;
}
/* line 170, ../sass/screen.scss */
/* line 179, ../sass/screen.scss */
#header #env-dev {
font-family: "comfortaabold";
text-align: center;
@@ -214,7 +222,7 @@ ul li {
top: 18px;
left: 79px;
}
/* line 183, ../sass/screen.scss */
/* line 192, ../sass/screen.scss */
#header #link-home {
position: absolute;
top: 10px;
@@ -224,56 +232,56 @@ ul li {
color: black;
display: block;
}
/* line 192, ../sass/screen.scss */
/* line 201, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
float: left;
}
/* line 198, ../sass/screen.scss */
/* line 207, ../sass/screen.scss */
#header #link-home .text {
float: left;
padding-left: 10px;
}
/* line 202, ../sass/screen.scss */
/* line 211, ../sass/screen.scss */
#header #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 207, ../sass/screen.scss */
/* line 216, ../sass/screen.scss */
#header #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 215, ../sass/screen.scss */
/* line 224, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
color: #BB8757;
}
/* line 220, ../sass/screen.scss */
/* line 229, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 222, ../sass/screen.scss */
/* line 231, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 225, ../sass/screen.scss */
/* line 234, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 228, ../sass/screen.scss */
/* line 237, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
}
/* line 232, ../sass/screen.scss */
/* line 241, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: white;
}
/* line 242, ../sass/screen.scss */
/* line 251, ../sass/screen.scss */
#header #link-logout .nom {
color: gray;
font-size: 10px;
@@ -282,20 +290,18 @@ ul li {
top: -4px;
}

/* line 259, ../sass/screen.scss */
/* line 268, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
padding-bottom: 0px;
padding-top: 35px;
min-height: 500px;
padding: 0px;
}
/* line 266, ../sass/screen.scss */
/* line 274, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 273, ../sass/screen.scss */
/* line 281, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -306,16 +312,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 284, ../sass/screen.scss */
/* line 292, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 292, ../sass/screen.scss */
/* line 300, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 297, ../sass/screen.scss */
/* line 305, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -324,76 +330,79 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 304, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 306, ../sass/screen.scss */
/* line 314, ../sass/screen.scss */
#content #row-presentation h1 {
color: black;
}
/* line 309, ../sass/screen.scss */
/* line 317, ../sass/screen.scss */
#content #row-presentation strong {
font-family: "myriadpro-light";
font-size: 20px;
color: #B17A48;
}
/* line 316, ../sass/screen.scss */
/* line 324, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
padding-top: 40px;
}
/* line 320, ../sass/screen.scss */
/* line 329, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 13px 32px;
font-size: 25px;
padding: 10px 20px;
font-size: 20px;
text-transform: uppercase;
}
/* line 326, ../sass/screen.scss */
/* line 335, ../sass/screen.scss */
#content #row-signup a.btn-primary {
margin-right: 15px;
}
/* line 340, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
text-align: center;
}
/* line 329, ../sass/screen.scss */
/* line 343, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
margin-bottom: 10px;
}
/* line 333, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
/* line 345, ../sass/screen.scss */
#content #row-clients-boulanger h2 .img {
height: 50px;
}
/* line 339, ../sass/screen.scss */
/* line 348, ../sass/screen.scss */
#content #row-clients-boulanger h2 span {
margin-left: 10px;
font-size: 25px;
position: relative;
top: 5px;
}
/* line 356, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: left;
margin-left: 20%;
}
/* line 342, ../sass/screen.scss */
/* line 358, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: circle;
color: #BB8757;
}
/* line 348, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
/* line 364, ../sass/screen.scss */
#content #row-clients-boulanger p {
padding-bottom: 4px;
}
/* line 354, ../sass/screen.scss */
/* line 370, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span {
background-color: #F8F1DD;
}
/* line 357, ../sass/screen.scss */
/* line 373, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span a {
color: #BB8757;
text-decoration: none;
}
/* line 365, ../sass/screen.scss */
/* line 381, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
text-align: center;
}
/* line 370, ../sass/screen.scss */
/* line 385, ../sass/screen.scss */
#content #row-clients-boulanger .prix span {
color: #BB8757;
border: solid 1px #BB8757;
@@ -408,7 +417,7 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 385, ../sass/screen.scss */
/* line 400, ../sass/screen.scss */
#content #row-clients-boulanger #periode-essai {
margin-top: 8px;
text-align: center;
@@ -416,98 +425,110 @@ ul li {
color: gray;
font-family: "comfortaaregular";
}
/* line 395, ../sass/screen.scss */
/* line 410, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}
/* line 401, ../sass/screen.scss */
/* line 416, ../sass/screen.scss */
#content #modal-tarifs .commission {
text-align: center;
font-size: 20px;
text-transform: uppercase;
margin-bottom: 20px;
}
/* line 422, ../sass/screen.scss */
#content #modal-tarifs .commission span {
padding: 10px 20px;
border: solid 1px black;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
}
/* line 428, ../sass/screen.scss */
#content #modal-tarifs .exemple {
color: gray;
}

/* line 408, ../sass/screen.scss */
/* line 435, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 412, ../sass/screen.scss */
/* line 439, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 421, ../sass/screen.scss */
/* line 448, ../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 426, ../sass/screen.scss */
/* line 453, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 430, ../sass/screen.scss */
/* line 457, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 433, ../sass/screen.scss */
/* line 460, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 440, ../sass/screen.scss */
/* line 467, ../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 445, ../sass/screen.scss */
/* line 472, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
left: 0px;
width: 100%;
height: 50px;
background-color: white;
text-align: center;
border-top: 1px solid #e0e0e0;
padding-top: 30px;
padding-bottom: 60px;
padding-top: 20px;
padding-bottom: 40px;
background-color: #FAFAFA;
position: absolute;
bottom: 0px;
left: 0px;
}
/* line 459, ../sass/screen.scss */
/* line 486, ../sass/screen.scss */
#footer a {
font-family: "myriadpro-regular";
color: #7e7e7e;
color: white;
color: #999;
font-size: 12px;
color: gray;
text-transform: uppercase;
text-decoration: none;
padding-left: 10px;
padding-right: 10px;
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 470, ../sass/screen.scss */
/* line 494, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 474, ../sass/screen.scss */
/* line 498, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 480, ../sass/screen.scss */
/* line 504, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 483, ../sass/screen.scss */
/* line 507, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 488, ../sass/screen.scss */
/* line 512, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 492, ../sass/screen.scss */
/* line 516, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -515,7 +536,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 500, ../sass/screen.scss */
/* line 524, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -524,58 +545,58 @@ ul li {
color: black;
}

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

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

/* line 523, ../sass/screen.scss */
/* line 547, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 527, ../sass/screen.scss */
/* line 551, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 532, ../sass/screen.scss */
/* line 556, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 535, ../sass/screen.scss */
/* line 559, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 541, ../sass/screen.scss */
/* line 565, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

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

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

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

/* line 573, ../sass/screen.scss */
/* line 597, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -583,24 +604,241 @@ ul li {
margin-top: 0px;
}

/* line 583, ../sass/screen.scss */
/* line 607, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 588, ../sass/screen.scss */
/* line 612, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 594, ../sass/screen.scss */
/* line 618, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 598, ../sass/screen.scss */
/* line 622, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

/* line 627, ../sass/screen.scss */
#col-left {
padding: 0px;
z-index: 15;
}
/* line 631, ../sass/screen.scss */
#col-left .affix {
width: 25%;
border-right: solid 1px #e0e0e0;
background-color: #FAFAFA;
height: 100%;
}
/* line 638, ../sass/screen.scss */
#col-left #link-home {
text-decoration: none;
font-size: 22px;
color: black;
display: block;
padding: 10px;
background-color: #F8F1DD;
}
/* line 646, ../sass/screen.scss */
#col-left #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 652, ../sass/screen.scss */
#col-left #link-home .text {
padding-left: 62px;
}
/* line 655, ../sass/screen.scss */
#col-left #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 660, ../sass/screen.scss */
#col-left #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 668, ../sass/screen.scss */
#col-left h2 {
font-family: "myriadpro-regular";
color: black;
margin: 0px;
margin-bottom: 10px;
padding: 15px 0px 5px 15px;
}
/* line 676, ../sass/screen.scss */
#col-left #links {
background-color: white;
margin-bottom: 20px;
}
/* line 682, ../sass/screen.scss */
#col-left #links ul li a {
text-align: center;
border-right: solid 1px #e0e0e0;
}
/* line 686, ../sass/screen.scss */
#col-left #links ul li a:hover {
background-color: #BB8757;
color: white;
}
/* line 692, ../sass/screen.scss */
#col-left #links ul li:last-child a {
border-right: 0px none;
}
/* line 702, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li a {
padding-left: 50px;
height: 40px;
}
/* line 708, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a {
background-color: #BB8757;
position: relative;
color: white;
}
/* line 713, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a:after {
right: -40px;
top: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba(187, 135, 87, 0);
border-left-color: #BB8757;
border-width: 20px;
margin-top: -20px;
}
/* line 732, ../sass/screen.scss */
#col-left ul {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 736, ../sass/screen.scss */
#col-left ul li {
margin: 0px;
padding: 0px;
}
/* line 739, ../sass/screen.scss */
#col-left ul li a {
text-decoration: none;
font-family: "comfortaaregular";
font-family: "myriadpro-regular";
font-size: 15px;
padding: 10px;
border-bottom: solid 1px #e0e0e0;
display: block;
color: black;
}
/* line 749, ../sass/screen.scss */
#col-left ul li a span.nom, #col-left ul li a span.libelle {
display: none;
}
/* line 756, ../sass/screen.scss */
#col-left p {
padding: 20px;
padding-top: 0px;
color: gray;
}

/* line 764, ../sass/screen.scss */
#content .header-title {
height: 79px;
padding: 20px 20px;
position: fixed;
top: 0px;
width: 100%;
background-color: white;
z-index: 10;
box-sizing: border-box;
border-bottom: solid 1px #e0e0e0;
-moz-box-shadow: 0px 0px 8px #e0e0e0;
-webkit-box-shadow: 0px 0px 8px #e0e0e0;
box-shadow: 0px 0px 8px #e0e0e0;
}
/* line 776, ../sass/screen.scss */
#content .header-title h1 {
color: black;
font-family: "myriadpro-regular";
margin: 0px;
font-size: 25px;
text-transform: uppercase;
}
/* line 784, ../sass/screen.scss */
#content .header-title h2 {
color: gray;
text-transform: none;
font-size: 15px;
margin-top: 3px;
line-height: 20px;
}

/* line 795, ../sass/screen.scss */
.header-etablissement {
z-index: 1;
}
/* line 797, ../sass/screen.scss */
.header-etablissement #block-main-img {
height: 144px;
overflow: hidden;
}
/* line 801, ../sass/screen.scss */
.header-etablissement #block-main-img #main-img {
width: 100%;
height: auto;
border: 0px none;
padding: 0px;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 810, ../sass/screen.scss */
.header-etablissement h1 {
font-family: "comfortaaregular";
text-align: center;
position: absolute;
top: 30px;
left: 40px;
}
/* line 817, ../sass/screen.scss */
.header-etablissement h1 span {
background-color: rgba(255, 255, 255, 0.8);
padding: 10px 30px;
border: dotted 1px black;
}

/* line 828, ../sass/screen.scss */
nav#menu-etablissement {
border-bottom: solid 1px #e0e0e0;
}
/* line 832, ../sass/screen.scss */
nav#menu-etablissement ul li {
padding: 0px;
margin: 0px;
}
/* line 835, ../sass/screen.scss */
nav#menu-etablissement ul li a {
border-right: solid 1px #e0e0e0;
text-decoration: none;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 840, ../sass/screen.scss */
nav#menu-etablissement ul li a:hover {
background-color: #BB8757;
color: white;
}

/* line 2, ../sass/_systeme_commandes.scss */
h1.title-systeme-commande {
color: black;

+ 287
- 42
frontend/web/sass/screen.scss Visa fil

@@ -120,7 +120,6 @@ ul {

#main {
position: relative ;
padding-bottom: 150px ;
.inner {
width: 960px ;
margin: 0px auto ;
@@ -145,6 +144,15 @@ ul {
}
}

#content {
#the-content {
padding-top: 100px ;
padding-left: 30px ;
padding-right: 30px ;
padding-bottom: 50px ;
}
}

#block-demo {
padding: 10px 0px ;
background-color: $color1 ;
@@ -158,6 +166,7 @@ ul {
}

#header {
display: none ;
z-index: 100 ;
border-bottom: solid 1px $gris1 ;
background-color: #f8f1dd ;
@@ -258,11 +267,10 @@ ul {

#content {
position: relative ;
padding: 20px 0px ;
padding-bottom: 0px ;
padding-top: 35px ;
min-height: 500px ;
//border-left: solid 1px #e0e0e0 ;
padding: 0px ;
h1#title-site {
font-family: "comfortaalight" ;
font-size: 50px ;
@@ -302,7 +310,7 @@ ul {
}
#row-presentation {
text-align: center ;
//text-align: center ;
h1 {
color: black ;
}
@@ -316,37 +324,45 @@ ul {
#row-signup {
text-align: center ;
margin-top: 40px ;
padding-top: 40px ;
a.btn {
padding: 13px 32px ;
font-size: 25px ;
padding: 10px 20px ;
font-size: 20px ;
text-transform: uppercase ;
}
a.btn-primary {
margin-right: 15px ;
}
}

#row-clients-boulanger {
margin-bottom: 50px ;
text-align: center ;
h2 {
text-align: center ;
margin-bottom: 15px ;
padding-bottom: 0px ;
img {
height: 70px ;
margin-bottom: 60px ;
}
margin-bottom: 10px ;
.img {
height: 50px ;
}
span {
margin-left: 10px ;
font-size: 25px ;
position: relative ;
top: 5px ;
}
}
ul {
text-align: left ;
margin-left: 20% ;
li {
list-style-type: circle ;
color: $color1 ;
}
}
#clients {
border-right: dotted 1px gray ;
p {
padding-bottom: 4px ;
}
.boulanger {
@@ -365,7 +381,6 @@ ul {
.prix {
padding-top: 15px ;
font-size: 18px ;
text-align: center ;
span {
color: $color1 ;
@@ -398,6 +413,18 @@ ul {
}
#modal-tarifs {
.commission {
text-align: center ;
font-size: 20px ;
text-transform: uppercase ;
margin-bottom: 20px ;
span {
padding: 10px 20px ;
border: solid 1px black ;
@include border-radius(10px) ;
}
}
.exemple {
color: gray ;
}
@@ -443,37 +470,34 @@ ul {
}

#footer {
position: absolute ;
bottom: 0px ;
left: 0px ;
width: 100% ;
height: 50px ;
background-color: white ;
text-align: center ;
border-top: 1px solid #e0e0e0 ;
padding-top: 20px ;
padding-bottom: 40px ;
background-color: #FAFAFA ;
padding-top: 30px ;
padding-bottom: 60px ;
position: absolute ;
bottom: 0px ;
left: 0px ;
a {
font-family: 'myriadpro-regular' ;
color: #7e7e7e;
color: white ;
color: #999 ;
text-transform: uppercase ;
text-decoration: none ;
padding-left: 10px ;
padding-right: 10px ;
border-right: solid 1px #7e7e7e ;
border-right: solid 1px white ;
&:hover {
color: gray ;
}
&:last-child {
border: 0px none ;
}
font-size: 12px ;
color: gray ;
text-transform: uppercase ;
text-decoration: none ;
padding-right: 10px ;
border-right: solid 1px white ;
&:hover {
color: gray ;
}

&:last-child {
border: 0px none ;
}
}
}

@@ -600,10 +624,231 @@ ul {
}
}

#col-left {
padding: 0px ;
z-index: 15 ;
.affix {
width: 25% ;
border-right: solid 1px #e0e0e0 ;
background-color: #FAFAFA ;
height: 100% ;
}
#link-home {
text-decoration: none ;
font-size: 22px ;
color: black ;
display: block ;
padding: 10px ;
background-color: $color2 ;
img {
height: 50px ;
margin-bottom: 5px ;
float: left ;
}

.text {
padding-left: 62px ;

.bap {
font-family: "comfortaalight" ;
font-size: 24px ;
}

.plateforme {
font-size: 17px ;
font-family: "myriadpro-light" ;
color: $color1 ;
}
}
}
h2 {
font-family: 'myriadpro-regular' ;
color: black ;
margin: 0px ;
margin-bottom: 10px ;
padding: 15px 0px 5px 15px ;
}
#links {
background-color: white ;
margin-bottom: 20px ;
ul {
li {
a {
text-align: center ;
border-right: solid 1px #e0e0e0 ;
&:hover {
background-color: $color1 ;
color: white ;
}
}
&:last-child a {
border-right: 0px none ;
}
}
}
}
#producteurs nav.nav-producteurs {
ul {
li {
a {
padding-left: 50px ;
height: 40px ;
//margin-right: 20px ;
}
&.active a {
background-color: $color1 ;
position: relative ;
color: white ;
&:after {
right: -40px ;
top: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba(187, 135, 87, 0);
border-left-color: #BB8757;
border-width: 20px;
margin-top: -20px;
}
}
}
}
}
ul {
list-style-type: none ;
margin: 0px ;
padding: 0px ;
li {
margin: 0px ;
padding: 0px ;
a {
text-decoration: none ;
font-family: 'comfortaaregular' ;
font-family: 'myriadpro-regular' ;
font-size: 15px ;
padding: 10px ;
border-bottom: solid 1px #e0e0e0 ;
display: block ;
color: black ;
span.nom, span.libelle {
display: none ;
}
}
}
}
p {
padding: 20px ;
padding-top: 0px ;
color: gray ;
}
}

#content {
.header-title {
height: 79px ;
padding: 20px 20px ;
position: fixed ;
top: 0px ;
width: 100% ;
background-color: white ;
z-index: 10 ;
box-sizing: border-box ;
border-bottom: solid 1px #e0e0e0 ;
@include box-shadow(0px 0px 8px #e0e0e0) ;

h1 {
color: black ;
font-family: 'myriadpro-regular' ;
margin: 0px ;
font-size: 25px ;
text-transform: uppercase ;
}

h2 {
color: gray ;
text-transform: none ;
font-size: 15px ;
margin-top: 3px ;
line-height: 20px ;
}
}
}


.header-etablissement {
z-index: 1 ;
#block-main-img {
height: 144px ;
overflow: hidden ;
#main-img {
width: 100% ;
height: auto ;
border: 0px none ;
padding: 0px ;
@include border-radius(0px) ;
}
}
h1 {
font-family: 'comfortaaregular' ;
text-align: center ;
position: absolute ;
top: 30px ;
left: 40px ;
span {
background-color: rgba(255, 255, 255, 0.8) ;
//background-color: rgba(187, 135, 87, 0.6) ;
//color: white ;
padding: 10px 30px ;
border: dotted 1px black ;
//@include border-radius(20px) ;
}
}
}

nav#menu-etablissement {
border-bottom: solid 1px #e0e0e0 ;
//background-color: #FAFAFA ;
ul {
li {
padding: 0px ;
margin: 0px ;
a {
border-right: solid 1px #e0e0e0 ;
text-decoration: none ;
@include border-radius(0px) ;
&:hover {
background-color: $color1 ;
color: white ;
}
}
}
}
}

@import "_systeme_commandes.scss" ;
@import "_responsive.scss" ;





Write Förhandsgranska
Laddar…
Avbryt
Spara