Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -562,6 +562,7 @@ class DistributionController extends BackendController
                             padding: 3px 8px ;
                             vertical-align : top;
                             page-break-inside: avoid !important;
+                            color: black;
                         }
 
                         table tr th { 

backend/views/distribution/report.php

@@ -99,7 +99,7 @@ foreach ($pointsSaleArray as $pointSale) {
                         foreach ($order->productOrder as $productOrder) {
                             if($product->id == $productOrder->id_product) {
                                 $unit = (Product::strUnit($productOrder->unit, 'wording_short', true) == 'p.') ? '' : ' '.Product::strUnit($productOrder->unit, 'wording_short', true) ;
-                                $strProducts .= $product->getNameExport() . ' (' .$productOrder->quantity .$unit.')<br />';
+                                $strProducts .= '('.$productOrder->quantity .$unit.') '.$product->getNameExport() . '<br />';
                                 $add = true;
                             }
                         }
@@ -157,7 +157,7 @@ foreach ($pointsSaleArray as $pointSale) {
                         $quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
                         if ($quantity) {
                             $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
-                            $strProducts .= $product->getNameExport() . ' (' .$quantity .$theUnit.')<br />';
+                            $strProducts .= '(' .$quantity .$theUnit.') '.$product->getNameExport() . '<br />';
                         }
                     }
 
@@ -206,7 +206,7 @@ foreach ($pointsSaleArray as $pointSale)
                 $quantity = Order::getProductQuantity($product->id, $pointSale->orders, false, $unit);
                 if ($quantity) {
                     $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
-                    $html .= $product->getNameExport() . ' (' .$quantity .$theUnit.')<br />';
+                    $html .= '(' .$quantity .$theUnit.') '.$product->getNameExport() . '<br />';
                 }
             }
 
@@ -233,7 +233,7 @@ foreach ($productsArray as $product) {
         $quantity = Order::getProductQuantity($product->id, $ordersArray, false, $unit);
         if ($quantity) {
             $theUnit = (Product::strUnit($unit, 'wording_short', true) == 'p.') ? '' : '&nbsp;'.Product::strUnit($unit, 'wording_short', true) ;
-            $html .= $product->name . ' (' .$quantity .$theUnit.')<br />';
+            $html .= '(' .$quantity .$theUnit.') '.$product->name . '<br />';
         }
     }
     if($isBig && $cpt == $limit) {

producer/controllers/OrderController.php

@@ -941,7 +941,7 @@ class OrderController extends ProducerBaseController
                         'restricted_access = 0 OR (restricted_access = 1 AND (SELECT COUNT(*) FROM user_point_sale WHERE point_sale.id = user_point_sale.id_point_sale AND user_point_sale.id_user = :id_user) > 0)'
                 )
                 ->params([':id_user' => User::getCurrentId()])
-                ->orderBy('is_bread_box ASC, name ASC')
+                ->orderBy('code ASC, restricted_access ASC, is_bread_box ASC, name ASC')
                 ->all();
 
         $creditFunctioningProducer = Producer::getConfig('credit_functioning');