[Espace producteur] Commande : informations point de vente #144

producer/controllers/OrderController.php

@@ -791,6 +791,7 @@ class OrderController extends ProducerBaseController
 
     private function ajaxInfosPointsSale($producer, $distribution = false)
     {
+        $pointSaleManager = $this->getPointSaleManager();
         $userManager = $this->getUserManager();
         $producerManager = $this->getProducerManager();
 
@@ -834,6 +835,7 @@ class OrderController extends ProducerBaseController
         $position = 0;
 
         foreach ($pointsSaleArray as &$pointSale) {
+            $pointSaleObject = $pointSale;
             $pointSale = array_merge($pointSale->getAttributes(), [
                 'pointSaleDistribution' => [
                     'id_distribution' => $pointSale->pointSaleDistribution ? $pointSale->pointSaleDistribution[0]->id_distribution : false,
@@ -854,6 +856,8 @@ class OrderController extends ProducerBaseController
                     'id_distribution' => $distribution->id,
                     'id_point_sale' => $pointSale['id']
                 ]);
+
+                $pointSale['infos'] = $pointSaleManager->getStrInfos($pointSaleObject, strtolower(date('l', strtotime($distribution->date))));
             }
 
             $pointSale['position'] = $position;

producer/views/order/order.php

@@ -231,6 +231,9 @@ $this->setTitle('Commander') ;
                                             <div class="comment" v-if="pointSale.userPointSale">
                                                 {{ pointSale.userPointSale.comment }}
                                             </div>
+                                            <div class="comment" v-if="pointSale.infos && pointSale.infos.length > 0">
+                                                {{ pointSale.infos }}
+                                            </div>
                                         </td>
                                         <td class="locality">{{ pointSale.locality }}</td>
                                         <td class="actions">

producer/web/css/screen.css

@@ -1493,20 +1493,25 @@ termes.
   color: black;
   font-size: 20px;
   line-height: 25px;
+  font-weight: bold;
 }
 /* line 219, ../sass/order/_order.scss */
+.order-order #main #app-order-order table#points-sale td.name .comment {
+  color: gray;
+}
+/* line 224, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale td.actions {
   width: 150px;
 }
-/* line 221, ../sass/order/_order.scss */
+/* line 226, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale td.actions button {
   width: 100%;
 }
-/* line 227, ../sass/order/_order.scss */
+/* line 232, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale tr.selected td {
   background-color: white;
 }
-/* line 235, ../sass/order/_order.scss */
+/* line 240, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name {
   font-family: "highvoltageregular";
   font-size: 22px;
@@ -1514,12 +1519,12 @@ termes.
   text-transform: uppercase;
   padding-top: 13px;
 }
-/* line 242, ../sass/order/_order.scss */
+/* line 247, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-bottom,
 .order-order #main #app-order-order table#products td.category-name .glyphicon-triangle-right {
   font-size: 15px;
 }
-/* line 247, ../sass/order/_order.scss */
+/* line 252, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name span.label {
   font-family: "Arial";
   font-weight: normal;
@@ -1527,17 +1532,17 @@ termes.
   text-transform: none;
   margin-left: 15px;
 }
-/* line 256, ../sass/order/_order.scss */
+/* line 261, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name:hover {
   cursor: pointer;
   background-color: #FF7F00;
   color: white;
 }
-/* line 264, ../sass/order/_order.scss */
+/* line 269, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.photo img {
   width: 100px;
 }
-/* line 270, ../sass/order/_order.scss */
+/* line 275, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .name {
   font-family: "capsuularegular";
   color: black;
@@ -1545,22 +1550,22 @@ termes.
   line-height: 25px;
   font-weight: bold;
 }
-/* line 277, ../sass/order/_order.scss */
+/* line 282, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .other {
   font-family: "capsuularegular";
   color: black;
   font-weight: bold;
   font-size: 17px;
 }
-/* line 283, ../sass/order/_order.scss */
+/* line 288, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .description {
   color: gray;
 }
-/* line 286, ../sass/order/_order.scss */
+/* line 291, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.name .recipe {
   color: gray;
 }
-/* line 292, ../sass/order/_order.scss */
+/* line 297, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices {
   margin-top: 10px;
   font-size: 10px;
@@ -1568,34 +1573,34 @@ termes.
   padding-bottom: 2px;
   margin-bottom: 0px;
 }
-/* line 300, ../sass/order/_order.scss */
+/* line 305, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li {
   margin-bottom: 5px;
 }
-/* line 302, ../sass/order/_order.scss */
+/* line 307, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li strong {
   font-weight: bold;
 }
-/* line 310, ../sass/order/_order.scss */
+/* line 315, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit, .order-order #main #app-order-order table#products .price-total {
   width: 135px;
   text-align: center;
 }
-/* line 314, ../sass/order/_order.scss */
+/* line 319, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .unit, .order-order #main #app-order-order table#products .price-total .unit {
   color: gray;
   font-size: 13px;
 }
-/* line 319, ../sass/order/_order.scss */
+/* line 324, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity {
   width: 175px;
 }
-/* line 321, ../sass/order/_order.scss */
+/* line 326, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity input.quantity {
   text-align: center;
   border-right: 0px none;
 }
-/* line 325, ../sass/order/_order.scss */
+/* line 330, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -1603,69 +1608,69 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 336, ../sass/order/_order.scss */
+/* line 341, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary h3 {
   margin-top: 0px;
   font-family: "capsuularegular";
   text-transform: none;
   margin-bottom: 5px;
 }
-/* line 343, ../sass/order/_order.scss */
+/* line 348, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul {
   margin-bottom: 15px;
   padding-left: 20px;
   font-size: 23px;
 }
-/* line 350, ../sass/order/_order.scss */
+/* line 355, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .quantity {
   font-size: 18px;
 }
-/* line 354, ../sass/order/_order.scss */
+/* line 359, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .name {
   font-family: "capsuularegular";
   font-size: 24px;
 }
-/* line 358, ../sass/order/_order.scss */
+/* line 363, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .other {
   font-family: "capsuularegular";
   font-size: 18px;
 }
-/* line 366, ../sass/order/_order.scss */
+/* line 371, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .price-total {
   font-size: 23px;
 }
-/* line 374, ../sass/order/_order.scss */
+/* line 379, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery {
   margin-bottom: 20px;
 }
-/* line 377, ../sass/order/_order.scss */
+/* line 382, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery .delivery-home {
   margin-bottom: 20px;
 }
-/* line 386, ../sass/order/_order.scss */
+/* line 391, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .comment {
   margin-bottom: 20px;
 }
-/* line 391, ../sass/order/_order.scss */
+/* line 396, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .credit .info {
   margin-left: 20px;
   color: gray;
 }
-/* line 398, ../sass/order/_order.scss */
+/* line 403, ../sass/order/_order.scss */
 .order-order #main #app-order-order #specific-delays {
   margin-top: 15px;
 }
-/* line 406, ../sass/order/_order.scss */
+/* line 411, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos {
   margin-top: 30px;
 }
-/* line 408, ../sass/order/_order.scss */
+/* line 413, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos .panel-body {
   padding-top: 0px;
   white-space: pre-line;
 }
 
-/* line 418, ../sass/order/_order.scss */
+/* line 423, ../sass/order/_order.scss */
 #main #content .panel h3 {
   font-family: "highvoltageregular";
   margin: 0px;

producer/web/sass/order/_order.scss

@@ -213,6 +213,11 @@
                     color: black ;
                     font-size: 20px ;
                     line-height: 25px ;
+                    font-weight: bold;
+                }
+
+                .comment {
+                    color: gray;
                 }
             }