Vente au kilo : adaptation résumé commandes (index backend, mes commandes frontend etc.)

backend/views/site/index.php

@@ -92,34 +92,43 @@ $this->title = 'Tableau de bord';
     <?php endif; ?>
     
     <div id="distributions">
-        <!-- distributions -->
-        <?php if(count($distributionsArray)): ?>
-            <?php foreach($distributionsArray as $distribution): ?>
-                <div class="col-md-4 col-sm-12 col-xs-12">
-                    <div class="info-box">
-                        <span class="info-box-icon bg-green date">
-                            <span class="day"><?= strftime('%A', strtotime($distribution->date)) ?></span>
-                            <span class="num"><?= date('d', strtotime($distribution->date)) ?></span>
-                            <span class="month"><?= strftime('%B', strtotime($distribution->date)) ?></span>
-                        </span>
-                        <div class="info-box-content">
-                            <span class="info-box-text">
-                                <?php if(count($distribution->order)): ?>
-                                    <strong><?= count($distribution->order); ?></strong> COMMANDES
-                                <?php else: ?>
-                                    AUCUNE COMMANDE
-                                <?php endif; ?>
-                            </span>
-                            <span class="info-box-number"></span>
-                            <div class="buttons">
-                                <?= Html::a('<span class="fa fa-eye"></span>', ['distribution/index', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?>
-                                <?php if(count($distribution->order)): ?><?= Html::a('<span class="fa fa-download"></span>', ['distribution/report', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?><?php endif; ?>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+              <h3 class="panel-title">
+                Prochaines distributions
+              </h3>
+            </div>
+            <div class="panel-body">
+                <!-- distributions -->
+                <?php if(count($distributionsArray)): ?>
+                    <?php foreach($distributionsArray as $distribution): ?>
+                        <div class="col-md-4 col-sm-12 col-xs-12">
+                            <div class="info-box">
+                                <span class="info-box-icon bg-green date">
+                                    <span class="day"><?= strftime('%A', strtotime($distribution->date)) ?></span>
+                                    <span class="num"><?= date('d', strtotime($distribution->date)) ?></span>
+                                    <span class="month"><?= strftime('%B', strtotime($distribution->date)) ?></span>
+                                </span>
+                                <div class="info-box-content">
+                                    <span class="info-box-text">
+                                        <?php if(count($distribution->order)): ?>
+                                            <strong><?= count($distribution->order); ?></strong> COMMANDES
+                                        <?php else: ?>
+                                            AUCUNE COMMANDE
+                                        <?php endif; ?>
+                                    </span>
+                                    <span class="info-box-number"></span>
+                                    <div class="buttons">
+                                        <?= Html::a('<span class="fa fa-eye"></span>', ['distribution/index', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?>
+                                        <?php if(count($distribution->order)): ?><?= Html::a('<span class="fa fa-download"></span>', ['distribution/report', 'date' => $distribution->date], ['class' => 'btn btn-default']); ?><?php endif; ?>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </div>
-            <?php endforeach; ?>
-        <?php endif; ?>
+                    <?php endforeach; ?>
+                <?php endif; ?>
+            </div>
+        </div>
     </div>
     
     <div class="clr"></div>

backend/web/css/screen.css

@@ -1683,24 +1683,28 @@ body.login-page .login-box .login-box-body a:hover {
   color: #ff8c1a;
 }
 
-/* line 5, ../sass/site/_index.scss */
+/* line 4, ../sass/site/_index.scss */
+.site-index #distributions .info-box {
+  border: solid 1px #e0e0e0;
+}
+/* line 6, ../sass/site/_index.scss */
 .site-index #distributions .info-box .date {
   text-transform: uppercase;
   font-size: 12px;
   line-height: 20px;
   padding-top: 10px;
 }
-/* line 11, ../sass/site/_index.scss */
+/* line 12, ../sass/site/_index.scss */
 .site-index #distributions .info-box .date span {
   display: block;
 }
-/* line 17, ../sass/site/_index.scss */
+/* line 18, ../sass/site/_index.scss */
 .site-index #distributions .info-box .date .num {
   font-size: 30px;
   padding-top: 5px;
   padding-bottom: 5px;
 }
-/* line 29, ../sass/site/_index.scss */
+/* line 30, ../sass/site/_index.scss */
 .site-index #distributions .info-box-content .buttons {
   margin-top: 10px;
 }

backend/web/sass/site/_index.scss

@@ -2,6 +2,7 @@
 .site-index {
     #distributions {
         .info-box {
+            border: solid 1px #e0e0e0 ;
             .date {
                 text-transform: uppercase ;
                 font-size: 12px ;

common/models/Order.php

@@ -379,7 +379,7 @@ class Order extends ActiveRecordCommon
         $i = 0;
         foreach ($this->productOrder as $p) {
             if (isset($p->product)) {
-                $html .= $p->quantity . ' x ' . Html::encode($p->product->name);
+                $html .= Html::encode($p->product->name) .' ('. $p->quantity .' '.Product::strUnit($p->unit, true, true).')';
                 if (++$i != $count) {
                     $html .= '<br />';
                 }