Merge branch 'dev'

backend/views/communicate/instructions.php

@@ -42,21 +42,10 @@ use yii\helpers\Html ;
 
 <div class="communicate-instructions<?php if(isset($pdf) && $pdf): ?> communicate-instructions-pdf<?php endif; ?><?php if(!isset($pdf)): ?> communicate-instructions-inset<?php endif; ?>">
     <div class="header">
-        <div class="logo">
-            <img src="../img/laboulange4.png" alt="Logo" />
-        </div>
-        <h1>distrib</h1>
-        <h2>Plateforme de gestion de commandes</h2>
+        <h1><?= Html::encode($producer->name) ?></h1>
+        <h2><?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?> (<?= Html::encode($producer->postcode); ?>)</h2>
     </div>
     <div class="clr"></div>
-    
-    <h3>Pour réserver vos produits en ligne</h3>
-    
-    <ol>
-        <li>Inscrivez-vous sur <strong>www.opendistrib.net</strong> en choisisant le producteur <strong><?= Html::encode($producer->name); ?></strong></li>
-        <?php if(strlen($producer->code)): ?>
-        <li>Utilisez le code : <span class="code"><strong><?= Html::encode($producer->code) ?></strong> <?php if(!isset($pdf)): echo Html::a('<span class="glyphicon glyphicon-pencil"></span>', ['producer/update'], ['class'=> 'btn btn-default btn-xs']); endif; ?></span></li>
-        <?php endif; ?>
-        <li>Passez votre commande</li>
-    </ol>
+    <h3>Pour réserver vos produits en ligne :</h3>
+    <h4><span><?= Html::encode($producer->slug).'.opendistrib.net' ?></span></h4>
 </div>

backend/views/communicate/instructions_multi.php

@@ -38,8 +38,8 @@ termes.
 
 ?>
 
-<?php for($i = 0; $i < 8; $i++): ?>
-<div class="block-instructions-pdf<?php if($i%2 == 0): ?> block-instructions-border<?php endif; ?><?php if($i == 6 || $i == 7): ?> block-instructions-bottom<?php endif; ?>">
+<?php for($i = 0; $i < 12; $i++): ?>
+<div class="block-instructions-pdf<?php if($i%2 == 0): ?> block-instructions-border<?php endif; ?>">
     <?php echo $this->render('instructions',['pdf' => true, 'producer' => $producer]) ; ?>
 </div>
 <?php endfor; ?>

backend/web/css/screen.css

@@ -1026,16 +1026,21 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 .communicate-instructions .header .logo img {
   width: 75px;
 }
-/* line 999, ../sass/screen.scss */
-.communicate-instructions .header h1 {
+/* line 1000, ../sass/screen.scss */
+.communicate-instructions h1, .communicate-instructions h2, .communicate-instructions h3, .communicate-instructions h4 {
+  text-align: center;
+}
+/* line 1004, ../sass/screen.scss */
+.communicate-instructions h1 {
   font-family: "highvoltageregular";
   font-size: 40px;
+  line-height: 40px;
   margin-top: 0px;
   margin-bottom: 0px;
   font-weight: normal;
 }
-/* line 1007, ../sass/screen.scss */
-.communicate-instructions .header h2 {
+/* line 1013, ../sass/screen.scss */
+.communicate-instructions h2 {
   margin-top: 0px;
   font-family: "capsuularegular";
   font-size: 20px;
@@ -1044,53 +1049,67 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
   left: 2px;
   font-weight: normal;
 }
-/* line 1018, ../sass/screen.scss */
+/* line 1023, ../sass/screen.scss */
 .communicate-instructions h3 {
-  font-size: 20px;
+  font-size: 18px;
   color: #FF7F00;
   margin-top: 0px;
   margin-bottom: 0px;
+  line-height: 20px;
+  font-family: "capsuularegular";
+}
+/* line 1032, ../sass/screen.scss */
+.communicate-instructions h4 {
+  font-size: 16px;
+  margin-top: 8px;
+  font-weight: normal;
+  font-family: "capsuularegular";
+}
+/* line 1038, ../sass/screen.scss */
+.communicate-instructions h4 span {
+  border-bottom: dotted 1px black;
 }
 
-/* line 1026, ../sass/screen.scss */
+/* line 1046, ../sass/screen.scss */
 .communicate-instructions-inset {
   width: 420px;
   margin-top: 20px;
 }
-/* line 1030, ../sass/screen.scss */
+/* line 1050, ../sass/screen.scss */
 .communicate-instructions-inset .header .logo {
   width: 60px;
   margin-right: 20px;
   padding-top: 5px;
 }
-/* line 1035, ../sass/screen.scss */
+/* line 1055, ../sass/screen.scss */
 .communicate-instructions-inset .header .logo img {
   width: 60px;
 }
-/* line 1041, ../sass/screen.scss */
+/* line 1061, ../sass/screen.scss */
 .communicate-instructions-inset .header h1 {
   margin-bottom: 3px;
 }
-/* line 1050, ../sass/screen.scss */
+/* line 1067, ../sass/screen.scss */
 .communicate-instructions-inset h3 {
   margin-top: 15px;
-  margin-bottom: 15px;
+  margin-bottom: 0px;
+  font-size: 18px;
 }
 
-/* line 1056, ../sass/screen.scss */
+/* line 1078, ../sass/screen.scss */
 .block-instructions-pdf {
   width: 49.9%;
   float: left;
   border-bottom: dotted 1px gray;
 }
 
-/* line 1062, ../sass/screen.scss */
+/* line 1084, ../sass/screen.scss */
 .block-instructions-border {
   border-right: dotted 1px gray;
   border-bottom: dotted 1px gray;
 }
 
-/* line 1067, ../sass/screen.scss */
+/* line 1089, ../sass/screen.scss */
 .communicate-instructions-pdf {
   border: 0px none;
   -moz-border-radius: 0px;
@@ -1099,118 +1118,118 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
   margin-bottom: 0px;
   padding: 20px 0px 20px 30px;
 }
-/* line 1075, ../sass/screen.scss */
+/* line 1097, ../sass/screen.scss */
 .communicate-instructions-pdf .header .logo {
   float: left;
   width: 55px;
   padding-right: 15px;
   padding-top: 10px;
 }
-/* line 1081, ../sass/screen.scss */
+/* line 1103, ../sass/screen.scss */
 .communicate-instructions-pdf .header .logo img {
   width: 55px;
 }
-/* line 1085, ../sass/screen.scss */
+/* line 1107, ../sass/screen.scss */
 .communicate-instructions-pdf .header h1 {
   font-size: 32px;
 }
-/* line 1088, ../sass/screen.scss */
+/* line 1110, ../sass/screen.scss */
 .communicate-instructions-pdf .header h2 {
   font-size: 16px;
 }
-/* line 1093, ../sass/screen.scss */
+/* line 1115, ../sass/screen.scss */
 .communicate-instructions-pdf h3 {
   font-weight: normal;
 }
 
-/* line 1098, ../sass/screen.scss */
+/* line 1120, ../sass/screen.scss */
 .block-instructions-bottom {
   border-bottom: 0px none;
   border-bottom: solid 1px white;
 }
 
 /* abonnements */
-/* line 1108, ../sass/screen.scss */
+/* line 1130, ../sass/screen.scss */
 .subscription-form #block-select-user {
   padding-left: 0px;
 }
-/* line 1112, ../sass/screen.scss */
+/* line 1134, ../sass/screen.scss */
 .subscription-form #or-user {
   font-size: 20px;
   text-align: center;
 }
-/* line 1115, ../sass/screen.scss */
+/* line 1137, ../sass/screen.scss */
 .subscription-form #or-user span {
   position: relative;
   top: 24px;
 }
-/* line 1121, ../sass/screen.scss */
+/* line 1143, ../sass/screen.scss */
 .subscription-form .field-subscriptionform-id_producer {
   display: none;
 }
-/* line 1125, ../sass/screen.scss */
+/* line 1147, ../sass/screen.scss */
 .subscription-form .days .form-group {
   float: left;
   margin-right: 20px;
 }
-/* line 1132, ../sass/screen.scss */
+/* line 1154, ../sass/screen.scss */
 .subscription-form .products .table {
   width: 500px;
 }
-/* line 1135, ../sass/screen.scss */
+/* line 1157, ../sass/screen.scss */
 .subscription-form .products .quantity {
   text-align: center;
 }
 
 /* points de vente */
-/* line 1144, ../sass/screen.scss */
+/* line 1166, ../sass/screen.scss */
 .point-sale-form #pointsale-users {
   display: none;
   height: 500px;
   overflow-y: scroll;
 }
-/* line 1148, ../sass/screen.scss */
+/* line 1170, ../sass/screen.scss */
 .point-sale-form #pointsale-users label {
   font-weight: normal;
   display: block;
 }
-/* line 1152, ../sass/screen.scss */
+/* line 1174, ../sass/screen.scss */
 .point-sale-form #pointsale-users .comment {
   display: none;
   margin-left: 17px;
   width: 200px;
 }
-/* line 1160, ../sass/screen.scss */
+/* line 1182, ../sass/screen.scss */
 .point-sale-form #delivery-days .form-group {
   float: left;
   margin-right: 15px;
 }
-/* line 1164, ../sass/screen.scss */
+/* line 1186, ../sass/screen.scss */
 .point-sale-form #delivery-days .form-group label {
   font-weight: normal;
 }
 
 /* utilisateurs */
-/* line 1174, ../sass/screen.scss */
+/* line 1196, ../sass/screen.scss */
 #menu-users #nav-points-sale {
   margin-bottom: 30px;
 }
-/* line 1178, ../sass/screen.scss */
+/* line 1200, ../sass/screen.scss */
 #menu-users #submenu {
   margin-bottom: 30px;
   text-align: center;
 }
 
-/* line 1185, ../sass/screen.scss */
+/* line 1207, ../sass/screen.scss */
 .user-index .input-group {
   width: 180px;
 }
-/* line 1188, ../sass/screen.scss */
+/* line 1210, ../sass/screen.scss */
 .user-index .input-group .input-credit {
   text-align: center;
 }
 
-/* line 1195, ../sass/screen.scss */
+/* line 1217, ../sass/screen.scss */
 .user-credit .the-credit {
   float: right;
   font-weight: bold;
@@ -1226,16 +1245,16 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 }
 
 /* facturation */
-/* line 1210, ../sass/screen.scss */
+/* line 1232, ../sass/screen.scss */
 #free-price {
   padding: 20px;
   background-color: #F9F9F9;
 }
-/* line 1214, ../sass/screen.scss */
+/* line 1236, ../sass/screen.scss */
 #free-price h2 {
   font-family: "myriadpro-it";
 }
-/* line 1218, ../sass/screen.scss */
+/* line 1240, ../sass/screen.scss */
 #free-price .amount span {
   font-size: 25px;
   color: white;
@@ -1247,25 +1266,25 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
   padding-top: 7px;
   font-family: "myriadpro-regular";
 }
-/* line 1229, ../sass/screen.scss */
+/* line 1251, ../sass/screen.scss */
 #free-price label {
   text-transform: uppercase;
   font-family: "myriadpro-light";
   font-size: 20px;
 }
-/* line 1234, ../sass/screen.scss */
+/* line 1256, ../sass/screen.scss */
 #free-price label span {
   font-size: 16px;
 }
-/* line 1240, ../sass/screen.scss */
+/* line 1262, ../sass/screen.scss */
 #free-price .field-producer-free_price .input-group {
   width: 200px;
 }
-/* line 1246, ../sass/screen.scss */
+/* line 1268, ../sass/screen.scss */
 #free-price .field-user-free_price label {
   display: none;
 }
-/* line 1251, ../sass/screen.scss */
+/* line 1273, ../sass/screen.scss */
 #free-price #producer-free_price {
   width: 100px;
   height: 60px;
@@ -1274,37 +1293,37 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
   text-align: center;
 }
 
-/* line 1261, ../sass/screen.scss */
+/* line 1283, ../sass/screen.scss */
 .development-index ul#tabs-status-developments {
   margin-bottom: 30px;
   border-bottom: solid 3px #FF7F00;
 }
-/* line 1265, ../sass/screen.scss */
+/* line 1287, ../sass/screen.scss */
 .development-index ul#tabs-status-developments a {
   text-transform: uppercase;
 }
-/* line 1268, ../sass/screen.scss */
+/* line 1290, ../sass/screen.scss */
 .development-index ul#tabs-status-developments .active {
   border: 0px none;
   background: none;
 }
-/* line 1271, ../sass/screen.scss */
+/* line 1293, ../sass/screen.scss */
 .development-index ul#tabs-status-developments .active a {
   background-color: #FF7F00;
   color: white;
 }
-/* line 1279, ../sass/screen.scss */
+/* line 1301, ../sass/screen.scss */
 .development-index #tab-developments .btn-group-priority {
   width: 100%;
   margin-bottom: 5px;
 }
-/* line 1283, ../sass/screen.scss */
+/* line 1305, ../sass/screen.scss */
 .development-index #tab-developments .btn-group-priority .btn-priority {
   display: block;
   float: none;
   width: 100%;
 }
-/* line 1290, ../sass/screen.scss */
+/* line 1312, ../sass/screen.scss */
 .development-index #tab-developments .label-priority {
   display: block;
   width: 100%;
@@ -1313,24 +1332,24 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
 }
 
 /* stats */
-/* line 1303, ../sass/screen.scss */
+/* line 1325, ../sass/screen.scss */
 .stats-products #nav-year {
   float: right;
 }
-/* line 1308, ../sass/screen.scss */
+/* line 1330, ../sass/screen.scss */
 .stats-products tr.month th {
   text-align: center;
 }
-/* line 1313, ../sass/screen.scss */
+/* line 1335, ../sass/screen.scss */
 .stats-products tr.sub-head th {
   font-weight: normal;
   font-size: 12px;
 }
-/* line 1319, ../sass/screen.scss */
+/* line 1341, ../sass/screen.scss */
 .stats-products td.name {
   text-transform: uppercase;
 }
-/* line 1323, ../sass/screen.scss */
+/* line 1345, ../sass/screen.scss */
 .stats-products td.align-center {
   text-align: center;
 }

backend/web/sass/screen.scss

@@ -995,32 +995,52 @@ a.btn, button.btn {
                 width: 75px ;
             }
          }
-        
-        h1 {
-            font-family: 'highvoltageregular' ;
-            font-size: 40px ;
-            margin-top: 0px ;
-            margin-bottom: 0px ;
-            font-weight: normal ;
-        }
-        
-        h2 {
-            margin-top: 0px ;
-            font-family: 'capsuularegular' ;
-            font-size: 20px ;
-            margin-top: 0px ;
-            position: relative ;
-            left: 2px ;
-            font-weight: normal ;
-        }
     }
     
-    h3 {
+    h1, h2, h3, h4 {
+        text-align: center ;
+    }
+    
+    h1 {
+        font-family: 'highvoltageregular' ;
+        font-size: 40px ;
+        line-height: 40px ;
+        margin-top: 0px ;
+        margin-bottom: 0px ;
+        font-weight: normal ;
+    }
+
+    h2 {
+        margin-top: 0px ;
+        font-family: 'capsuularegular' ;
         font-size: 20px ;
+        margin-top: 0px ;
+        position: relative ;
+        left: 2px ;
+        font-weight: normal ;
+    }
+    
+    h3 {
+        font-size: 18px ;
         color: $color1 ;
         margin-top: 0px ;
         margin-bottom: 0px ;
+        line-height: 20px; 
+        font-family: 'capsuularegular' ;
+    }
+    
+    h4 {
+        font-size: 16px ;
+        margin-top: 8px ;
+        font-weight: normal;
+        font-family: 'capsuularegular' ;
+        
+        span {
+            border-bottom: dotted 1px black ;
+        }
+        
     }
+    
 }
 
 .communicate-instructions-inset {
@@ -1042,14 +1062,16 @@ a.btn, button.btn {
             margin-bottom: 3px ;
         }
         
-        h2 {
-            
-        }
     }
     
     h3 {
         margin-top: 15px ;
-        margin-bottom: 15px ;
+        margin-bottom: 0px ;
+        font-size: 18px ;
+    }
+    
+    h4 {
+        
     }
 }
 

producer/web/js/vuejs/order-order.js

@@ -251,9 +251,6 @@ var app = new Vue({
             if(this.pointSaleActive.credit_functioning == 'mandatory' || (this.pointSaleActive.credit_functioning == 'user' && this.user.credit_active)) {
                 this.useCredit = true ;
             }
-            else {
-                this.useCredit = false ;
-            }
             
             this.changeStep('products') ;
         },