[Administration & espace producteur] Points de vente : possibilité de mettre un lien dans le descriptif #1240

common/logic/PointSale/PointSale/Service/PointSaleSolver.php

@@ -78,6 +78,7 @@ class PointSaleSolver extends AbstractService implements SolverInterface
         if (strlen($pointSale->$field)) {
             $str = nl2br(Html::encode($pointSale->$field));
             $str = preg_replace('/\[select_previous_day\](.*?)\[\/select_previous_day\]/', '<a href="javascript:void(0);" class="select-previous-day">$1</a>', $str);
+            $str = preg_replace('@([^>"])(https?://[a-z0-9\./+,%#_-]+)@i', '$1<a href="$2" target="_blank">$2</a>', $str);
         }
         return $str;
     }

producer/controllers/OrderController.php

@@ -767,7 +767,6 @@ class OrderController extends ProducerBaseController
     private function ajaxInfosPointsSale($producer, $distribution = false)
     {
         $pointSaleManager = $this->getPointSaleManager();
-        $userManager = $this->getUserManager();
         $producerManager = $this->getProducerManager();
         $orderManager = $this->getOrderManager();
 

producer/web/css/screen.css

@@ -1474,19 +1474,23 @@ termes.
 .order-order #main #app-order-order table#points-sale td.name .comment {
   color: gray;
 }
-/* line 227, ../sass/order/_order.scss */
+/* line 225, ../sass/order/_order.scss */
+.order-order #main #app-order-order table#points-sale td.name .comment a {
+  color: #F39C12;
+}
+/* line 231, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale td.actions {
   width: 150px;
 }
-/* line 229, ../sass/order/_order.scss */
+/* line 233, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale td.actions button {
   width: 100%;
 }
-/* line 235, ../sass/order/_order.scss */
+/* line 239, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#points-sale tr.selected td {
   background-color: white;
 }
-/* line 243, ../sass/order/_order.scss */
+/* line 247, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name {
   font-family: "highvoltageregular";
   font-size: 22px;
@@ -1494,12 +1498,12 @@ termes.
   text-transform: uppercase;
   padding-top: 13px;
 }
-/* line 250, ../sass/order/_order.scss */
+/* line 254, ../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 255, ../sass/order/_order.scss */
+/* line 259, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name span.label {
   font-family: "Arial";
   font-weight: normal;
@@ -1507,17 +1511,17 @@ termes.
   text-transform: none;
   margin-left: 15px;
 }
-/* line 264, ../sass/order/_order.scss */
+/* line 268, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.category-name:hover {
   cursor: pointer;
   background-color: #F39C12;
   color: white;
 }
-/* line 272, ../sass/order/_order.scss */
+/* line 276, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products td.photo img {
   width: 100px;
 }
-/* line 282, ../sass/order/_order.scss */
+/* line 286, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices {
   margin-top: 10px;
   font-size: 10px;
@@ -1525,34 +1529,34 @@ termes.
   padding-bottom: 2px;
   margin-bottom: 0px;
 }
-/* line 290, ../sass/order/_order.scss */
+/* line 294, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li {
   margin-bottom: 5px;
 }
-/* line 292, ../sass/order/_order.scss */
+/* line 296, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .price-unit .decreasing-prices ul li strong {
   font-weight: bold;
 }
-/* line 300, ../sass/order/_order.scss */
+/* line 304, ../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 304, ../sass/order/_order.scss */
+/* line 308, ../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 309, ../sass/order/_order.scss */
+/* line 313, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity {
   width: 175px;
 }
-/* line 311, ../sass/order/_order.scss */
+/* line 315, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity input.quantity {
   text-align: center;
   border-right: 0px none;
 }
-/* line 315, ../sass/order/_order.scss */
+/* line 319, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products .td-quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -1560,69 +1564,69 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 326, ../sass/order/_order.scss */
+/* line 330, ../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 333, ../sass/order/_order.scss */
+/* line 337, ../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 340, ../sass/order/_order.scss */
+/* line 344, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .summary ul li .quantity {
   font-size: 18px;
 }
-/* line 344, ../sass/order/_order.scss */
+/* line 348, ../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 348, ../sass/order/_order.scss */
+/* line 352, ../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 356, ../sass/order/_order.scss */
+/* line 360, ../sass/order/_order.scss */
 .order-order #main #app-order-order table#products tr.total .price-total {
   font-size: 23px;
 }
-/* line 364, ../sass/order/_order.scss */
+/* line 368, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery {
   margin-bottom: 20px;
 }
-/* line 367, ../sass/order/_order.scss */
+/* line 371, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .delivery .delivery-home {
   margin-bottom: 20px;
 }
-/* line 376, ../sass/order/_order.scss */
+/* line 380, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .comment {
   margin-bottom: 20px;
 }
-/* line 381, ../sass/order/_order.scss */
+/* line 385, ../sass/order/_order.scss */
 .order-order #main #app-order-order #content-step-payment .credit .info {
   margin-left: 20px;
   color: gray;
 }
-/* line 388, ../sass/order/_order.scss */
+/* line 392, ../sass/order/_order.scss */
 .order-order #main #app-order-order #specific-delays {
   margin-top: 15px;
 }
-/* line 396, ../sass/order/_order.scss */
+/* line 400, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos {
   margin-top: 30px;
 }
-/* line 398, ../sass/order/_order.scss */
+/* line 402, ../sass/order/_order.scss */
 .order-order #main #app-order-order #infos .panel-body {
   padding-top: 0px;
   white-space: pre-line;
 }
 
-/* line 408, ../sass/order/_order.scss */
+/* line 412, ../sass/order/_order.scss */
 #main #content .panel h3 {
   font-family: "highvoltageregular";
   margin: 0px;

producer/web/sass/order/_order.scss

@@ -221,6 +221,10 @@
 
                 .comment {
                     color: gray;
+
+                    a {
+                        color: $color1;
+                    }
                 }
             }