Merge branch 'hotfix/hotfix_959'

backend/controllers/ProductController.php

@@ -399,7 +399,7 @@ class ProductController extends BackendController
                         $userGroupName = $productPriceCsv[2];
                         $pointSaleName = $productPriceCsv[3];
                         $quantityFrom = (float)$productPriceCsv[4];
-                        $price = (float)$productPriceCsv[5];
+                        $price = (float) str_replace(',', '.', $productPriceCsv[5]);
 
                         $product = $productName ? $productManager->findOneProductByName($productName) : null;
                         $user = (count($userArray) > 1) ? $userManager->findOneUserById((int)$userArray[1]) : null;
@@ -493,7 +493,7 @@ class ProductController extends BackendController
                 '',
                 '',
                 '',
-                $product->price
+                CSV::formatPrice($product->price)
             ];
 
             // prix spécifiques
@@ -507,7 +507,7 @@ class ProductController extends BackendController
                         $productPrice->userGroup ? $productPrice->userGroup->name : '',
                         $productPrice->pointSale ? $productPrice->pointSale->name : '',
                             $productPrice->from_quantity ?? '',
-                        $productPrice->price
+                        CSV::formatPrice($productPrice->price)
                     ];
                 }
             }

common/helpers/CSV.php

@@ -85,4 +85,9 @@ class CSV
         header("Content-Disposition: attachment;filename={$filename}");
         header("Content-Transfer-Encoding: binary");
     }
+
+    public static function formatPrice($price)
+    {
+        return str_replace('.', ',', $price);
+    }
 }

common/logic/PointSale/PointSale/Repository/PointSaleRepository.php

@@ -47,7 +47,7 @@ class PointSaleRepository extends AbstractRepository
         return $this->createDefaultQuery()
             ->filterIsOnline()
             ->filterByName($name)
-            ->fineOne();
+            ->findOne();
     }
 
     public function findPointSalesByDistribution(Distribution $distribution)